net: wireless: sd8797: change wlan interface to wlan0
Narayan Reddy [Thu, 26 Apr 2012 05:04:33 +0000 (10:04 +0530)]
Change wlan interface from mlan to wlan.

Bug 954218

Change-Id: I5b2b2840a4830eda908a47cc0fc59d0479a1df34
Signed-off-by: Narayan Reddy <narayanr@nvidia.com>
Reviewed-on: http://git-master/r/98997
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Rakesh Kumar <krakesh@nvidia.com>

drivers/net/wireless/sd8797/mlinux/moal_eth_ioctl.c
drivers/net/wireless/sd8797/mlinux/moal_main.c

index 4e9ef88..2282216 100644 (file)
@@ -1133,7 +1133,12 @@ woal_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
         ret = -EINVAL;
 #endif
 #else
-        ret = -EINVAL;
+       /*
+        * FIXME Some of the IOCTLs are not supported by Marvel driver
+        * for CFG80211 and hence it is failing to turn on from UI,
+        * so returing 0(Sucess) for the time being.
+        */
+        ret = 0;
 #endif
         break;
     }
index 47c3252..eac248b 100644 (file)
@@ -1385,7 +1385,7 @@ woal_add_interface(moal_handle * handle, t_u8 bss_index, t_u8 bss_type)
     }
 #ifdef STA_SUPPORT
     /* Allocate device name */
-    if ((bss_type == MLAN_BSS_TYPE_STA) && (dev_alloc_name(dev, "mlan%d") < 0)) {
+    if ((bss_type == MLAN_BSS_TYPE_STA) && (dev_alloc_name(dev, "wlan%d") < 0)) {
         PRINTM(MERROR, "Could not allocate mlan device name\n");
         goto error;
     }