git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
net
/
ipv4
/
ip_sockglue.c
diff --git
a/net/ipv4/ip_sockglue.c
b/net/ipv4/ip_sockglue.c
index
8bb874b
..
58ff4c0
100644
(file)
--- a/
net/ipv4/ip_sockglue.c
+++ b/
net/ipv4/ip_sockglue.c
@@
-775,8
+775,8
@@
int ip_setsockopt(struct sock *sk, int level, int optname, char __user *optval,
extern int sysctl_optmem_max;
extern int sysctl_igmp_max_msf;
struct sockaddr_in *psin;
extern int sysctl_optmem_max;
extern int sysctl_igmp_max_msf;
struct sockaddr_in *psin;
- struct ip_msfilter *msf =
NULL
;
- struct group_filter *gsf =
NULL
;
+ struct ip_msfilter *msf =
0
;
+ struct group_filter *gsf =
0
;
int msize, i, ifindex;
if (optlen < GROUP_FILTER_SIZE(0))
int msize, i, ifindex;
if (optlen < GROUP_FILTER_SIZE(0))
@@
-829,7
+829,7
@@
int ip_setsockopt(struct sock *sk, int level, int optname, char __user *optval,
msf->imsf_slist[i] = psin->sin_addr.s_addr;
}
kfree(gsf);
msf->imsf_slist[i] = psin->sin_addr.s_addr;
}
kfree(gsf);
- gsf =
NULL
;
+ gsf =
0
;
err = ip_mc_msfilter(sk, msf, ifindex);
mc_msf_out:
err = ip_mc_msfilter(sk, msf, ifindex);
mc_msf_out: