diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/wlags49_h2/wl_wext.c | |
parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/wlags49_h2/wl_wext.c')
-rw-r--r-- | drivers/staging/wlags49_h2/wl_wext.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/staging/wlags49_h2/wl_wext.c b/drivers/staging/wlags49_h2/wl_wext.c index 06467f1..9e5da08 100644 --- a/drivers/staging/wlags49_h2/wl_wext.c +++ b/drivers/staging/wlags49_h2/wl_wext.c @@ -789,7 +789,8 @@ static int wireless_get_ap_list (struct net_device *dev, struct iw_request_info memcpy( hwa[count].sa_data, (*p)/*lp->scan_results*/.APTable[count].bssid, ETH_ALEN ); #else //;?why use BSSID and bssid as names in seemingly very comparable situations - DBG_PRINT( "BSSID: %s\n", DbgHwAddr( (*p)/*lp->probe_results*/.ProbeTable[count].BSSID )); + DBG_PRINT("BSSID: %pM\n", + (*p).ProbeTable[count].BSSID); memcpy( hwa[count].sa_data, (*p)/*lp->probe_results*/.ProbeTable[count].BSSID, ETH_ALEN ); #endif // WARP @@ -3937,9 +3938,9 @@ void wl_wext_event_mic_failed( struct net_device *dev ) a problem in future versions of the supplicant, if they ever actually parse these parameters */ #if DBG - sprintf( msg, "MLME-MICHAELMICFAILURE.indication(keyid=%d %scast addr=" - "%s)", key_idx, addr1[0] & 0x01 ? "broad" : "uni", - DbgHwAddr( addr2 )); + sprintf(msg, "MLME-MICHAELMICFAILURE.indication(keyid=%d %scast " + "addr=%pM)", key_idx, addr1[0] & 0x01 ? "broad" : "uni", + addr2); #endif wrqu.data.length = strlen( msg ); wireless_send_event( dev, IWEVCUSTOM, &wrqu, msg ); |