diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2010-10-30 22:16:56 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-10-30 22:16:56 +0200 |
| commit | f1e095f1d206b81b44160f41278ce5c78641e9b7 (patch) | |
| tree | bd293d46d2d3e4cdf435a22ddb2877c6ba1b8acc /drivers/staging/rt2860/common/mlme.c | |
| parent | telephony: fix return value (diff) | |
| parent | Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify (diff) | |
| download | linux-dev-f1e095f1d206b81b44160f41278ce5c78641e9b7.tar.xz linux-dev-f1e095f1d206b81b44160f41278ce5c78641e9b7.zip | |
Merge branch 'master' into for-next
Diffstat (limited to 'drivers/staging/rt2860/common/mlme.c')
| -rw-r--r-- | drivers/staging/rt2860/common/mlme.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/rt2860/common/mlme.c b/drivers/staging/rt2860/common/mlme.c index 9fc34a8f2180..7300c6e9c175 100644 --- a/drivers/staging/rt2860/common/mlme.c +++ b/drivers/staging/rt2860/common/mlme.c @@ -38,6 +38,7 @@ #include "../rt_config.h" #include <stdarg.h> +#include <linux/kernel.h> u8 CISCO_OUI[] = { 0x00, 0x40, 0x96 }; @@ -1536,10 +1537,8 @@ void MlmeAutoReconnectLastSSID(struct rt_rtmp_adapter *pAd) { if (pAd->StaCfg.bAutoConnectByBssid) { DBGPRINT(RT_DEBUG_TRACE, - ("Driver auto reconnect to last OID_802_11_BSSID setting - %02X:%02X:%02X:%02X:%02X:%02X\n", - pAd->MlmeAux.Bssid[0], pAd->MlmeAux.Bssid[1], - pAd->MlmeAux.Bssid[2], pAd->MlmeAux.Bssid[3], - pAd->MlmeAux.Bssid[4], pAd->MlmeAux.Bssid[5])); + ("Driver auto reconnect to last OID_802_11_BSSID " + "setting - %pM\n", pAd->MlmeAux.Bssid)); pAd->MlmeAux.Channel = pAd->CommonCfg.Channel; MlmeEnqueue(pAd, |