Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / net / ethernet / pe2.c

diff --git a/net/ethernet/pe2.c b/net/ethernet/pe2.c
index 98a494be6039452700e39a227fcf7a23d69ab3f6..d60e15d9365e720b56f823c1842170d12de8a218 100644 (file)
--- a/net/ethernet/pe2.c
+++ b/net/ethernet/pe2.c
@@ -12,9 +12,7 @@ static int pEII_request(struct datalink_proto *dl,
        struct net_device *dev = skb->dev;
 
        skb->protocol = htons(ETH_P_IPX);
-       if (dev->hard_header)
-               dev->hard_header(skb, dev, ETH_P_IPX,
-                                dest_node, NULL, skb->len);
+       dev_hard_header(skb, dev, ETH_P_IPX, dest_node, NULL, skb->len);
        return dev_queue_xmit(skb);
 }
 
@@ -32,8 +30,7 @@ struct datalink_proto *make_EII_client(void)
 
 void destroy_EII_client(struct datalink_proto *dl)
 {
-       if (dl)
-               kfree(dl);
+       kfree(dl);
 }
 
 EXPORT_SYMBOL(destroy_EII_client);