X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fethernet%2Feth.c;h=a238f92ec37c3202ac1d2cdcf329b5f3c991d9c5;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=9569f3a80f8658fabb19cd8a6060966688c4e1c9;hpb=a2c21200f1c81b08cb55e417b68150bba439b646;p=linux-2.6.git

diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index 9569f3a80..a238f92ec 100644
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -163,10 +163,8 @@ unsigned short eth_type_trans(struct sk_buff *skb, struct net_device *dev)
 	
 	skb->mac.raw=skb->data;
 	skb_pull(skb,ETH_HLEN);
-	eth= skb->mac.ethernet;
-#ifdef CONFIG_NET_CLS_ACT
+	eth = eth_hdr(skb);
 	skb->input_dev = dev;
-#endif
 	
 	if(*eth->h_dest&1)
 	{
@@ -212,7 +210,7 @@ unsigned short eth_type_trans(struct sk_buff *skb, struct net_device *dev)
 
 int eth_header_parse(struct sk_buff *skb, unsigned char *haddr)
 {
-	struct ethhdr *eth = skb->mac.ethernet;
+	struct ethhdr *eth = eth_hdr(skb);
 	memcpy(haddr, eth->h_source, ETH_ALEN);
 	return ETH_ALEN;
 }