Merge "wil6210: add module parameter for alternate interface name" (d1e6f204) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/net/wireless/ath/wil6210/netdev.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -14,10 +14,15 @@
		* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
		*/

		#include <linux/moduleparam.h>
		#include <linux/etherdevice.h>
		#include "wil6210.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)
		{
		struct wil6210_priv *wil = ndev_to_wil(ndev);
		@@ -136,6 +141,7 @@ void wil_if_alloc(struct device dev)
		struct wil6210_priv *wil;
		struct ieee80211_channel *ch;
		int rc = 0;
		const char *ifname = alt_ifname ? "wigig%d" : "wlan%d";

		wdev = wil_cfg80211_init(dev);
		if (IS_ERR(wdev)) {
		@@ -160,7 +166,7 @@ void wil_if_alloc(struct device dev)
		ch = wdev->wiphy->bands[IEEE80211_BAND_60GHZ]->channels;
		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) {
		dev_err(dev, "alloc_netdev_mqs failed\n");
		rc = -ENOMEM;