From: Ben Pfaff <blp@nicira.com>
Date: Tue, 11 Nov 2008 04:56:13 +0000 (-0800)
Subject: Make sure that do_port_input() always puts a MAC header on packets.
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=dac4f198616aad869063b1c77266e72d775e4aed;p=sliver-openvswitch.git

Make sure that do_port_input() always puts a MAC header on packets.

Prompted by persistent oopses on packets received by e1000e, in which
skb_mac_header() for the packet always returned null.
---

diff --git a/datapath/datapath.c b/datapath/datapath.c
index b7cd6233d..d27a9bc12 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -465,6 +465,7 @@ do_port_input(struct net_bridge_port *p, struct sk_buff *skb)
 
 	/* Push the Ethernet header back on. */
 	skb_push(skb, ETH_HLEN);
+	skb_reset_mac_header(skb);
 	fwd_port_input(p->dp->chain, skb, p);
 }