]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
staging: ath6kl: '&pointer[0]' to 'pointer' fix
authorAndy Shevchenko <andy.shevchenko@gmail.com>
Fri, 17 Sep 2010 08:24:44 +0000 (11:24 +0300)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 20 Sep 2010 23:10:56 +0000 (16:10 -0700)
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/ath6kl/os/linux/ar6000_drv.c
drivers/staging/ath6kl/os/linux/cfg80211.c
drivers/staging/ath6kl/wmi/wmi.c

index c2947bc051ddd2ae106fa43d17e4d7b5a2e49773..c7922c9ff233ce8c1d5b558b384bff7960c1ba64 100644 (file)
@@ -959,7 +959,7 @@ ar6000_softmac_update(AR_SOFTC_T *ar, A_UCHAR *eeprom_data, size_t size)
        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Invalid Target Type\n"));
         return;
     }
-       printk(KERN_DEBUG "MAC from EEPROM %pM\n", &ptr_mac[0]);
+       printk(KERN_DEBUG "MAC from EEPROM %pM\n", ptr_mac);
 
     /* create a random MAC in case we cannot read file from system */
     ptr_mac[0] = 0;
@@ -988,7 +988,7 @@ ar6000_softmac_update(AR_SOFTC_T *ar, A_UCHAR *eeprom_data, size_t size)
         }
         A_RELEASE_FIRMWARE(softmac_entry);
     }
-       printk(KERN_DEBUG "MAC from %s %pM\n", source, &ptr_mac[0]);
+       printk(KERN_DEBUG "MAC from %s %pM\n", source, ptr_mac);
    calculate_crc(ar->arTargetType, eeprom_data);
 }
 #endif /* SOFTMAC_FILE_USED */
index d5890d4551bfc5cd3b37d2934a409910ef507351..a8b9241f7d879947471c1fe1b59a1d9a83e7afcd 100644 (file)
@@ -546,7 +546,7 @@ ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, A_UINT16 channel,
 
        AR_DEBUG_PRINTF(ATH_DEBUG_INFO,
                ("%s: inform bss with bssid %pM channel %d beaconInterval %d "
-                       "capability 0x%x\n", __func__, &mgmt->bssid[0],
+                       "capability 0x%x\n", __func__, mgmt->bssid,
                        ibss_channel->hw_value, beaconInterval, capability));
 
         bss = cfg80211_inform_bss_frame(ar->wdev->wiphy,
@@ -714,7 +714,7 @@ ar6k_cfg80211_scan_node(void *arg, bss_t *ni)
 
        AR_DEBUG_PRINTF(ATH_DEBUG_INFO,
                ("%s: bssid %pM channel %d freq %d size %d\n", __func__,
-                       &mgmt->bssid[0], channel->hw_value, freq, size));
+                       mgmt->bssid, channel->hw_value, freq, size));
     cfg80211_inform_bss_frame(wiphy, channel, mgmt,
                               le16_to_cpu(size),
                               signal, GFP_KERNEL);
index 9811ce786a0785a32f8f9bcc34cc0911eae221fd..7800778099bd74d2ca4310f5e4f102959b968ba9 100644 (file)
@@ -1458,7 +1458,7 @@ wmi_bssInfo_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
 
        A_DPRINTF(DBG_WMI2, (DBGFMT "bssInfo event - ch %u, rssi %02x, "
                "bssid \"%pM\"\n", DBGARG, bih->channel,
-               (unsigned char) bih->rssi, i&bih->bssid[0]));
+               (unsigned char) bih->rssi, bih->bssid));
 
     if(wps_enable && (bih->frameType == PROBERESP_FTYPE) ) {
         wmi_node_return(wmip, bss);