domenico/openwrt-R7800-nss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update .18 support for -rc6

Browse Source 
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 43357
This commit is contained in:
Imre Kaloz
2014-11-24 10:17:33 +00:00
parent 35902404fc
commit c26c5eff0e
10 changed files with 50 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
target/linux/generic/patches-3.18/645-bridge_multicast_to_unicast.patch
View File

@@ -96,7 +96,7 @@
}
#endif
@@ -966,6 +988,7 @@ static int br_ip4_multicast_igmp3_report
@@ -965,6 +987,7 @@ static int br_ip4_multicast_igmp3_report
struct sk_buff *skb,
u16 vid)
{
@@ -104,7 +104,7 @@
struct igmpv3_report *ih;
struct igmpv3_grec *grec;
int i;
@@ -1009,7 +1032,7 @@ static int br_ip4_multicast_igmp3_report
@@ -1008,7 +1031,7 @@ static int br_ip4_multicast_igmp3_report
continue;
}
@@ -113,7 +113,7 @@
if (err)
break;
}
@@ -1023,6 +1046,7 @@ static int br_ip6_multicast_mld2_report(
@@ -1022,6 +1045,7 @@ static int br_ip6_multicast_mld2_report(
struct sk_buff *skb,
u16 vid)
{
@@ -121,7 +121,7 @@
struct icmp6hdr *icmp6h;
struct mld2_grec *grec;
int i;
@@ -1071,7 +1095,7 @@ static int br_ip6_multicast_mld2_report(
@@ -1070,7 +1094,7 @@ static int br_ip6_multicast_mld2_report(
}
err = br_ip6_multicast_add_group(br, port, &grec->grec_mca,
@@ -130,7 +130,7 @@
if (!err)
break;
}
@@ -1408,7 +1432,8 @@ br_multicast_leave_group(struct net_brid
@@ -1407,7 +1431,8 @@ br_multicast_leave_group(struct net_brid
struct net_bridge_port *port,
struct br_ip *group,
struct bridge_mcast_other_query *other_query,
@@ -140,7 +140,7 @@
{
struct net_bridge_mdb_htable *mdb;
struct net_bridge_mdb_entry *mp;
@@ -1458,7 +1483,7 @@ br_multicast_leave_group(struct net_brid
@@ -1457,7 +1482,7 @@ br_multicast_leave_group(struct net_brid
for (pp = &mp->ports;
(p = mlock_dereference(*pp, br)) != NULL;
pp = &p->next) {
@@ -149,7 +149,7 @@
continue;
rcu_assign_pointer(*pp, p->next);
@@ -1492,7 +1517,7 @@ br_multicast_leave_group(struct net_brid
@@ -1491,7 +1516,7 @@ br_multicast_leave_group(struct net_brid
for (p = mlock_dereference(mp->ports, br);
p != NULL;
p = mlock_dereference(p->next, br)) {
@@ -158,7 +158,7 @@
continue;
if (!hlist_unhashed(&p->mglist) &&
@@ -1510,8 +1535,8 @@ out:
@@ -1509,8 +1534,8 @@ out:
static void br_ip4_multicast_leave_group(struct net_bridge *br,
struct net_bridge_port *port,
@@ -169,7 +169,7 @@
{
struct br_ip br_group;
struct bridge_mcast_own_query *own_query;
@@ -1526,14 +1551,14 @@ static void br_ip4_multicast_leave_group
@@ -1525,14 +1550,14 @@ static void br_ip4_multicast_leave_group
br_group.vid = vid;
br_multicast_leave_group(br, port, &br_group, &br->ip4_other_query,
@@ -186,7 +186,7 @@
{
struct br_ip br_group;
struct bridge_mcast_own_query *own_query;
@@ -1548,7 +1573,7 @@ static void br_ip6_multicast_leave_group
@@ -1547,7 +1572,7 @@ static void br_ip6_multicast_leave_group
br_group.vid = vid;
br_multicast_leave_group(br, port, &br_group, &br->ip6_other_query,
@@ -195,7 +195,7 @@
}
#endif
@@ -1557,6 +1582,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;
@@ -1630,7 +1656,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);
@@ -1639,7 +1665,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;
}
@@ -1657,6 +1683,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;
@@ -1766,7 +1793,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:
@@ -1783,7 +1811,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);