diff options
author | Luka Perkov <luka@openwrt.org> | 2014-07-06 18:10:49 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2014-07-06 18:10:49 +0000 |
commit | e898954fd27e3e8249b1d33237d1defb1ac24c56 (patch) | |
tree | 1528e13446fa8ca1ffea4860e751833834801e3c /target/linux/generic/patches-3.14/645-bridge_multicast_to_unicast.patch | |
parent | 0f2c187a31b2092f0c7533228b5d682e5c1c1dbd (diff) | |
download | master-187ad058-e898954fd27e3e8249b1d33237d1defb1ac24c56.tar.gz master-187ad058-e898954fd27e3e8249b1d33237d1defb1ac24c56.tar.bz2 master-187ad058-e898954fd27e3e8249b1d33237d1defb1ac24c56.zip |
kernel: update 3.14 to 3.14.10
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41533 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.14/645-bridge_multicast_to_unicast.patch')
-rw-r--r-- | target/linux/generic/patches-3.14/645-bridge_multicast_to_unicast.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic/patches-3.14/645-bridge_multicast_to_unicast.patch b/target/linux/generic/patches-3.14/645-bridge_multicast_to_unicast.patch index b550120b7b..a9612f0559 100644 --- a/target/linux/generic/patches-3.14/645-bridge_multicast_to_unicast.patch +++ b/target/linux/generic/patches-3.14/645-bridge_multicast_to_unicast.patch @@ -197,7 +197,7 @@ } #endif -@@ -1465,6 +1492,7 @@ static int br_multicast_ipv4_rcv(struct +@@ -1465,6 +1492,7 @@ static int br_multicast_ipv4_rcv(struct struct sk_buff *skb, u16 vid) { @@ -205,7 +205,7 @@ struct sk_buff *skb2 = skb; const struct iphdr *iph; struct igmphdr *ih; -@@ -1538,7 +1566,7 @@ static int br_multicast_ipv4_rcv(struct +@@ -1538,7 +1566,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; @@ -214,7 +214,7 @@ break; case IGMPV3_HOST_MEMBERSHIP_REPORT: err = br_ip4_multicast_igmp3_report(br, port, skb2, vid); -@@ -1547,7 +1575,7 @@ static int br_multicast_ipv4_rcv(struct +@@ -1547,7 +1575,7 @@ static int br_multicast_ipv4_rcv(struct err = br_ip4_multicast_query(br, port, skb2, vid); break; case IGMP_HOST_LEAVE_MESSAGE: @@ -223,7 +223,7 @@ break; } -@@ -1565,6 +1593,7 @@ static int br_multicast_ipv6_rcv(struct +@@ -1565,6 +1593,7 @@ static int br_multicast_ipv6_rcv(struct struct sk_buff *skb, u16 vid) { @@ -231,7 +231,7 @@ struct sk_buff *skb2; const struct ipv6hdr *ip6h; u8 icmp6_type; -@@ -1674,7 +1703,8 @@ static int br_multicast_ipv6_rcv(struct +@@ -1674,7 +1703,8 @@ static int br_multicast_ipv6_rcv(struct } mld = (struct mld_msg *)skb_transport_header(skb2); BR_INPUT_SKB_CB(skb)->mrouters_only = 1; @@ -241,7 +241,7 @@ break; } case ICMPV6_MLD2_REPORT: -@@ -1691,7 +1721,7 @@ static int br_multicast_ipv6_rcv(struct +@@ -1691,7 +1721,7 @@ static int br_multicast_ipv6_rcv(struct goto out; } mld = (struct mld_msg *)skb_transport_header(skb2); |