projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: refresh 3.12 patches on -rc7 release
[openwrt.git]
/
target
/
linux
/
generic
/
patches-3.12
/
644-bridge_optimize_netfilter_hooks.patch
diff --git
a/target/linux/generic/patches-3.12/644-bridge_optimize_netfilter_hooks.patch
b/target/linux/generic/patches-3.12/644-bridge_optimize_netfilter_hooks.patch
index
b657981
..
85def08
100644
(file)
--- a/
target/linux/generic/patches-3.12/644-bridge_optimize_netfilter_hooks.patch
+++ b/
target/linux/generic/patches-3.12/644-bridge_optimize_netfilter_hooks.patch
@@
-67,7
+67,7
@@
default:
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
default:
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
-@@ -
799,7 +799
,7 @@ static void __br_multicast_send_query(st
+@@ -
802,7 +802
,7 @@ static void __br_multicast_send_query(st
if (port) {
__skb_push(skb, sizeof(struct ethhdr));
skb->dev = port->dev;
if (port) {
__skb_push(skb, sizeof(struct ethhdr));
skb->dev = port->dev;
@@
-96,7
+96,7
@@
if (vlan_tx_tag_present(skb))
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
if (vlan_tx_tag_present(skb))
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
-@@ -72
8,15 +728
,29 @@ static inline u16 br_get_pvid(const stru
+@@ -72
5,15 +725
,29 @@ static inline u16 br_get_pvid(const stru
/* br_netfilter.c */
#ifdef CONFIG_BRIDGE_NETFILTER
/* br_netfilter.c */
#ifdef CONFIG_BRIDGE_NETFILTER