[PATCH] x86: i8253/i8259A lock cleanup

[pandora-kernel.git] / net / ethernet / eth.c

diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index 6617ea4..ab60ea6 100644 (file)
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -92,10 +92,9 @@ int eth_header(struct sk_buff *skb, struct net_device *dev, unsigned short type,
         *      Set the source hardware address. 
         */
         
-       if(saddr)
-               memcpy(eth->h_source,saddr,dev->addr_len);
-       else
-               memcpy(eth->h_source,dev->dev_addr,dev->addr_len);
+       if(!saddr)
+               saddr = dev->dev_addr;
+       memcpy(eth->h_source,saddr,dev->addr_len);
 
        /*
         *      Anyway, the loopback-device should never use this function...