net-next: remove useless union keyword

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

diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index 61ec0329316c1353fb5f59f3e1e24d0cb397a19e..215c83986a9d4562f472a07e05bbbf607c56bbb0 100644 (file)
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -158,7 +158,6 @@ EXPORT_SYMBOL(eth_rebuild_header);
 __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev)
 {
        struct ethhdr *eth;
-       unsigned char *rawp;
 
        skb->dev = dev;
        skb_reset_mac_header(skb);
@@ -199,15 +198,13 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev)
        if (ntohs(eth->h_proto) >= 1536)
                return eth->h_proto;
 
-       rawp = skb->data;
-
        /*
         *      This is a magic hack to spot IPX packets. Older Novell breaks
         *      the protocol design and runs IPX over 802.3 without an 802.2 LLC
         *      layer. We look for FFFF which isn't a used 802.2 SSAP/DSAP. This
         *      won't work for fault tolerant netware but does for the rest.
         */
-       if (*(unsigned short *)rawp == 0xFFFF)
+       if (skb->len >= 2 && *(unsigned short *)(skb->data) == 0xFFFF)
                return htons(ETH_P_802_3);
 
        /*