diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-12 01:33:59 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-12 01:33:59 -0400 |
| commit | e6e30add6bd8115af108de2a13ec82d997a55777 (patch) | |
| tree | 558b4d1c3ac369805aa9c57abca710bdf52aff75 /net/ipv6/mcast.c | |
| parent | d4c3c0753594adaafbcb77a086f013f1d847b3f0 (diff) | |
| parent | 9501f9722922f2e80e1f9dc6682311d65c2b5690 (diff) | |
Merge branch 'net-next-2.6-misc-20080612a' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-next
Diffstat (limited to 'net/ipv6/mcast.c')
| -rw-r--r-- | net/ipv6/mcast.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index fbb2d12c41bc..bd2fe4cfafa7 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c | |||
| @@ -162,7 +162,6 @@ static int ip6_mc_leave_src(struct sock *sk, struct ipv6_mc_socklist *iml, | |||
| 162 | ((MLDV2_MASK(value, nbmant) | (1<<(nbmant))) << \ | 162 | ((MLDV2_MASK(value, nbmant) | (1<<(nbmant))) << \ |
| 163 | (MLDV2_MASK((value) >> (nbmant), nbexp) + (nbexp)))) | 163 | (MLDV2_MASK((value) >> (nbmant), nbexp) + (nbexp)))) |
| 164 | 164 | ||
| 165 | #define MLDV2_QQIC(value) MLDV2_EXP(0x80, 4, 3, value) | ||
| 166 | #define MLDV2_MRC(value) MLDV2_EXP(0x8000, 12, 3, value) | 165 | #define MLDV2_MRC(value) MLDV2_EXP(0x8000, 12, 3, value) |
| 167 | 166 | ||
| 168 | #define IPV6_MLD_MAX_MSF 64 | 167 | #define IPV6_MLD_MAX_MSF 64 |