aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.6/642-bridge_port_isolate.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-10-24 13:05:22 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-10-24 13:05:22 +0000
commit7e856e5a97966fe89f6336783c0c676eb999e7cf (patch)
treeb5ea6efbf3f80d929729070d75c06b9a4cfe9eea /target/linux/generic/patches-3.6/642-bridge_port_isolate.patch
parent4eda974038a1d09f9a73973566f72ebfd4ce556a (diff)
downloadupstream-7e856e5a97966fe89f6336783c0c676eb999e7cf.tar.gz
upstream-7e856e5a97966fe89f6336783c0c676eb999e7cf.tar.bz2
upstream-7e856e5a97966fe89f6336783c0c676eb999e7cf.zip
make all 3.6 patches apply and build
SVN-Revision: 33911
Diffstat (limited to 'target/linux/generic/patches-3.6/642-bridge_port_isolate.patch')
-rw-r--r--target/linux/generic/patches-3.6/642-bridge_port_isolate.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-3.6/642-bridge_port_isolate.patch b/target/linux/generic/patches-3.6/642-bridge_port_isolate.patch
index 68434bfc29..9920a5e510 100644
--- a/target/linux/generic/patches-3.6/642-bridge_port_isolate.patch
+++ b/target/linux/generic/patches-3.6/642-bridge_port_isolate.patch
@@ -33,7 +33,7 @@
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)
{
-@@ -181,6 +197,7 @@ static struct brport_attribute *brport_a
+@@ -181,6 +197,7 @@ static const struct brport_attribute *br
&brport_attr_hold_timer,
&brport_attr_flush,
&brport_attr_hairpin_mode,
@@ -55,7 +55,7 @@
skb = NULL;
--- a/net/bridge/br_forward.c
+++ b/net/bridge/br_forward.c
-@@ -109,7 +109,7 @@ void br_deliver(const struct net_bridge_
+@@ -110,7 +110,7 @@ void br_deliver(const struct net_bridge_
/* called with rcu_read_lock */
void br_forward(const struct net_bridge_port *to, struct sk_buff *skb, struct sk_buff *skb0)
{
@@ -64,7 +64,7 @@
if (skb0)
deliver_clone(to, skb, __br_forward);
else
-@@ -164,7 +164,8 @@ out:
+@@ -165,7 +165,8 @@ out:
static void br_flood(struct net_bridge *br, struct sk_buff *skb,
struct sk_buff *skb0,
void (*__packet_hook)(const struct net_bridge_port *p,
@@ -74,7 +74,7 @@
{
struct net_bridge_port *p;
struct net_bridge_port *prev;
-@@ -172,6 +173,9 @@ static void br_flood(struct net_bridge *
+@@ -173,6 +174,9 @@ static void br_flood(struct net_bridge *
prev = NULL;
list_for_each_entry_rcu(p, &br->port_list, list) {
@@ -84,7 +84,7 @@
prev = maybe_deliver(prev, p, skb, __packet_hook);
if (IS_ERR(prev))
goto out;
-@@ -195,14 +199,14 @@ out:
+@@ -196,14 +200,14 @@ out:
/* called with rcu_read_lock */
void br_flood_deliver(struct net_bridge *br, struct sk_buff *skb)
{