kernel: update 3.18 to 3.18.1

[openwrt.git] / 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 97a7f7f..5acfea6 100644 (file)
--- 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
@@ -87,16 +87,19 @@
  {
        struct br_ip br_group;
  
-@@ -736,7 +758,7 @@ static int br_ip6_multicast_add_group(st
+@@ -736,7 +758,10 @@ static int br_ip6_multicast_add_group(st
        br_group.proto = htons(ETH_P_IPV6);
        br_group.vid = vid;
  
 -      return br_multicast_add_group(br, port, &br_group);
++      if (ipv6_addr_is_solict_mult(group))
++              src = NULL;
++
 +      return br_multicast_add_group(br, port, &br_group, src);
  }
  #endif
  
-@@ -966,6 +988,7 @@ static int br_ip4_multicast_igmp3_report
+@@ -965,6 +990,7 @@ static int br_ip4_multicast_igmp3_report
                                         struct sk_buff *skb,
                                         u16 vid)
  {
@@ -104,7 +107,7 @@
        struct igmpv3_report *ih;
        struct igmpv3_grec *grec;
        int i;
-@@ -1009,7 +1032,7 @@ static int br_ip4_multicast_igmp3_report
+@@ -1008,7 +1034,7 @@ static int br_ip4_multicast_igmp3_report
                        continue;
                }
  
@@ -113,7 +116,7 @@
                if (err)
                        break;
        }
-@@ -1023,6 +1046,7 @@ static int br_ip6_multicast_mld2_report(
+@@ -1022,6 +1048,7 @@ static int br_ip6_multicast_mld2_report(
                                        struct sk_buff *skb,
                                        u16 vid)
  {
@@ -121,7 +124,7 @@
        struct icmp6hdr *icmp6h;
        struct mld2_grec *grec;
        int i;
-@@ -1071,7 +1095,7 @@ static int br_ip6_multicast_mld2_report(
+@@ -1070,7 +1097,7 @@ static int br_ip6_multicast_mld2_report(
                }
  
                err = br_ip6_multicast_add_group(br, port, &grec->grec_mca,
@@ -130,7 +133,7 @@
                if (!err)
                        break;
        }
-@@ -1408,7 +1432,8 @@ br_multicast_leave_group(struct net_brid
+@@ -1407,7 +1434,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 +143,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 +1485,7 @@ br_multicast_leave_group(struct net_brid
                for (pp = &mp->ports;
                     (p = mlock_dereference(*pp, br)) != NULL;
                     pp = &p->next) {
@@ -149,7 +152,7 @@
                                continue;
  
                        rcu_assign_pointer(*pp, p->next);
-@@ -1492,7 +1517,7 @@ br_multicast_leave_group(struct net_brid
+@@ -1491,7 +1519,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 +161,7 @@
                        continue;
  
                if (!hlist_unhashed(&p->mglist) &&
-@@ -1510,8 +1535,8 @@ out:
+@@ -1509,8 +1537,8 @@ out:
  
  static void br_ip4_multicast_leave_group(struct net_bridge *br,
                                         struct net_bridge_port *port,
@@ -169,7 +172,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 +1553,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 +189,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 +1575,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 +198,7 @@
  }
  #endif
  
-@@ -1557,6 +1582,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)
  {
@@ -203,7 +206,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 +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;
@@ -212,7 +215,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 +1667,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 +224,7 @@
                break;
        }
  
-@@ -1657,6 +1683,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)
  {
@@ -229,7 +232,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 +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;
@@ -239,7 +242,7 @@
                break;
            }
        case ICMPV6_MLD2_REPORT:
-@@ -1783,7 +1811,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);
@@ -291,7 +294,7 @@
        rcu_assign_pointer(*pp, p);
 --- a/net/bridge/br_forward.c
 +++ b/net/bridge/br_forward.c
-@@ -167,6 +167,29 @@ out:
+@@ -168,6 +168,29 @@ out:
        return p;
  }
  
@@ -321,7 +324,7 @@
  /* called under bridge lock */
  static void br_flood(struct net_bridge *br, struct sk_buff *skb,
                     struct sk_buff *skb0,
-@@ -231,6 +254,7 @@ static void br_multicast_flood(struct ne
+@@ -232,6 +255,7 @@ static void br_multicast_flood(struct ne
        struct net_bridge_port *prev = NULL;
        struct net_bridge_port_group *p;
        struct hlist_node *rp;
@@ -329,7 +332,7 @@
  
        rp = rcu_dereference(hlist_first_rcu(&br->router_list));
        p = mdst ? rcu_dereference(mdst->ports) : NULL;
-@@ -241,10 +265,19 @@ static void br_multicast_flood(struct ne
+@@ -242,10 +266,19 @@ static void br_multicast_flood(struct ne
                rport = rp ? hlist_entry(rp, struct net_bridge_port, rlist) :
                             NULL;