Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / rt2860 / rt_linux.c

diff --git a/drivers/staging/rt2860/rt_linux.c b/drivers/staging/rt2860/rt_linux.c
index 6536965df3f30ed86a5238e976bd4542553eacad..abfeea11721d7bb4c95ee8d23961ffc4e8e57bac 100644 (file)
--- 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],