diff options
| author | Narayan Reddy <narayanr@nvidia.com> | 2012-04-26 10:34:33 +0530 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2012-05-02 14:20:54 -0700 |
| commit | 5d5d968f15e3304c6ae913e1b09424f5cd93ebe8 (patch) | |
| tree | d9058433027588a2a83eb5ec4b05859f41a7986e /drivers | |
| parent | 46cb8a34154f438e2cd9f6f1e0b48b5164c66926 (diff) | |
net: wireless: sd8797: change wlan interface to wlan0
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/sd8797/mlinux/moal_eth_ioctl.c | 7 | ||||
| -rw-r--r-- | drivers/net/wireless/sd8797/mlinux/moal_main.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/wireless/sd8797/mlinux/moal_eth_ioctl.c b/drivers/net/wireless/sd8797/mlinux/moal_eth_ioctl.c index 4e9ef8850b53..2282216f7d55 100644 --- a/drivers/net/wireless/sd8797/mlinux/moal_eth_ioctl.c +++ b/drivers/net/wireless/sd8797/mlinux/moal_eth_ioctl.c @@ -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; } diff --git a/drivers/net/wireless/sd8797/mlinux/moal_main.c b/drivers/net/wireless/sd8797/mlinux/moal_main.c index 47c3252483a4..eac248b70129 100644 --- a/drivers/net/wireless/sd8797/mlinux/moal_main.c +++ b/drivers/net/wireless/sd8797/mlinux/moal_main.c @@ -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; } |