Maya Erez <qca_merez@xxxxxxxxxxxxxxxx> writes:
> From: Lior David <qca_liord@xxxxxxxxxxxxxxxx>
>
> 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.
>
> Signed-off-by: Lior David <qca_liord@xxxxxxxxxxxxxxxx>
> Signed-off-by: Maya Erez <qca_merez@xxxxxxxxxxxxxxxx>
> ---
> drivers/net/wireless/ath/wil6210/netdev.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/ath/wil6210/netdev.c b/drivers/net/wireless/ath/wil6210/netdev.c
> index 3bc0e26..f78ea91 100644
> --- a/drivers/net/wireless/ath/wil6210/netdev.c
> +++ b/drivers/net/wireless/ath/wil6210/netdev.c
> @@ -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;
To me this looks like an ugly hack and I hope there is a better way to
handle the problem this patch is fixing. I think interface names
shouldn't matter from functionality point of view, anything requiring
certain naming is broken.
But if the interface name is so important why not use "wigig%d" always?
The user space can rename the interface name anyway.
--
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
