diff options
Diffstat (limited to 'drivers/net/wireless/orinoco.c')
-rw-r--r-- | drivers/net/wireless/orinoco.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c index e0512e49d6d3..366556fafaee 100644 --- a/drivers/net/wireless/orinoco.c +++ b/drivers/net/wireless/orinoco.c | |||
@@ -1477,12 +1477,11 @@ static void orinoco_rx(struct net_device *dev, | |||
1477 | MICHAEL_MIC_LEN)) { | 1477 | MICHAEL_MIC_LEN)) { |
1478 | union iwreq_data wrqu; | 1478 | union iwreq_data wrqu; |
1479 | struct iw_michaelmicfailure wxmic; | 1479 | struct iw_michaelmicfailure wxmic; |
1480 | DECLARE_MAC_BUF(mac); | ||
1481 | 1480 | ||
1482 | printk(KERN_WARNING "%s: " | 1481 | printk(KERN_WARNING "%s: " |
1483 | "Invalid Michael MIC in data frame from %s, " | 1482 | "Invalid Michael MIC in data frame from %pM, " |
1484 | "using key %i\n", | 1483 | "using key %i\n", |
1485 | dev->name, print_mac(mac, src), key_id); | 1484 | dev->name, src, key_id); |
1486 | 1485 | ||
1487 | /* TODO: update stats */ | 1486 | /* TODO: update stats */ |
1488 | 1487 | ||
@@ -3277,7 +3276,6 @@ static int orinoco_init(struct net_device *dev) | |||
3277 | struct hermes_idstring nickbuf; | 3276 | struct hermes_idstring nickbuf; |
3278 | u16 reclen; | 3277 | u16 reclen; |
3279 | int len; | 3278 | int len; |
3280 | DECLARE_MAC_BUF(mac); | ||
3281 | 3279 | ||
3282 | /* No need to lock, the hw_unavailable flag is already set in | 3280 | /* No need to lock, the hw_unavailable flag is already set in |
3283 | * alloc_orinocodev() */ | 3281 | * alloc_orinocodev() */ |
@@ -3348,8 +3346,8 @@ static int orinoco_init(struct net_device *dev) | |||
3348 | goto out; | 3346 | goto out; |
3349 | } | 3347 | } |
3350 | 3348 | ||
3351 | printk(KERN_DEBUG "%s: MAC address %s\n", | 3349 | printk(KERN_DEBUG "%s: MAC address %pM\n", |
3352 | dev->name, print_mac(mac, dev->dev_addr)); | 3350 | dev->name, dev->dev_addr); |
3353 | 3351 | ||
3354 | /* Get the station name */ | 3352 | /* Get the station name */ |
3355 | err = hermes_read_ltv(hw, USER_BAP, HERMES_RID_CNFOWNNAME, | 3353 | err = hermes_read_ltv(hw, USER_BAP, HERMES_RID_CNFOWNNAME, |