diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-11-10 22:51:30 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-11-10 22:51:30 +0000 |
| commit | a69ebe234d46ca95cbcbcba7f4ef9bae598eb95b (patch) | |
| tree | f5a849fbbd0c2bb9bc9ba75b80f9ff679a707b09 /target/linux/generic/patches-3.18/645-bridge_multicast_to_unicast.patch | |
| parent | c5b5e68879238d195e7a797ca82c8e0043e797ee (diff) | |
| download | master-31e0f0ae-a69ebe234d46ca95cbcbcba7f4ef9bae598eb95b.tar.gz master-31e0f0ae-a69ebe234d46ca95cbcbcba7f4ef9bae598eb95b.tar.bz2 master-31e0f0ae-a69ebe234d46ca95cbcbcba7f4ef9bae598eb95b.zip | |
kernel: update kernel 3.18 to rc4
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 43229
Diffstat (limited to 'target/linux/generic/patches-3.18/645-bridge_multicast_to_unicast.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/645-bridge_multicast_to_unicast.patch | 6 |
1 files changed, 3 insertions, 3 deletions
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 97a7f7f8de..35ed5cb403 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 @@ -291,7 +291,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 +321,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 +329,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; |