diff options
author | Tom Gundersen <teg@jklm.no> | 2015-03-18 06:13:39 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2015-03-30 04:36:17 -0400 |
commit | 6bab2e19c5ffd1f21b28c2cabb3801a37b77ae69 (patch) | |
tree | 6e2f45a9254d9def4beecc02c2e14b2fc78d3be5 /net/mac80211/main.c | |
parent | 6a8b4adb47aea322e376cd1be62781c50dc1a9b5 (diff) |
cfg80211: pass name_assign_type to rdev_add_virtual_intf()
This will expose in /sys whether the ifname of a device is set by
userspace or generated by the kernel. The latter kind (wlanX, etc)
is not deterministic, so userspace needs to rename these devices
to names that are guaranteed to stay the same between reboots. The
former, however should never be renamed, so userspace needs to be
able to reliably tell the difference.
Similar functionality was introduced for the rtnetlink core in
commit 5517750f058e ("net: rtnetlink - make create_link take name_assign_type")
Signed-off-by: Tom Gundersen <teg@jklm.no>
Cc: Kalle Valo <kvalo@qca.qualcomm.com>
Cc: Brett Rudley <brudley@broadcom.com>
Cc: Arend van Spriel <arend@broadcom.com>
Cc: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Cc: Hante Meuleman <meuleman@broadcom.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
[reformat changelog to fit 72 cols]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r-- | net/mac80211/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 2f51e6d1f2b3..4977967c8b00 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c | |||
@@ -1057,7 +1057,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) | |||
1057 | /* add one default STA interface if supported */ | 1057 | /* add one default STA interface if supported */ |
1058 | if (local->hw.wiphy->interface_modes & BIT(NL80211_IFTYPE_STATION) && | 1058 | if (local->hw.wiphy->interface_modes & BIT(NL80211_IFTYPE_STATION) && |
1059 | !(hw->flags & IEEE80211_HW_NO_AUTO_VIF)) { | 1059 | !(hw->flags & IEEE80211_HW_NO_AUTO_VIF)) { |
1060 | result = ieee80211_if_add(local, "wlan%d", NULL, | 1060 | result = ieee80211_if_add(local, "wlan%d", NET_NAME_ENUM, NULL, |
1061 | NL80211_IFTYPE_STATION, NULL); | 1061 | NL80211_IFTYPE_STATION, NULL); |
1062 | if (result) | 1062 | if (result) |
1063 | wiphy_warn(local->hw.wiphy, | 1063 | wiphy_warn(local->hw.wiphy, |