diff options
| author | John Crispin <john@openwrt.org> | 2014-07-20 17:31:15 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2014-07-20 17:31:15 +0000 |
| commit | 2b48ee80f98647fd449fc8301670bb9a5d090f60 (patch) | |
| tree | bb013e60dd7fb2e60bc2ebd0551deb7669bffe55 /target/linux/generic/patches-3.10/645-bridge_multicast_to_unicast.patch | |
| parent | ba63338d3f8b791be2fb606f88bdec63a7aa7d53 (diff) | |
| download | upstream-2b48ee80f98647fd449fc8301670bb9a5d090f60.tar.gz upstream-2b48ee80f98647fd449fc8301670bb9a5d090f60.tar.bz2 upstream-2b48ee80f98647fd449fc8301670bb9a5d090f60.zip | |
kernel: refresh 3.10 patches
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 41777
Diffstat (limited to 'target/linux/generic/patches-3.10/645-bridge_multicast_to_unicast.patch')
| -rw-r--r-- | target/linux/generic/patches-3.10/645-bridge_multicast_to_unicast.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic/patches-3.10/645-bridge_multicast_to_unicast.patch b/target/linux/generic/patches-3.10/645-bridge_multicast_to_unicast.patch index cb5b760b3b..f5b781bb17 100644 --- a/target/linux/generic/patches-3.10/645-bridge_multicast_to_unicast.patch +++ b/target/linux/generic/patches-3.10/645-bridge_multicast_to_unicast.patch @@ -195,7 +195,7 @@ } #endif -@@ -1351,6 +1376,7 @@ static int br_multicast_ipv4_rcv(struct +@@ -1351,6 +1376,7 @@ static int br_multicast_ipv4_rcv(struct struct net_bridge_port *port, struct sk_buff *skb) { @@ -203,7 +203,7 @@ struct sk_buff *skb2 = skb; const struct iphdr *iph; struct igmphdr *ih; -@@ -1426,7 +1452,7 @@ static int br_multicast_ipv4_rcv(struct +@@ -1426,7 +1452,7 @@ static int br_multicast_ipv4_rcv(struct case IGMP_HOST_MEMBERSHIP_REPORT: case IGMPV2_HOST_MEMBERSHIP_REPORT: BR_INPUT_SKB_CB(skb)->mrouters_only = 1; @@ -212,7 +212,7 @@ break; case IGMPV3_HOST_MEMBERSHIP_REPORT: err = br_ip4_multicast_igmp3_report(br, port, skb2); -@@ -1435,7 +1461,7 @@ static int br_multicast_ipv4_rcv(struct +@@ -1435,7 +1461,7 @@ static int br_multicast_ipv4_rcv(struct err = br_ip4_multicast_query(br, port, skb2); break; case IGMP_HOST_LEAVE_MESSAGE: @@ -221,7 +221,7 @@ break; } -@@ -1452,6 +1478,7 @@ static int br_multicast_ipv6_rcv(struct +@@ -1452,6 +1478,7 @@ static int br_multicast_ipv6_rcv(struct struct net_bridge_port *port, struct sk_buff *skb) { @@ -229,7 +229,7 @@ struct sk_buff *skb2; const struct ipv6hdr *ip6h; u8 icmp6_type; -@@ -1557,7 +1584,8 @@ static int br_multicast_ipv6_rcv(struct +@@ -1557,7 +1584,8 @@ static int br_multicast_ipv6_rcv(struct } mld = (struct mld_msg *)skb_transport_header(skb2); BR_INPUT_SKB_CB(skb)->mrouters_only = 1; @@ -239,7 +239,7 @@ break; } case ICMPV6_MLD2_REPORT: -@@ -1574,7 +1602,7 @@ static int br_multicast_ipv6_rcv(struct +@@ -1574,7 +1602,7 @@ static int br_multicast_ipv6_rcv(struct goto out; } mld = (struct mld_msg *)skb_transport_header(skb2); |