kernel: update 3.18 to 3.18.1
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 43821
This commit is contained in:
@@ -198,7 +198,7 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -1556,6 +1584,7 @@ static int br_multicast_ipv4_rcv(struct
|
||||
@@ -1556,6 +1584,7 @@ static int br_multicast_ipv4_rcv(struct
|
||||
struct sk_buff *skb,
|
||||
u16 vid)
|
||||
{
|
||||
@@ -206,7 +206,7 @@
|
||||
struct sk_buff *skb2 = skb;
|
||||
const struct iphdr *iph;
|
||||
struct igmphdr *ih;
|
||||
@@ -1629,7 +1658,7 @@ static int br_multicast_ipv4_rcv(struct
|
||||
@@ -1629,7 +1658,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;
|
||||
@@ -215,7 +215,7 @@
|
||||
break;
|
||||
case IGMPV3_HOST_MEMBERSHIP_REPORT:
|
||||
err = br_ip4_multicast_igmp3_report(br, port, skb2, vid);
|
||||
@@ -1638,7 +1667,7 @@ static int br_multicast_ipv4_rcv(struct
|
||||
@@ -1638,7 +1667,7 @@ static int br_multicast_ipv4_rcv(struct
|
||||
err = br_ip4_multicast_query(br, port, skb2, vid);
|
||||
break;
|
||||
case IGMP_HOST_LEAVE_MESSAGE:
|
||||
@@ -224,7 +224,7 @@
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -1656,6 +1685,7 @@ static int br_multicast_ipv6_rcv(struct
|
||||
@@ -1656,6 +1685,7 @@ static int br_multicast_ipv6_rcv(struct
|
||||
struct sk_buff *skb,
|
||||
u16 vid)
|
||||
{
|
||||
@@ -232,7 +232,7 @@
|
||||
struct sk_buff *skb2;
|
||||
const struct ipv6hdr *ip6h;
|
||||
u8 icmp6_type;
|
||||
@@ -1765,7 +1795,8 @@ static int br_multicast_ipv6_rcv(struct
|
||||
@@ -1765,7 +1795,8 @@ static int br_multicast_ipv6_rcv(struct
|
||||
}
|
||||
mld = (struct mld_msg *)skb_transport_header(skb2);
|
||||
BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
|
||||
@@ -242,7 +242,7 @@
|
||||
break;
|
||||
}
|
||||
case ICMPV6_MLD2_REPORT:
|
||||
@@ -1782,7 +1813,7 @@ static int br_multicast_ipv6_rcv(struct
|
||||
@@ -1782,7 +1813,7 @@ static int br_multicast_ipv6_rcv(struct
|
||||
goto out;
|
||||
}
|
||||
mld = (struct mld_msg *)skb_transport_header(skb2);
|
||||
|
||||
Reference in New Issue
Block a user