aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/airo.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-10-27 18:59:26 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-27 20:06:18 -0400
commite174961ca1a0b28f7abf0be47973ad57cb74e5f0 (patch)
treee8f74ecd420a0e380a71670e5aec5c2a0c15640a /drivers/net/wireless/airo.c
parent0c68ae2605dbcf67414d8d1f19af93be44b355fb (diff)
net: convert print_mac to %pM
This converts pretty much everything to print_mac. There were a few things that had conflicts which I have just dropped for now, no harm done. I've built an allyesconfig with this and looked at the files that weren't built very carefully, but it's a huge patch. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/airo.c')
-rw-r--r--drivers/net/wireless/airo.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 370133e492d2..7c99f5a5b332 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -2757,7 +2757,6 @@ static struct net_device *_init_airo_card( unsigned short irq, int port,
2757 struct net_device *dev; 2757 struct net_device *dev;
2758 struct airo_info *ai; 2758 struct airo_info *ai;
2759 int i, rc; 2759 int i, rc;
2760 DECLARE_MAC_BUF(mac);
2761 2760
2762 /* Create the network device object. */ 2761 /* Create the network device object. */
2763 dev = alloc_netdev(sizeof(*ai), "", ether_setup); 2762 dev = alloc_netdev(sizeof(*ai), "", ether_setup);
@@ -2860,8 +2859,7 @@ static struct net_device *_init_airo_card( unsigned short irq, int port,
2860 goto err_out_reg; 2859 goto err_out_reg;
2861 2860
2862 set_bit(FLAG_REGISTERED,&ai->flags); 2861 set_bit(FLAG_REGISTERED,&ai->flags);
2863 airo_print_info(dev->name, "MAC enabled %s", 2862 airo_print_info(dev->name, "MAC enabled %pM", dev->dev_addr);
2864 print_mac(mac, dev->dev_addr));
2865 2863
2866 /* Allocate the transmit buffers */ 2864 /* Allocate the transmit buffers */
2867 if (probe && !test_bit(FLAG_MPI,&ai->flags)) 2865 if (probe && !test_bit(FLAG_MPI,&ai->flags))
@@ -2918,7 +2916,6 @@ int reset_airo_card( struct net_device *dev )
2918{ 2916{
2919 int i; 2917 int i;
2920 struct airo_info *ai = dev->priv; 2918 struct airo_info *ai = dev->priv;
2921 DECLARE_MAC_BUF(mac);
2922 2919
2923 if (reset_card (dev, 1)) 2920 if (reset_card (dev, 1))
2924 return -1; 2921 return -1;
@@ -2927,8 +2924,7 @@ int reset_airo_card( struct net_device *dev )
2927 airo_print_err(dev->name, "MAC could not be enabled"); 2924 airo_print_err(dev->name, "MAC could not be enabled");
2928 return -1; 2925 return -1;
2929 } 2926 }
2930 airo_print_info(dev->name, "MAC enabled %s", 2927 airo_print_info(dev->name, "MAC enabled %pM", dev->dev_addr);
2931 print_mac(mac, dev->dev_addr));
2932 /* Allocate the transmit buffers if needed */ 2928 /* Allocate the transmit buffers if needed */
2933 if (!test_bit(FLAG_MPI,&ai->flags)) 2929 if (!test_bit(FLAG_MPI,&ai->flags))
2934 for( i = 0; i < MAX_FIDS; i++ ) 2930 for( i = 0; i < MAX_FIDS; i++ )
@@ -5330,7 +5326,6 @@ static int proc_APList_open( struct inode *inode, struct file *file ) {
5330 int i; 5326 int i;
5331 char *ptr; 5327 char *ptr;
5332 APListRid APList_rid; 5328 APListRid APList_rid;
5333 DECLARE_MAC_BUF(mac);
5334 5329
5335 if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL) 5330 if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
5336 return -ENOMEM; 5331 return -ENOMEM;
@@ -5354,8 +5349,7 @@ static int proc_APList_open( struct inode *inode, struct file *file ) {
5354// We end when we find a zero MAC 5349// We end when we find a zero MAC
5355 if ( !*(int*)APList_rid.ap[i] && 5350 if ( !*(int*)APList_rid.ap[i] &&
5356 !*(int*)&APList_rid.ap[i][2]) break; 5351 !*(int*)&APList_rid.ap[i][2]) break;
5357 ptr += sprintf(ptr, "%s\n", 5352 ptr += sprintf(ptr, "%pM\n", APList_rid.ap[i]);
5358 print_mac(mac, APList_rid.ap[i]));
5359 } 5353 }
5360 if (i==0) ptr += sprintf(ptr, "Not using specific APs\n"); 5354 if (i==0) ptr += sprintf(ptr, "Not using specific APs\n");
5361 5355
@@ -5374,7 +5368,6 @@ static int proc_BSSList_open( struct inode *inode, struct file *file ) {
5374 int rc; 5368 int rc;
5375 /* If doLoseSync is not 1, we won't do a Lose Sync */ 5369 /* If doLoseSync is not 1, we won't do a Lose Sync */
5376 int doLoseSync = -1; 5370 int doLoseSync = -1;
5377 DECLARE_MAC_BUF(mac);
5378 5371
5379 if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL) 5372 if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
5380 return -ENOMEM; 5373 return -ENOMEM;
@@ -5411,8 +5404,8 @@ static int proc_BSSList_open( struct inode *inode, struct file *file ) {
5411 we have to add a spin lock... */ 5404 we have to add a spin lock... */
5412 rc = readBSSListRid(ai, doLoseSync, &BSSList_rid); 5405 rc = readBSSListRid(ai, doLoseSync, &BSSList_rid);
5413 while(rc == 0 && BSSList_rid.index != cpu_to_le16(0xffff)) { 5406 while(rc == 0 && BSSList_rid.index != cpu_to_le16(0xffff)) {
5414 ptr += sprintf(ptr, "%s %*s rssi = %d", 5407 ptr += sprintf(ptr, "%pM %*s rssi = %d",
5415 print_mac(mac, BSSList_rid.bssid), 5408 BSSList_rid.bssid,
5416 (int)BSSList_rid.ssidLen, 5409 (int)BSSList_rid.ssidLen,
5417 BSSList_rid.ssid, 5410 BSSList_rid.ssid,
5418 le16_to_cpu(BSSList_rid.dBm)); 5411 le16_to_cpu(BSSList_rid.dBm));