evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wil6210: add module parameter for alternate interface name

Browse source 
Add a module parameter alt_ifname that when set, will name
the primary network interface wigig<N> instead of the default
wlan<N>. This helps platforms such as android where we need to
clearly separate the WIGIG interface from the default wireless
interface.

Change-Id: Ie1cd3ccf777e84665075bc3b6d9fffa7d897de49
CRs-Fixed: 982931
Signed-off-by: Hamad Kadmany <hkadmany@codeaurora.org>
Signed-off-by: Maya Erez <merez@codeaurora.org>
This commit is contained in:
Hamad Kadmany 2016-03-28 23:21:02 +03:00 • committed by Kyle Yan
parent 1f1574bb18
commit 6af6a921f7
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/net/wireless/ath/wil6210/netdev.c
View file

@ -14,10 +14,15 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#include <linux/moduleparam.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include "wil6210.h" #include "wil6210.h"
#include "txrx.h" #include "txrx.h"
static bool alt_ifname; /* = false; */
module_param(alt_ifname, bool, S_IRUGO);
MODULE_PARM_DESC(alt_ifname, " use an alternate interface name wigigN instead of wlanN");
static int wil_open(struct net_device *ndev) static int wil_open(struct net_device *ndev)
{ {
struct wil6210_priv *wil = ndev_to_wil(ndev); struct wil6210_priv *wil = ndev_to_wil(ndev);
@ -136,6 +141,7 @@ void *wil_if_alloc(struct device *dev)
struct wil6210_priv *wil; struct wil6210_priv *wil;
struct ieee80211_channel *ch; struct ieee80211_channel *ch;
int rc = 0; int rc = 0;
const char *ifname = alt_ifname ? "wigig%d" : "wlan%d";
wdev = wil_cfg80211_init(dev); wdev = wil_cfg80211_init(dev);
if (IS_ERR(wdev)) { if (IS_ERR(wdev)) {
@ -160,7 +166,7 @@ void *wil_if_alloc(struct device *dev)
ch = wdev->wiphy->bands[IEEE80211_BAND_60GHZ]->channels; ch = wdev->wiphy->bands[IEEE80211_BAND_60GHZ]->channels;
cfg80211_chandef_create(&wdev->preset_chandef, ch, NL80211_CHAN_NO_HT); cfg80211_chandef_create(&wdev->preset_chandef, ch, NL80211_CHAN_NO_HT);
ndev = alloc_netdev(0, "wlan%d", NET_NAME_UNKNOWN, wil_dev_setup); ndev = alloc_netdev(0, ifname, NET_NAME_UNKNOWN, wil_dev_setup);
if (!ndev) { if (!ndev) {
dev_err(dev, "alloc_netdev_mqs failed\n"); dev_err(dev, "alloc_netdev_mqs failed\n");
rc = -ENOMEM; rc = -ENOMEM;