diff options
| author | David S. Miller | 2010-02-15 07:30:54 +0100 |
|---|---|---|
| committer | David S. Miller | 2010-02-15 07:30:54 +0100 |
| commit | 5ecccb74dc91e22496a142b103ba958f93c29275 (patch) | |
| tree | b560b8974ec0e0478492d60753d45d8aea9db9b0 /net/ipv4/igmp.c | |
| parent | Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/lin... (diff) | |
| parent | Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/lin... (diff) | |
| download | kernel-qcow2-linux-5ecccb74dc91e22496a142b103ba958f93c29275.tar.gz kernel-qcow2-linux-5ecccb74dc91e22496a142b103ba958f93c29275.tar.xz kernel-qcow2-linux-5ecccb74dc91e22496a142b103ba958f93c29275.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/rate.c
Diffstat (limited to 'net/ipv4/igmp.c')
| -rw-r--r-- | net/ipv4/igmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index d28363998743..63bf298ca109 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c @@ -946,7 +946,6 @@ int igmp_rcv(struct sk_buff *skb) break; case IGMP_HOST_MEMBERSHIP_REPORT: case IGMPV2_HOST_MEMBERSHIP_REPORT: - case IGMPV3_HOST_MEMBERSHIP_REPORT: /* Is it our report looped back? */ if (skb_rtable(skb)->fl.iif == 0) break; @@ -960,6 +959,7 @@ int igmp_rcv(struct sk_buff *skb) in_dev_put(in_dev); return pim_rcv_v1(skb); #endif + case IGMPV3_HOST_MEMBERSHIP_REPORT: case IGMP_DVMRP: case IGMP_TRACE: case IGMP_HOST_LEAVE_MESSAGE: |