diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-29 15:21:41 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-29 15:21:41 -0700 |
| commit | d18bfacff20f08aecf01bb971b110ca108eef3c7 (patch) | |
| tree | 255f862839c593c796e609328575b611e3f56cf3 /net/ethernet | |
| parent | a68db763af9b676590c3fe9ec3f17bf18015eb2f (diff) | |
| parent | fd782a4a99d2d3e818b9465c427b10f7f027d7da (diff) | |
| download | kernel_samsung_tuna-d18bfacff20f08aecf01bb971b110ca108eef3c7.zip kernel_samsung_tuna-d18bfacff20f08aecf01bb971b110ca108eef3c7.tar.gz kernel_samsung_tuna-d18bfacff20f08aecf01bb971b110ca108eef3c7.tar.bz2 | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'net/ethernet')
| -rw-r--r-- | net/ethernet/eth.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index 6617ea4..ab60ea6 100644 --- 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... |