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/rt2860/rt_linux.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/rt2860/rt_linux.c')
-rw-r--r-- | drivers/staging/rt2860/rt_linux.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/staging/rt2860/rt_linux.c b/drivers/staging/rt2860/rt_linux.c index 6536965..abfeea1 100644 --- a/drivers/staging/rt2860/rt_linux.c +++ b/drivers/staging/rt2860/rt_linux.c @@ -682,9 +682,7 @@ void RTMPSendWirelessEvent(struct rt_rtmp_adapter *pAd, if (pAddr) pBufPtr += - sprintf(pBufPtr, - "(RT2860) STA(%02x:%02x:%02x:%02x:%02x:%02x) ", - PRINT_MAC(pAddr)); + sprintf(pBufPtr, "(RT2860) STA(%pM) ", pAddr); else if (BssIdx < MAX_MBSSID_NUM) pBufPtr += sprintf(pBufPtr, "(RT2860) BSS(wlan%d) ", BssIdx); @@ -1313,9 +1311,8 @@ int RtmpOSNetDevAttach(struct net_device *pNetDev, /* OS specific flags, here we used to indicate if we are virtual interface */ pNetDev->priv_flags = pDevOpHook->priv_flags; - if (pAd->OpMode == OPMODE_STA) { + if (pAd->OpMode == OPMODE_STA) pNetDev->wireless_handlers = &rt28xx_iw_handler_def; - } /* copy the net device mac address to the net_device structure. */ NdisMoveMemory(pNetDev->dev_addr, &pDevOpHook->devAddr[0], |