[PATCH] mac80211: remove generic IE for AP interfaces

This is not useful since we do not support probe response
offload to hardware at this time and beacons are set in
another way.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

5 files changed, 0 insertions, 23 deletions

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 8fb975f0bed4..6ec12bd3a3ec 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -519,11 +519,6 @@ struct ieee80211_if_init_conf {
  *      config_interface() call, so copy the value somewhere if you need
  *      it.
  * @ssid_len: length of the @ssid field.
- * @generic_elem: used (together with @generic_elem_len) by drivers for
- *      hardware that generate beacons independently. The pointer is valid
- *      only during the config_interface() call, so copy the value somewhere
- *      if you need it.
- * @generic_elem_len: length of the generic element.
  * @beacon: beacon template. Valid only if @host_gen_beacon_template in
  *      &struct ieee80211_hw is set. The driver is responsible of freeing
  *      the sk_buff.
@@ -538,8 +533,6 @@ struct ieee80211_if_conf {
         u8 *bssid;
         u8 *ssid;
         size_t ssid_len;
-        u8 *generic_elem;
-        size_t generic_elem_len;
         struct sk_buff *beacon;
         struct ieee80211_tx_control *beacon_control;
 };
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 2501bff0d15e..210319f9ea2f 100644
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -615,13 +615,9 @@ static int __ieee80211_if_config(struct net_device *dev,
                 conf.bssid = sdata->u.sta.bssid;
                 conf.ssid = sdata->u.sta.ssid;
                 conf.ssid_len = sdata->u.sta.ssid_len;
-                conf.generic_elem = sdata->u.sta.extra_ie;
-                conf.generic_elem_len = sdata->u.sta.extra_ie_len;
         } else if (sdata->type == IEEE80211_IF_TYPE_AP) {
                 conf.ssid = sdata->u.ap.ssid;
                 conf.ssid_len = sdata->u.ap.ssid_len;
-                conf.generic_elem = sdata->u.ap.generic_elem;
-                conf.generic_elem_len = sdata->u.ap.generic_elem_len;
                 conf.beacon = beacon;
                 conf.beacon_control = control;
         }
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index d2f8c8e57ac4..0c9548a0a4ec 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -197,8 +197,6 @@ struct ieee80211_if_ap {
 
         u8 ssid[IEEE80211_MAX_SSID_LEN];
         size_t ssid_len;
-        u8 *generic_elem;
-        size_t generic_elem_len;
 
         /* yes, this looks ugly, but guarantees that we can later use
          * bitmap_empty :)
diff --git a/net/mac80211/ieee80211_iface.c b/net/mac80211/ieee80211_iface.c
index 60cee6e602d2..08c1e188d4b8 100644
--- a/net/mac80211/ieee80211_iface.c
+++ b/net/mac80211/ieee80211_iface.c
@@ -269,7 +269,6 @@ void ieee80211_if_reinit(struct net_device *dev)
 
                 kfree(sdata->u.ap.beacon_head);
                 kfree(sdata->u.ap.beacon_tail);
-                kfree(sdata->u.ap.generic_elem);
 
                 while ((skb = skb_dequeue(&sdata->u.ap.ps_bc_buf))) {
                         local->total_ps_buffered--;
diff --git a/net/mac80211/ieee80211_ioctl.c b/net/mac80211/ieee80211_ioctl.c
index 3c324c3bcd9c..48e68434b38a 100644
--- a/net/mac80211/ieee80211_ioctl.c
+++ b/net/mac80211/ieee80211_ioctl.c
@@ -120,15 +120,6 @@ static int ieee80211_ioctl_siwgenie(struct net_device *dev,
                 return 0;
         }
 
-        if (sdata->type == IEEE80211_IF_TYPE_AP) {
-                kfree(sdata->u.ap.generic_elem);
-                sdata->u.ap.generic_elem = kmalloc(data->length, GFP_KERNEL);
-                if (!sdata->u.ap.generic_elem)
-                        return -ENOMEM;
-                memcpy(sdata->u.ap.generic_elem, extra, data->length);
-                sdata->u.ap.generic_elem_len = data->length;
-                return ieee80211_if_config(dev);
-        }
         return -EOPNOTSUPP;
 }