Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

1 files changed, 6 insertions, 6 deletions

diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index 9890fd97e538..c971f14712ec 100644
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -95,6 +95,12 @@ int eth_header(struct sk_buff *skb, struct net_device *dev, unsigned short type,
                 saddr = dev->dev_addr;
         memcpy(eth->h_source,saddr,dev->addr_len);
 
+        if(daddr)
+        {
+                memcpy(eth->h_dest,daddr,dev->addr_len);
+                return ETH_HLEN;
+        }
+        
         /*
          *      Anyway, the loopback-device should never use this function... 
          */
@@ -105,12 +111,6 @@ int eth_header(struct sk_buff *skb, struct net_device *dev, unsigned short type,
                 return ETH_HLEN;
         }
         
-        if(daddr)
-        {
-                memcpy(eth->h_dest,daddr,dev->addr_len);
-                return ETH_HLEN;
-        }
-        
         return -ETH_HLEN;
 }