vserver 1.9.3

[linux-2.6.git] / net / ethernet / eth.c

diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index 9569f3a..a238f92 100644 (file)
--- 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;
 }