diff --git a/[refs] b/[refs]
index 3c408f736a4d..e02952091c37 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7fe40f73d7591b38f129fe6a9c0fa46e0b192d09
+refs/heads/master: ff593c592a5d674822dce31143635b025f6415b2
diff --git a/trunk/net/ethernet/eth.c b/trunk/net/ethernet/eth.c
index 6617ea47d365..ab60ea63688e 100644
--- a/trunk/net/ethernet/eth.c
+++ b/trunk/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...