Repository : ssh://git@open-mesh.org/batman-adv

On branch : maint

commit 96bd7236a4dac51fa03f49679b47708825c36674 Author: Antonio Quartulli antonio@meshcoding.com Date: Mon Dec 23 01:28:04 2013 +0100

Revert "batman-adv: free nf_bridge member on locally delivered skb"

This reverts commit 9048eb62124f47f66d12eb1d706ab5fb265553f7.

This fix can be implemented using the nf_Reset() helper instead of partly reimplementing it with a batman-adv private function.

Signed-off-by: Antonio Quartulli antonio@meshcoding.com Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

96bd7236a4dac51fa03f49679b47708825c36674 soft-interface.c | 8 -------- soft-interface.h | 16 ---------------- 2 files changed, 24 deletions(-)

diff --git a/soft-interface.c b/soft-interface.c index 5dd1247..33b6144 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -371,14 +371,6 @@ void batadv_interface_rx(struct net_device *soft_iface, if (batadv_is_ap_isolated(bat_priv, ethhdr->h_source, ethhdr->h_dest)) goto dropped;

- /* Clean the netfilter state before delivering the skb. - * This packet may have traversed a bridge when it was encapsulated into - * the batman header. Now that the header has been removed, the - * netfilter state must be cleaned up to avoid to mess up with a - * possible second bridge - */ - batadv_nf_bridge_skb_free(skb); - netif_rx(skb); goto out;

diff --git a/soft-interface.h b/soft-interface.h index 5c19c42..2f2472c 100644 --- a/soft-interface.h +++ b/soft-interface.h @@ -29,20 +29,4 @@ void batadv_softif_destroy_sysfs(struct net_device *soft_iface); int batadv_softif_is_valid(const struct net_device *net_dev); extern struct rtnl_link_ops batadv_link_ops;

-#ifdef CONFIG_BRIDGE_NETFILTER -/** - * batadv_nf_bridge_skb_free - clean the NF bridge data in an skb - * @skb: the skb which nf data has to be free'd - */ -static inline void batadv_nf_bridge_skb_free(struct sk_buff *skb) -{ - nf_bridge_put(skb->nf_bridge); - skb->nf_bridge = NULL; -} -#else -static inline void batadv_nf_bridge_skb_free(struct sk_buff *skb) -{ -} -#endif /* CONFIG_BRIDGE_NETFILTER */ - #endif /* _NET_BATMAN_ADV_SOFT_INTERFACE_H_ */