diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-12 17:22:13 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-12 17:22:13 +1100 |
| commit | 96aacb269862dbe72b03dad4de23ac2caa1751f6 (patch) | |
| tree | 10dab1a7a31f7d56ec602c8853b51ae1decc5cb1 /drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | |
| parent | 781c0523eb18341194287c70599a01004f9e2366 (diff) | |
| parent | 414993c79ae8a6a3c5fed3ac9f47a72e0f334ef1 (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/sm7xx/smtc2d.c
drivers/staging/sm7xx/smtc2d.h
Diffstat (limited to 'drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c')
| -rw-r--r-- | drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c index 3441b72dd8fa..a3302d5e01ab 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c @@ -386,10 +386,10 @@ int ieee80211_wx_get_scan(struct ieee80211_device *ieee, else IEEE80211_DEBUG_SCAN( "Not showing network '%s (" - MAC_FMT ")' due to age (%lums).\n", + "%pM)' due to age (%lums).\n", escape_essid(network->ssid, network->ssid_len), - MAC_ARG(network->bssid), + network->bssid, (jiffies - network->last_scanned) / (HZ / 100)); } @@ -933,7 +933,7 @@ int ieee80211_wx_set_auth(struct ieee80211_device *ieee, #if 1 case IW_AUTH_WPA_ENABLED: ieee->wpa_enabled = (data->value)?1:0; - //printk("enalbe wpa:%d\n", ieee->wpa_enabled); + //printk("enable wpa:%d\n", ieee->wpa_enabled); break; #endif |