diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-04 13:39:28 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-04 13:39:28 -0500 |
commit | 912cbe3c5be5afb28184bb2e49a48fa4a1b098db (patch) | |
tree | 07b324a87f7d67be6df5d3e82f986fecbb3c6c0b /net/ipv4/igmp.c | |
parent | 0f3278d14f0255e4cd9e07ccefc33ff12d8bb59c (diff) | |
parent | 52ab4ac258ff10a362d78a3f8160a7c4d0721b51 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
Diffstat (limited to 'net/ipv4/igmp.c')
-rw-r--r-- | net/ipv4/igmp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index 8b6d3939e1e6..c6247fc84060 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c | |||
@@ -1908,8 +1908,11 @@ int ip_mc_msfilter(struct sock *sk, struct ip_msfilter *msf, int ifindex) | |||
1908 | sock_kfree_s(sk, newpsl, IP_SFLSIZE(newpsl->sl_max)); | 1908 | sock_kfree_s(sk, newpsl, IP_SFLSIZE(newpsl->sl_max)); |
1909 | goto done; | 1909 | goto done; |
1910 | } | 1910 | } |
1911 | } else | 1911 | } else { |
1912 | newpsl = NULL; | 1912 | newpsl = NULL; |
1913 | (void) ip_mc_add_src(in_dev, &msf->imsf_multiaddr, | ||
1914 | msf->imsf_fmode, 0, NULL, 0); | ||
1915 | } | ||
1913 | psl = pmc->sflist; | 1916 | psl = pmc->sflist; |
1914 | if (psl) { | 1917 | if (psl) { |
1915 | (void) ip_mc_del_src(in_dev, &msf->imsf_multiaddr, pmc->sfmode, | 1918 | (void) ip_mc_del_src(in_dev, &msf->imsf_multiaddr, pmc->sfmode, |