diff options
| author | David S. Miller <davem@davemloft.net> | 2015-03-31 16:39:04 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-31 16:39:04 -0400 |
| commit | 7b6249bba940f57c20cdde793b306ca3831778c7 (patch) | |
| tree | 24caf2ec9ea6fca08fe225228614807d0919b4b2 /net/mac80211/main.c | |
| parent | fbcb21705930f2930f506149d0b8d36dfbe45107 (diff) | |
| parent | 2c44be81f0fc147eed9dc63e2601318b2c007aeb (diff) | |
| download | talos-obmc-linux-7b6249bba940f57c20cdde793b306ca3831778c7.tar.gz talos-obmc-linux-7b6249bba940f57c20cdde793b306ca3831778c7.zip | |
Merge tag 'mac80211-next-for-davem-2015-03-30' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
Lots of updates for net-next; along with the usual flurry
of small fixes, cleanups and internal features we have:
* VHT support for TDLS and IBSS (conditional on drivers though)
* first TX performance improvements (the biggest will come later)
* many suspend/resume (race) fixes
* name_assign_type support from Tom Gundersen
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/main.c')
| -rw-r--r-- | net/mac80211/main.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 5e09d354c5a5..4977967c8b00 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -1057,7 +1057,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) /* add one default STA interface if supported */ if (local->hw.wiphy->interface_modes & BIT(NL80211_IFTYPE_STATION) && !(hw->flags & IEEE80211_HW_NO_AUTO_VIF)) { - result = ieee80211_if_add(local, "wlan%d", NULL, + result = ieee80211_if_add(local, "wlan%d", NET_NAME_ENUM, NULL, NL80211_IFTYPE_STATION, NULL); if (result) wiphy_warn(local->hw.wiphy, @@ -1201,8 +1201,6 @@ void ieee80211_free_hw(struct ieee80211_hw *hw) ieee80211_free_ack_frame, NULL); idr_destroy(&local->ack_status_frames); - kfree(rcu_access_pointer(local->tx_latency)); - sta_info_stop(local); wiphy_free(local->hw.wiphy); |
