From a081d99328866df93798107d515ac1a2a737e8f3 Mon Sep 17 00:00:00 2001
From: Denis Vlasenko <vda@ilport.com.ua>
Date: Tue, 28 Jun 2005 15:49:06 -0700
Subject: [PATCH] --- yaml --- r: 3923 b: refs/heads/master c:
 ff593c592a5d674822dce31143635b025f6415b2 h: refs/heads/master i:   3921:
 7a5ec0032dc69478039c1c62a135ab4b221b0d12   3919:
 6b1bc6270b249ee8fbd4a273e9ab390cf7be4e16 v: v3

---
 [refs]                   | 2 +-
 trunk/net/ethernet/eth.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

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...