kernel: bgmac: update the driver patches to a version submitted for mainline kernel.

[oweals/openwrt.git] / target / linux / generic / patches-3.10 / 644-bridge_optimize_netfilter_hooks.patch

diff --git a/target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch b/target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch
index 30c036b712ebe3eea3036d6b882d528e42238432..ac41cf549257241edc696f84ec914d7703341e6d 100644 (file)
--- a/target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch
+++ b/target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch
@@ -48,8 +48,8 @@
                        return RX_HANDLER_CONSUMED; /* consumed by filter */
                } else {
 @@ -224,7 +224,7 @@ forward:
-               if (!ether_addr_equal(p->br->dev->dev_addr, dest))
-                       goto drop;
+               if (ether_addr_equal(p->br->dev->dev_addr, dest))
+                       skb->pkt_type = PACKET_HOST;
  
 -              if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
 +              if (BR_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
@@ -96,7 +96,7 @@
        if (vlan_tx_tag_present(skb))
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
-@@ -699,15 +699,29 @@ static inline u16 br_get_pvid(const stru
+@@ -696,15 +696,29 @@ static inline u16 br_get_pvid(const stru
  
  /* br_netfilter.c */
  #ifdef CONFIG_BRIDGE_NETFILTER