aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2.c
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2006-12-14 18:57:04 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-18 00:59:17 -0500
commit6634292be47856c571634944dc0f6c8498602032 (patch)
tree04be50dfeb16f36eb11d403e13d1fcd7b39cf37f /drivers/net/bnx2.c
parent6a13add1e1b802a29187a9af98a6ca26539dc33d (diff)
[BNX2]: Fix minor loopback problem.
Use the configured MAC address instead of the permanent MAC address for loopback frames. Update version to 1.5.2. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2.c')
-rw-r--r--drivers/net/bnx2.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 4fa7cefaa296..ada5e9b9988c 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -57,8 +57,8 @@
57 57
58#define DRV_MODULE_NAME "bnx2" 58#define DRV_MODULE_NAME "bnx2"
59#define PFX DRV_MODULE_NAME ": " 59#define PFX DRV_MODULE_NAME ": "
60#define DRV_MODULE_VERSION "1.5.1" 60#define DRV_MODULE_VERSION "1.5.2"
61#define DRV_MODULE_RELDATE "November 15, 2006" 61#define DRV_MODULE_RELDATE "December 13, 2006"
62 62
63#define RUN_AT(x) (jiffies + (x)) 63#define RUN_AT(x) (jiffies + (x))
64 64
@@ -4005,7 +4005,7 @@ bnx2_run_loopback(struct bnx2 *bp, int loopback_mode)
4005 if (!skb) 4005 if (!skb)
4006 return -ENOMEM; 4006 return -ENOMEM;
4007 packet = skb_put(skb, pkt_size); 4007 packet = skb_put(skb, pkt_size);
4008 memcpy(packet, bp->mac_addr, 6); 4008 memcpy(packet, bp->dev->dev_addr, 6);
4009 memset(packet + 6, 0x0, 8); 4009 memset(packet + 6, 0x0, 8);
4010 for (i = 14; i < pkt_size; i++) 4010 for (i = 14; i < pkt_size; i++)
4011 packet[i] = (unsigned char) (i & 0xff); 4011 packet[i] = (unsigned char) (i & 0xff);