Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 0 deletions

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index f75091c983ee..396c0134c5ab 100644
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -374,6 +374,7 @@ int batadv_recv_icmp_packet(struct sk_buff *skb,
                 if (skb_cow(skb, ETH_HLEN) < 0)
                         goto out;
 
+                ethhdr = eth_hdr(skb);
                 icmph = (struct batadv_icmp_header *)skb->data;
                 icmp_packet_rr = (struct batadv_icmp_packet_rr *)icmph;
                 if (icmp_packet_rr->rr_cur >= BATADV_RR_LEN)