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

On branch : maint

commit b921e8f70aa929766856decfe79ee8e78ba21e23 Author: Linus Lüssing linus.luessing@web.de Date: Sun Feb 2 22:53:11 2014 +0800

batman-adv: backport eth_hdr() compat fix to avoid kernel oops

Introduced by 41b38727749a94c1a65cf0f4be9bfe1cbaf0adeb ("batman-adv: fix potential kernel paging error for unicast transmissions")

Signed-off-by: Marek Lindner mareklindner@neomailbox.ch CC: Linus Lüssing linus.luessing@web.de

b921e8f70aa929766856decfe79ee8e78ba21e23 compat.h | 11 +++++++++++ 1 file changed, 11 insertions(+)

diff --git a/compat.h b/compat.h index a4ab202..deea92b 100644 --- a/compat.h +++ b/compat.h @@ -289,6 +289,17 @@ static int batadv_interface_set_mac_addr(struct net_device *dev, void *p) \ }\ static int __batadv_interface_set_mac_addr(x, y)

+#define batadv_interface_tx(x, y) \ +__batadv_interface_tx(struct sk_buff *skb, struct net_device *soft_iface); \ +static int batadv_interface_tx(struct sk_buff *skb, \ + struct net_device *soft_iface) \ +{ \ + skb_reset_mac_header(skb); \ + return __batadv_interface_tx(skb, soft_iface); \ +} \ +static int __batadv_interface_tx(struct sk_buff *skb, \ + struct net_device *soft_iface) + #define netdev_master_upper_dev_link netdev_set_master #define netdev_upper_dev_unlink(slave, master) netdev_set_master(slave, NULL) #define netdev_master_upper_dev_get(dev) \