From d1c0a65266b0bbfbe2839f3f5401e09ab9eb7664 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 1 Dec 2014 17:38:54 +0000 Subject: kernel: update 3.18 to rc7 Signed-off-by: Felix Fietkau SVN-Revision: 43479 --- .../patches-3.18/645-bridge_multicast_to_unicast.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'target/linux/generic/patches-3.18/645-bridge_multicast_to_unicast.patch') diff --git a/target/linux/generic/patches-3.18/645-bridge_multicast_to_unicast.patch b/target/linux/generic/patches-3.18/645-bridge_multicast_to_unicast.patch index 8d0da3c6e5..a8a6017c9a 100644 --- a/target/linux/generic/patches-3.18/645-bridge_multicast_to_unicast.patch +++ b/target/linux/generic/patches-3.18/645-bridge_multicast_to_unicast.patch @@ -195,7 +195,7 @@ } #endif -@@ -1556,6 +1581,7 @@ static int br_multicast_ipv4_rcv(struct +@@ -1556,6 +1581,7 @@ static int br_multicast_ipv4_rcv(struct struct sk_buff *skb, u16 vid) { @@ -203,7 +203,7 @@ struct sk_buff *skb2 = skb; const struct iphdr *iph; struct igmphdr *ih; -@@ -1629,7 +1655,7 @@ static int br_multicast_ipv4_rcv(struct +@@ -1629,7 +1655,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, vid); -@@ -1638,7 +1664,7 @@ static int br_multicast_ipv4_rcv(struct +@@ -1638,7 +1664,7 @@ static int br_multicast_ipv4_rcv(struct err = br_ip4_multicast_query(br, port, skb2, vid); break; case IGMP_HOST_LEAVE_MESSAGE: @@ -221,7 +221,7 @@ break; } -@@ -1656,6 +1682,7 @@ static int br_multicast_ipv6_rcv(struct +@@ -1656,6 +1682,7 @@ static int br_multicast_ipv6_rcv(struct struct sk_buff *skb, u16 vid) { @@ -229,7 +229,7 @@ struct sk_buff *skb2; const struct ipv6hdr *ip6h; u8 icmp6_type; -@@ -1765,7 +1792,8 @@ static int br_multicast_ipv6_rcv(struct +@@ -1765,7 +1792,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: -@@ -1782,7 +1810,7 @@ static int br_multicast_ipv6_rcv(struct +@@ -1782,7 +1810,7 @@ static int br_multicast_ipv6_rcv(struct goto out; } mld = (struct mld_msg *)skb_transport_header(skb2); -- cgit v1.2.3