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

On branch : master

commit fbe649dfdd07d871f5b47b5e8ea1b03d104feb9d Merge: f6a1006 e175a9f Author: Marek Lindner mareklindner@neomailbox.ch Date: Sun Feb 2 22:57:58 2014 +0800

Merge branch 'next'

Conflicts: send.c

fbe649dfdd07d871f5b47b5e8ea1b03d104feb9d routing.c | 2 +- send.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --cc send.c index 3d83bf9,1703a2e..31a8c19 --- a/send.c +++ b/send.c @@@ -254,8 -254,8 +254,8 @@@ static int batadv_send_skb_unicast(stru struct batadv_orig_node *orig_node, unsigned short vid) { - struct ethhdr *ethhdr = eth_hdr(skb); - struct ethhdr *ethhdr; struct batadv_unicast_packet *unicast_packet; ++ struct ethhdr *ethhdr; int ret = NET_XMIT_DROP;

if (!orig_node)