X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Fmacvlan.c;h=97f342e64d671e0793428a37a6d1ebc71a750910;hb=959f049dfb62b517cbb3dd48ed2fb7d9c713ce16;hp=74134970b7095c4faae3f9f627358bd69617353d;hpb=e6f1227e8bc8a2ea2d76d09e19c89fa66c2f3a4c;p=pandora-kernel.git

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 74134970b709..97f342e64d67 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -172,6 +172,7 @@ static rx_handler_result_t macvlan_handle_frame(struct sk_buff **pskb)
 		skb = ip_check_defrag(skb, IP_DEFRAG_MACVLAN);
 		if (!skb)
 			return RX_HANDLER_CONSUMED;
+		eth = eth_hdr(skb);
 		src = macvlan_hash_lookup(port, eth->h_source);
 		if (!src)
 			/* frame comes from an external address */
@@ -257,7 +258,7 @@ static int macvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev)
 
 xmit_world:
 	skb->ip_summed = ip_summed;
-	skb_set_dev(skb, vlan->lowerdev);
+	skb->dev = vlan->lowerdev;
 	return dev_queue_xmit(skb);
 }