cfg80211 API for channels/bitrates, mac80211 and driver conversion

[GitHub/LineageOS/android_kernel_samsung_universal7580.git] / net / mac80211 / ieee80211_iface.c

diff --git a/net/mac80211/ieee80211_iface.c b/net/mac80211/ieee80211_iface.c
index be96aa84c79a4f9481d65eafd3b0c2c6d7495b6d..27cee580f9f14b441cd7f3f4baf135723577576d 100644 (file)
--- a/net/mac80211/ieee80211_iface.c
+++ b/net/mac80211/ieee80211_iface.c
@@ -118,6 +118,8 @@ void ieee80211_if_set_type(struct net_device *dev, int type)
        sdata->bss = NULL;
        sdata->vif.type = type;
 
+       sdata->basic_rates = 0;
+
        switch (type) {
        case IEEE80211_IF_TYPE_WDS:
                /* nothing special */
@@ -126,7 +128,6 @@ void ieee80211_if_set_type(struct net_device *dev, int type)
                sdata->u.vlan.ap = NULL;
                break;
        case IEEE80211_IF_TYPE_AP:
-               sdata->u.ap.dtim_period = 2;
                sdata->u.ap.force_unicast_rateidx = -1;
                sdata->u.ap.max_ratectrl_rateidx = -1;
                skb_queue_head_init(&sdata->u.ap.ps_bc_buf);
@@ -207,8 +208,7 @@ void ieee80211_if_reinit(struct net_device *dev)
                        }
                }
 
-               kfree(sdata->u.ap.beacon_head);
-               kfree(sdata->u.ap.beacon_tail);
+               kfree(sdata->u.ap.beacon);
 
                while ((skb = skb_dequeue(&sdata->u.ap.ps_bc_buf))) {
                        local->total_ps_buffered--;