[MAC80211]: reorder interface related functions

This patch groups a whole bunch of functions together to make
ieee80211.c more maintainable.

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

1 files changed, 599 insertions, 606 deletions

diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 2b15505a6e48..f240f9706081 100644
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -61,6 +61,605 @@ struct ieee80211_tx_status_rtap_hdr {
         u8 data_retries;
 } __attribute__ ((packed));
 
+/* common interface routines */
+
+static struct net_device_stats *ieee80211_get_stats(struct net_device *dev)
+{
+        struct ieee80211_sub_if_data *sdata;
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        return &(sdata->stats);
+}
+
+static int header_parse_80211(struct sk_buff *skb, unsigned char *haddr)
+{
+        memcpy(haddr, skb_mac_header(skb) + 10, ETH_ALEN); /* addr2 */
+        return ETH_ALEN;
+}
+
+/* master interface */
+
+static int ieee80211_master_open(struct net_device *dev)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sub_if_data *sdata;
+        int res = -EOPNOTSUPP;
+
+        read_lock(&local->sub_if_lock);
+        list_for_each_entry(sdata, &local->sub_if_list, list) {
+                if (sdata->dev != dev && netif_running(sdata->dev)) {
+                        res = 0;
+                        break;
+                }
+        }
+        read_unlock(&local->sub_if_lock);
+        return res;
+}
+
+static int ieee80211_master_stop(struct net_device *dev)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sub_if_data *sdata;
+
+        read_lock(&local->sub_if_lock);
+        list_for_each_entry(sdata, &local->sub_if_list, list)
+                if (sdata->dev != dev && netif_running(sdata->dev))
+                        dev_close(sdata->dev);
+        read_unlock(&local->sub_if_lock);
+
+        return 0;
+}
+
+/* management interface */
+
+static void
+ieee80211_fill_frame_info(struct ieee80211_local *local,
+                          struct ieee80211_frame_info *fi,
+                          struct ieee80211_rx_status *status)
+{
+        if (status) {
+                struct timespec ts;
+                struct ieee80211_rate *rate;
+
+                jiffies_to_timespec(jiffies, &ts);
+                fi->hosttime = cpu_to_be64((u64) ts.tv_sec * 1000000 +
+                                           ts.tv_nsec / 1000);
+                fi->mactime = cpu_to_be64(status->mactime);
+                switch (status->phymode) {
+                case MODE_IEEE80211A:
+                        fi->phytype = htonl(ieee80211_phytype_ofdm_dot11_a);
+                        break;
+                case MODE_IEEE80211B:
+                        fi->phytype = htonl(ieee80211_phytype_dsss_dot11_b);
+                        break;
+                case MODE_IEEE80211G:
+                        fi->phytype = htonl(ieee80211_phytype_pbcc_dot11_g);
+                        break;
+                case MODE_ATHEROS_TURBO:
+                        fi->phytype =
+                                htonl(ieee80211_phytype_dsss_dot11_turbo);
+                        break;
+                default:
+                        fi->phytype = htonl(0xAAAAAAAA);
+                        break;
+                }
+                fi->channel = htonl(status->channel);
+                rate = ieee80211_get_rate(local, status->phymode,
+                                          status->rate);
+                if (rate) {
+                        fi->datarate = htonl(rate->rate);
+                        if (rate->flags & IEEE80211_RATE_PREAMBLE2) {
+                                if (status->rate == rate->val)
+                                        fi->preamble = htonl(2); /* long */
+                                else if (status->rate == rate->val2)
+                                        fi->preamble = htonl(1); /* short */
+                        } else
+                                fi->preamble = htonl(0);
+                } else {
+                        fi->datarate = htonl(0);
+                        fi->preamble = htonl(0);
+                }
+
+                fi->antenna = htonl(status->antenna);
+                fi->priority = htonl(0xffffffff); /* no clue */
+                fi->ssi_type = htonl(ieee80211_ssi_raw);
+                fi->ssi_signal = htonl(status->ssi);
+                fi->ssi_noise = 0x00000000;
+                fi->encoding = 0;
+        } else {
+                /* clear everything because we really don't know.
+                 * the msg_type field isn't present on monitor frames
+                 * so we don't know whether it will be present or not,
+                 * but it's ok to not clear it since it'll be assigned
+                 * anyway */
+                memset(fi, 0, sizeof(*fi) - sizeof(fi->msg_type));
+
+                fi->ssi_type = htonl(ieee80211_ssi_none);
+        }
+        fi->version = htonl(IEEE80211_FI_VERSION);
+        fi->length = cpu_to_be32(sizeof(*fi) - sizeof(fi->msg_type));
+}
+
+/* this routine is actually not just for this, but also
+ * for pushing fake 'management' frames into userspace.
+ * it shall be replaced by a netlink-based system. */
+void
+ieee80211_rx_mgmt(struct ieee80211_local *local, struct sk_buff *skb,
+                  struct ieee80211_rx_status *status, u32 msg_type)
+{
+        struct ieee80211_frame_info *fi;
+        const size_t hlen = sizeof(struct ieee80211_frame_info);
+        struct ieee80211_sub_if_data *sdata;
+
+        skb->dev = local->apdev;
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(local->apdev);
+
+        if (skb_headroom(skb) < hlen) {
+                I802_DEBUG_INC(local->rx_expand_skb_head);
+                if (pskb_expand_head(skb, hlen, 0, GFP_ATOMIC)) {
+                        dev_kfree_skb(skb);
+                        return;
+                }
+        }
+
+        fi = (struct ieee80211_frame_info *) skb_push(skb, hlen);
+
+        ieee80211_fill_frame_info(local, fi, status);
+        fi->msg_type = htonl(msg_type);
+
+        sdata->stats.rx_packets++;
+        sdata->stats.rx_bytes += skb->len;
+
+        skb_set_mac_header(skb, 0);
+        skb->ip_summed = CHECKSUM_UNNECESSARY;
+        skb->pkt_type = PACKET_OTHERHOST;
+        skb->protocol = htons(ETH_P_802_2);
+        memset(skb->cb, 0, sizeof(skb->cb));
+        netif_rx(skb);
+}
+
+int ieee80211_radar_status(struct ieee80211_hw *hw, int channel,
+                           int radar, int radar_type)
+{
+        struct sk_buff *skb;
+        struct ieee80211_radar_info *msg;
+        struct ieee80211_local *local = hw_to_local(hw);
+
+        if (!local->apdev)
+                return 0;
+
+        skb = dev_alloc_skb(sizeof(struct ieee80211_frame_info) +
+                            sizeof(struct ieee80211_radar_info));
+
+        if (!skb)
+                return -ENOMEM;
+        skb_reserve(skb, sizeof(struct ieee80211_frame_info));
+
+        msg = (struct ieee80211_radar_info *)
+                skb_put(skb, sizeof(struct ieee80211_radar_info));
+        msg->channel = channel;
+        msg->radar = radar;
+        msg->radar_type = radar_type;
+
+        ieee80211_rx_mgmt(local, skb, NULL, ieee80211_msg_radar);
+        return 0;
+}
+EXPORT_SYMBOL(ieee80211_radar_status);
+
+void ieee80211_key_threshold_notify(struct net_device *dev,
+                                    struct ieee80211_key *key,
+                                    struct sta_info *sta)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct sk_buff *skb;
+        struct ieee80211_msg_key_notification *msg;
+
+        /* if no one will get it anyway, don't even allocate it.
+         * unlikely because this is only relevant for APs
+         * where the device must be open... */
+        if (unlikely(!local->apdev))
+                return;
+
+        skb = dev_alloc_skb(sizeof(struct ieee80211_frame_info) +
+                            sizeof(struct ieee80211_msg_key_notification));
+        if (!skb)
+                return;
+
+        skb_reserve(skb, sizeof(struct ieee80211_frame_info));
+        msg = (struct ieee80211_msg_key_notification *)
+                skb_put(skb, sizeof(struct ieee80211_msg_key_notification));
+        msg->tx_rx_count = key->tx_rx_count;
+        memcpy(msg->ifname, dev->name, IFNAMSIZ);
+        if (sta)
+                memcpy(msg->addr, sta->addr, ETH_ALEN);
+        else
+                memset(msg->addr, 0xff, ETH_ALEN);
+
+        key->tx_rx_count = 0;
+
+        ieee80211_rx_mgmt(local, skb, NULL,
+                          ieee80211_msg_key_threshold_notification);
+}
+
+static int ieee80211_mgmt_open(struct net_device *dev)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+
+        if (!netif_running(local->mdev))
+                return -EOPNOTSUPP;
+        return 0;
+}
+
+static int ieee80211_mgmt_stop(struct net_device *dev)
+{
+        return 0;
+}
+
+static int ieee80211_change_mtu_apdev(struct net_device *dev, int new_mtu)
+{
+        /* FIX: what would be proper limits for MTU?
+         * This interface uses 802.11 frames. */
+        if (new_mtu < 256 || new_mtu > IEEE80211_MAX_DATA_LEN) {
+                printk(KERN_WARNING "%s: invalid MTU %d\n",
+                       dev->name, new_mtu);
+                return -EINVAL;
+        }
+
+#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
+        printk(KERN_DEBUG "%s: setting MTU %d\n", dev->name, new_mtu);
+#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
+        dev->mtu = new_mtu;
+        return 0;
+}
+
+void ieee80211_if_mgmt_setup(struct net_device *dev)
+{
+        ether_setup(dev);
+        dev->hard_start_xmit = ieee80211_mgmt_start_xmit;
+        dev->change_mtu = ieee80211_change_mtu_apdev;
+        dev->get_stats = ieee80211_get_stats;
+        dev->open = ieee80211_mgmt_open;
+        dev->stop = ieee80211_mgmt_stop;
+        dev->type = ARPHRD_IEEE80211_PRISM;
+        dev->hard_header_parse = header_parse_80211;
+        dev->uninit = ieee80211_if_reinit;
+        dev->destructor = ieee80211_if_free;
+}
+
+/* regular interfaces */
+
+static int ieee80211_change_mtu(struct net_device *dev, int new_mtu)
+{
+        /* FIX: what would be proper limits for MTU?
+         * This interface uses 802.3 frames. */
+        if (new_mtu < 256 || new_mtu > IEEE80211_MAX_DATA_LEN - 24 - 6) {
+                printk(KERN_WARNING "%s: invalid MTU %d\n",
+                       dev->name, new_mtu);
+                return -EINVAL;
+        }
+
+#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
+        printk(KERN_DEBUG "%s: setting MTU %d\n", dev->name, new_mtu);
+#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
+        dev->mtu = new_mtu;
+        return 0;
+}
+
+static inline int identical_mac_addr_allowed(int type1, int type2)
+{
+        return (type1 == IEEE80211_IF_TYPE_MNTR ||
+                type2 == IEEE80211_IF_TYPE_MNTR ||
+                (type1 == IEEE80211_IF_TYPE_AP &&
+                 type2 == IEEE80211_IF_TYPE_WDS) ||
+                (type1 == IEEE80211_IF_TYPE_WDS &&
+                 (type2 == IEEE80211_IF_TYPE_WDS ||
+                  type2 == IEEE80211_IF_TYPE_AP)) ||
+                (type1 == IEEE80211_IF_TYPE_AP &&
+                 type2 == IEEE80211_IF_TYPE_VLAN) ||
+                (type1 == IEEE80211_IF_TYPE_VLAN &&
+                 (type2 == IEEE80211_IF_TYPE_AP ||
+                  type2 == IEEE80211_IF_TYPE_VLAN)));
+}
+
+/* Check if running monitor interfaces should go to a "soft monitor" mode
+ * and switch them if necessary. */
+static inline void ieee80211_start_soft_monitor(struct ieee80211_local *local)
+{
+        struct ieee80211_if_init_conf conf;
+
+        if (local->open_count && local->open_count == local->monitors &&
+            !(local->hw.flags & IEEE80211_HW_MONITOR_DURING_OPER) &&
+            local->ops->remove_interface) {
+                conf.if_id = -1;
+                conf.type = IEEE80211_IF_TYPE_MNTR;
+                conf.mac_addr = NULL;
+                local->ops->remove_interface(local_to_hw(local), &conf);
+        }
+}
+
+/* Check if running monitor interfaces should go to a "hard monitor" mode
+ * and switch them if necessary. */
+static void ieee80211_start_hard_monitor(struct ieee80211_local *local)
+{
+        struct ieee80211_if_init_conf conf;
+
+        if (local->open_count && local->open_count == local->monitors &&
+            !(local->hw.flags & IEEE80211_HW_MONITOR_DURING_OPER)) {
+                conf.if_id = -1;
+                conf.type = IEEE80211_IF_TYPE_MNTR;
+                conf.mac_addr = NULL;
+                local->ops->add_interface(local_to_hw(local), &conf);
+        }
+}
+
+static int ieee80211_open(struct net_device *dev)
+{
+        struct ieee80211_sub_if_data *sdata, *nsdata;
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_if_init_conf conf;
+        int res;
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        read_lock(&local->sub_if_lock);
+        list_for_each_entry(nsdata, &local->sub_if_list, list) {
+                struct net_device *ndev = nsdata->dev;
+
+                if (ndev != dev && ndev != local->mdev && netif_running(ndev) &&
+                    compare_ether_addr(dev->dev_addr, ndev->dev_addr) == 0 &&
+                    !identical_mac_addr_allowed(sdata->type, nsdata->type)) {
+                        read_unlock(&local->sub_if_lock);
+                        return -ENOTUNIQ;
+                }
+        }
+        read_unlock(&local->sub_if_lock);
+
+        if (sdata->type == IEEE80211_IF_TYPE_WDS &&
+            is_zero_ether_addr(sdata->u.wds.remote_addr))
+                return -ENOLINK;
+
+        if (sdata->type == IEEE80211_IF_TYPE_MNTR && local->open_count &&
+            !(local->hw.flags & IEEE80211_HW_MONITOR_DURING_OPER)) {
+                /* run the interface in a "soft monitor" mode */
+                local->monitors++;
+                local->open_count++;
+                local->hw.conf.flags |= IEEE80211_CONF_RADIOTAP;
+                return 0;
+        }
+        ieee80211_start_soft_monitor(local);
+
+        conf.if_id = dev->ifindex;
+        conf.type = sdata->type;
+        conf.mac_addr = dev->dev_addr;
+        res = local->ops->add_interface(local_to_hw(local), &conf);
+        if (res) {
+                if (sdata->type == IEEE80211_IF_TYPE_MNTR)
+                        ieee80211_start_hard_monitor(local);
+                return res;
+        }
+
+        if (local->open_count == 0) {
+                res = 0;
+                tasklet_enable(&local->tx_pending_tasklet);
+                tasklet_enable(&local->tasklet);
+                if (local->ops->open)
+                        res = local->ops->open(local_to_hw(local));
+                if (res == 0) {
+                        res = dev_open(local->mdev);
+                        if (res) {
+                                if (local->ops->stop)
+                                        local->ops->stop(local_to_hw(local));
+                        } else {
+                                res = ieee80211_hw_config(local);
+                                if (res && local->ops->stop)
+                                        local->ops->stop(local_to_hw(local));
+                                else if (!res && local->apdev)
+                                        dev_open(local->apdev);
+                        }
+                }
+                if (res) {
+                        if (local->ops->remove_interface)
+                                local->ops->remove_interface(local_to_hw(local),
+                                                            &conf);
+                        return res;
+                }
+        }
+        local->open_count++;
+
+        if (sdata->type == IEEE80211_IF_TYPE_MNTR) {
+                local->monitors++;
+                local->hw.conf.flags |= IEEE80211_CONF_RADIOTAP;
+        } else
+                ieee80211_if_config(dev);
+
+        if (sdata->type == IEEE80211_IF_TYPE_STA &&
+            !local->user_space_mlme)
+                netif_carrier_off(dev);
+        else
+                netif_carrier_on(dev);
+
+        netif_start_queue(dev);
+        return 0;
+}
+
+static void ieee80211_if_shutdown(struct net_device *dev)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+
+        ASSERT_RTNL();
+        switch (sdata->type) {
+        case IEEE80211_IF_TYPE_STA:
+        case IEEE80211_IF_TYPE_IBSS:
+                sdata->u.sta.state = IEEE80211_DISABLED;
+                del_timer_sync(&sdata->u.sta.timer);
+                skb_queue_purge(&sdata->u.sta.skb_queue);
+                if (!local->ops->hw_scan &&
+                    local->scan_dev == sdata->dev) {
+                        local->sta_scanning = 0;
+                        cancel_delayed_work(&local->scan_work);
+                }
+                flush_workqueue(local->hw.workqueue);
+                break;
+        }
+}
+
+static int ieee80211_stop(struct net_device *dev)
+{
+        struct ieee80211_sub_if_data *sdata;
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+
+        if (sdata->type == IEEE80211_IF_TYPE_MNTR &&
+            local->open_count > 1 &&
+            !(local->hw.flags & IEEE80211_HW_MONITOR_DURING_OPER)) {
+                /* remove "soft monitor" interface */
+                local->open_count--;
+                local->monitors--;
+                if (!local->monitors)
+                        local->hw.conf.flags &= ~IEEE80211_CONF_RADIOTAP;
+                return 0;
+        }
+
+        netif_stop_queue(dev);
+        ieee80211_if_shutdown(dev);
+
+        if (sdata->type == IEEE80211_IF_TYPE_MNTR) {
+                local->monitors--;
+                if (!local->monitors)
+                        local->hw.conf.flags &= ~IEEE80211_CONF_RADIOTAP;
+        }
+
+        local->open_count--;
+        if (local->open_count == 0) {
+                if (netif_running(local->mdev))
+                        dev_close(local->mdev);
+                if (local->apdev)
+                        dev_close(local->apdev);
+                if (local->ops->stop)
+                        local->ops->stop(local_to_hw(local));
+                tasklet_disable(&local->tx_pending_tasklet);
+                tasklet_disable(&local->tasklet);
+        }
+        if (local->ops->remove_interface) {
+                struct ieee80211_if_init_conf conf;
+
+                conf.if_id = dev->ifindex;
+                conf.type = sdata->type;
+                conf.mac_addr = dev->dev_addr;
+                local->ops->remove_interface(local_to_hw(local), &conf);
+        }
+
+        ieee80211_start_hard_monitor(local);
+
+        return 0;
+}
+
+enum netif_tx_lock_class {
+        TX_LOCK_NORMAL,
+        TX_LOCK_MASTER,
+};
+
+static inline void netif_tx_lock_nested(struct net_device *dev, int subclass)
+{
+        spin_lock_nested(&dev->_xmit_lock, subclass);
+        dev->xmit_lock_owner = smp_processor_id();
+}
+
+static void ieee80211_set_multicast_list(struct net_device *dev)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        unsigned short flags;
+
+        netif_tx_lock_nested(local->mdev, TX_LOCK_MASTER);
+        if (((dev->flags & IFF_ALLMULTI) != 0) ^ (sdata->allmulti != 0)) {
+                if (sdata->allmulti) {
+                        sdata->allmulti = 0;
+                        local->iff_allmultis--;
+                } else {
+                        sdata->allmulti = 1;
+                        local->iff_allmultis++;
+                }
+        }
+        if (((dev->flags & IFF_PROMISC) != 0) ^ (sdata->promisc != 0)) {
+                if (sdata->promisc) {
+                        sdata->promisc = 0;
+                        local->iff_promiscs--;
+                } else {
+                        sdata->promisc = 1;
+                        local->iff_promiscs++;
+                }
+        }
+        if (dev->mc_count != sdata->mc_count) {
+                local->mc_count = local->mc_count - sdata->mc_count +
+                                  dev->mc_count;
+                sdata->mc_count = dev->mc_count;
+        }
+        if (local->ops->set_multicast_list) {
+                flags = local->mdev->flags;
+                if (local->iff_allmultis)
+                        flags |= IFF_ALLMULTI;
+                if (local->iff_promiscs)
+                        flags |= IFF_PROMISC;
+                read_lock(&local->sub_if_lock);
+                local->ops->set_multicast_list(local_to_hw(local), flags,
+                                              local->mc_count);
+                read_unlock(&local->sub_if_lock);
+        }
+        netif_tx_unlock(local->mdev);
+}
+
+/* Must not be called for mdev and apdev */
+void ieee80211_if_setup(struct net_device *dev)
+{
+        ether_setup(dev);
+        dev->hard_start_xmit = ieee80211_subif_start_xmit;
+        dev->wireless_handlers = &ieee80211_iw_handler_def;
+        dev->set_multicast_list = ieee80211_set_multicast_list;
+        dev->change_mtu = ieee80211_change_mtu;
+        dev->get_stats = ieee80211_get_stats;
+        dev->open = ieee80211_open;
+        dev->stop = ieee80211_stop;
+        dev->uninit = ieee80211_if_reinit;
+        dev->destructor = ieee80211_if_free;
+}
+
+/* WDS specialties */
+
+int ieee80211_if_update_wds(struct net_device *dev, u8 *remote_addr)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        struct sta_info *sta;
+
+        if (compare_ether_addr(remote_addr, sdata->u.wds.remote_addr) == 0)
+                return 0;
+
+        /* Create STA entry for the new peer */
+        sta = sta_info_add(local, dev, remote_addr, GFP_KERNEL);
+        if (!sta)
+                return -ENOMEM;
+        sta_info_put(sta);
+
+        /* Remove STA entry for the old peer */
+        sta = sta_info_get(local, sdata->u.wds.remote_addr);
+        if (sta) {
+                sta_info_put(sta);
+                sta_info_free(sta, 0);
+        } else {
+                printk(KERN_DEBUG "%s: could not find STA entry for WDS link "
+                       "peer " MAC_FMT "\n",
+                       dev->name, MAC_ARG(sdata->u.wds.remote_addr));
+        }
+
+        /* Update WDS link data */
+        memcpy(&sdata->u.wds.remote_addr, remote_addr, ETH_ALEN);
+
+        return 0;
+}
+
+/* everything else */
 
 static int rate_list_match(const int *rate_list, int rate)
 {
@@ -76,7 +675,6 @@ static int rate_list_match(const int *rate_list, int rate)
         return 0;
 }
 
-
 void ieee80211_prepare_rates(struct ieee80211_local *local,
                              struct ieee80211_hw_mode *mode)
 {
@@ -150,43 +748,6 @@ void ieee80211_prepare_rates(struct ieee80211_local *local,
         }
 }
 
-
-void ieee80211_key_threshold_notify(struct net_device *dev,
-                                    struct ieee80211_key *key,
-                                    struct sta_info *sta)
-{
-        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
-        struct sk_buff *skb;
-        struct ieee80211_msg_key_notification *msg;
-
-        /* if no one will get it anyway, don't even allocate it.
-         * unlikely because this is only relevant for APs
-         * where the device must be open... */
-        if (unlikely(!local->apdev))
-                return;
-
-        skb = dev_alloc_skb(sizeof(struct ieee80211_frame_info) +
-                            sizeof(struct ieee80211_msg_key_notification));
-        if (!skb)
-                return;
-
-        skb_reserve(skb, sizeof(struct ieee80211_frame_info));
-        msg = (struct ieee80211_msg_key_notification *)
-                skb_put(skb, sizeof(struct ieee80211_msg_key_notification));
-        msg->tx_rx_count = key->tx_rx_count;
-        memcpy(msg->ifname, dev->name, IFNAMSIZ);
-        if (sta)
-                memcpy(msg->addr, sta->addr, ETH_ALEN);
-        else
-                memset(msg->addr, 0xff, ETH_ALEN);
-
-        key->tx_rx_count = 0;
-
-        ieee80211_rx_mgmt(local, skb, NULL,
-                          ieee80211_msg_key_threshold_notification);
-}
-
-
 u8 *ieee80211_get_bssid(struct ieee80211_hdr *hdr, size_t len)
 {
         u16 fc;
@@ -300,7 +861,6 @@ int ieee80211_is_eapol(const struct sk_buff *skb)
         return 0;
 }
 
-
 void ieee80211_tx_set_iswep(struct ieee80211_txrx_data *tx)
 {
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) tx->skb->data;
@@ -317,7 +877,6 @@ void ieee80211_tx_set_iswep(struct ieee80211_txrx_data *tx)
         }
 }
 
-
 static int ieee80211_frame_duration(struct ieee80211_local *local, size_t len,
                                     int rate, int erp, int short_preamble)
 {
@@ -373,7 +932,6 @@ static int ieee80211_frame_duration(struct ieee80211_local *local, size_t len,
         return dur;
 }
 
-
 /* Exported duration function for driver use */
 __le16 ieee80211_generic_frame_duration(struct ieee80211_hw *hw,
                                         size_t frame_len, int rate)
@@ -390,7 +948,6 @@ __le16 ieee80211_generic_frame_duration(struct ieee80211_hw *hw,
 }
 EXPORT_SYMBOL(ieee80211_generic_frame_duration);
 
-
 __le16 ieee80211_rts_duration(struct ieee80211_hw *hw,
                               size_t frame_len,
                               const struct ieee80211_tx_control *frame_txctl)
@@ -418,7 +975,6 @@ __le16 ieee80211_rts_duration(struct ieee80211_hw *hw,
 }
 EXPORT_SYMBOL(ieee80211_rts_duration);
 
-
 __le16 ieee80211_ctstoself_duration(struct ieee80211_hw *hw,
                                     size_t frame_len,
                                     const struct ieee80211_tx_control *frame_txctl)
@@ -536,97 +1092,6 @@ int ieee80211_hw_config(struct ieee80211_local *local)
         return ret;
 }
 
-
-static int ieee80211_change_mtu(struct net_device *dev, int new_mtu)
-{
-        /* FIX: what would be proper limits for MTU?
-         * This interface uses 802.3 frames. */
-        if (new_mtu < 256 || new_mtu > IEEE80211_MAX_DATA_LEN - 24 - 6) {
-                printk(KERN_WARNING "%s: invalid MTU %d\n",
-                       dev->name, new_mtu);
-                return -EINVAL;
-        }
-
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        printk(KERN_DEBUG "%s: setting MTU %d\n", dev->name, new_mtu);
-#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
-        dev->mtu = new_mtu;
-        return 0;
-}
-
-
-static int ieee80211_change_mtu_apdev(struct net_device *dev, int new_mtu)
-{
-        /* FIX: what would be proper limits for MTU?
-         * This interface uses 802.11 frames. */
-        if (new_mtu < 256 || new_mtu > IEEE80211_MAX_DATA_LEN) {
-                printk(KERN_WARNING "%s: invalid MTU %d\n",
-                       dev->name, new_mtu);
-                return -EINVAL;
-        }
-
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        printk(KERN_DEBUG "%s: setting MTU %d\n", dev->name, new_mtu);
-#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
-        dev->mtu = new_mtu;
-        return 0;
-}
-
-enum netif_tx_lock_class {
-        TX_LOCK_NORMAL,
-        TX_LOCK_MASTER,
-};
-
-static inline void netif_tx_lock_nested(struct net_device *dev, int subclass)
-{
-        spin_lock_nested(&dev->_xmit_lock, subclass);
-        dev->xmit_lock_owner = smp_processor_id();
-}
-
-static void ieee80211_set_multicast_list(struct net_device *dev)
-{
-        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
-        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-        unsigned short flags;
-
-        netif_tx_lock_nested(local->mdev, TX_LOCK_MASTER);
-        if (((dev->flags & IFF_ALLMULTI) != 0) ^ (sdata->allmulti != 0)) {
-                if (sdata->allmulti) {
-                        sdata->allmulti = 0;
-                        local->iff_allmultis--;
-                } else {
-                        sdata->allmulti = 1;
-                        local->iff_allmultis++;
-                }
-        }
-        if (((dev->flags & IFF_PROMISC) != 0) ^ (sdata->promisc != 0)) {
-                if (sdata->promisc) {
-                        sdata->promisc = 0;
-                        local->iff_promiscs--;
-                } else {
-                        sdata->promisc = 1;
-                        local->iff_promiscs++;
-                }
-        }
-        if (dev->mc_count != sdata->mc_count) {
-                local->mc_count = local->mc_count - sdata->mc_count +
-                                  dev->mc_count;
-                sdata->mc_count = dev->mc_count;
-        }
-        if (local->ops->set_multicast_list) {
-                flags = local->mdev->flags;
-                if (local->iff_allmultis)
-                        flags |= IFF_ALLMULTI;
-                if (local->iff_promiscs)
-                        flags |= IFF_PROMISC;
-                read_lock(&local->sub_if_lock);
-                local->ops->set_multicast_list(local_to_hw(local), flags,
-                                              local->mc_count);
-                read_unlock(&local->sub_if_lock);
-        }
-        netif_tx_unlock(local->mdev);
-}
-
 struct dev_mc_list *ieee80211_get_mc_list_item(struct ieee80211_hw *hw,
                                                struct dev_mc_list *prev,
                                                void **ptr)
@@ -658,276 +1123,6 @@ struct dev_mc_list *ieee80211_get_mc_list_item(struct ieee80211_hw *hw,
 }
 EXPORT_SYMBOL(ieee80211_get_mc_list_item);
 
-static struct net_device_stats *ieee80211_get_stats(struct net_device *dev)
-{
-        struct ieee80211_sub_if_data *sdata;
-        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-        return &(sdata->stats);
-}
-
-static void ieee80211_if_shutdown(struct net_device *dev)
-{
-        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
-        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-
-        ASSERT_RTNL();
-        switch (sdata->type) {
-        case IEEE80211_IF_TYPE_STA:
-        case IEEE80211_IF_TYPE_IBSS:
-                sdata->u.sta.state = IEEE80211_DISABLED;
-                del_timer_sync(&sdata->u.sta.timer);
-                skb_queue_purge(&sdata->u.sta.skb_queue);
-                if (!local->ops->hw_scan &&
-                    local->scan_dev == sdata->dev) {
-                        local->sta_scanning = 0;
-                        cancel_delayed_work(&local->scan_work);
-                }
-                flush_workqueue(local->hw.workqueue);
-                break;
-        }
-}
-
-static inline int identical_mac_addr_allowed(int type1, int type2)
-{
-        return (type1 == IEEE80211_IF_TYPE_MNTR ||
-                type2 == IEEE80211_IF_TYPE_MNTR ||
-                (type1 == IEEE80211_IF_TYPE_AP &&
-                 type2 == IEEE80211_IF_TYPE_WDS) ||
-                (type1 == IEEE80211_IF_TYPE_WDS &&
-                 (type2 == IEEE80211_IF_TYPE_WDS ||
-                  type2 == IEEE80211_IF_TYPE_AP)) ||
-                (type1 == IEEE80211_IF_TYPE_AP &&
-                 type2 == IEEE80211_IF_TYPE_VLAN) ||
-                (type1 == IEEE80211_IF_TYPE_VLAN &&
-                 (type2 == IEEE80211_IF_TYPE_AP ||
-                  type2 == IEEE80211_IF_TYPE_VLAN)));
-}
-
-static int ieee80211_master_open(struct net_device *dev)
-{
-        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
-        struct ieee80211_sub_if_data *sdata;
-        int res = -EOPNOTSUPP;
-
-        read_lock(&local->sub_if_lock);
-        list_for_each_entry(sdata, &local->sub_if_list, list) {
-                if (sdata->dev != dev && netif_running(sdata->dev)) {
-                        res = 0;
-                        break;
-                }
-        }
-        read_unlock(&local->sub_if_lock);
-        return res;
-}
-
-static int ieee80211_master_stop(struct net_device *dev)
-{
-        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
-        struct ieee80211_sub_if_data *sdata;
-
-        read_lock(&local->sub_if_lock);
-        list_for_each_entry(sdata, &local->sub_if_list, list)
-                if (sdata->dev != dev && netif_running(sdata->dev))
-                        dev_close(sdata->dev);
-        read_unlock(&local->sub_if_lock);
-
-        return 0;
-}
-
-static int ieee80211_mgmt_open(struct net_device *dev)
-{
-        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
-
-        if (!netif_running(local->mdev))
-                return -EOPNOTSUPP;
-        return 0;
-}
-
-static int ieee80211_mgmt_stop(struct net_device *dev)
-{
-        return 0;
-}
-
-/* Check if running monitor interfaces should go to a "soft monitor" mode
- * and switch them if necessary. */
-static inline void ieee80211_start_soft_monitor(struct ieee80211_local *local)
-{
-        struct ieee80211_if_init_conf conf;
-
-        if (local->open_count && local->open_count == local->monitors &&
-            !(local->hw.flags & IEEE80211_HW_MONITOR_DURING_OPER) &&
-            local->ops->remove_interface) {
-                conf.if_id = -1;
-                conf.type = IEEE80211_IF_TYPE_MNTR;
-                conf.mac_addr = NULL;
-                local->ops->remove_interface(local_to_hw(local), &conf);
-        }
-}
-
-/* Check if running monitor interfaces should go to a "hard monitor" mode
- * and switch them if necessary. */
-static void ieee80211_start_hard_monitor(struct ieee80211_local *local)
-{
-        struct ieee80211_if_init_conf conf;
-
-        if (local->open_count && local->open_count == local->monitors &&
-            !(local->hw.flags & IEEE80211_HW_MONITOR_DURING_OPER)) {
-                conf.if_id = -1;
-                conf.type = IEEE80211_IF_TYPE_MNTR;
-                conf.mac_addr = NULL;
-                local->ops->add_interface(local_to_hw(local), &conf);
-        }
-}
-
-static int ieee80211_open(struct net_device *dev)
-{
-        struct ieee80211_sub_if_data *sdata, *nsdata;
-        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
-        struct ieee80211_if_init_conf conf;
-        int res;
-
-        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-        read_lock(&local->sub_if_lock);
-        list_for_each_entry(nsdata, &local->sub_if_list, list) {
-                struct net_device *ndev = nsdata->dev;
-
-                if (ndev != dev && ndev != local->mdev && netif_running(ndev) &&
-                    compare_ether_addr(dev->dev_addr, ndev->dev_addr) == 0 &&
-                    !identical_mac_addr_allowed(sdata->type, nsdata->type)) {
-                        read_unlock(&local->sub_if_lock);
-                        return -ENOTUNIQ;
-                }
-        }
-        read_unlock(&local->sub_if_lock);
-
-        if (sdata->type == IEEE80211_IF_TYPE_WDS &&
-            is_zero_ether_addr(sdata->u.wds.remote_addr))
-                return -ENOLINK;
-
-        if (sdata->type == IEEE80211_IF_TYPE_MNTR && local->open_count &&
-            !(local->hw.flags & IEEE80211_HW_MONITOR_DURING_OPER)) {
-                /* run the interface in a "soft monitor" mode */
-                local->monitors++;
-                local->open_count++;
-                local->hw.conf.flags |= IEEE80211_CONF_RADIOTAP;
-                return 0;
-        }
-        ieee80211_start_soft_monitor(local);
-
-        conf.if_id = dev->ifindex;
-        conf.type = sdata->type;
-        conf.mac_addr = dev->dev_addr;
-        res = local->ops->add_interface(local_to_hw(local), &conf);
-        if (res) {
-                if (sdata->type == IEEE80211_IF_TYPE_MNTR)
-                        ieee80211_start_hard_monitor(local);
-                return res;
-        }
-
-        if (local->open_count == 0) {
-                res = 0;
-                tasklet_enable(&local->tx_pending_tasklet);
-                tasklet_enable(&local->tasklet);
-                if (local->ops->open)
-                        res = local->ops->open(local_to_hw(local));
-                if (res == 0) {
-                        res = dev_open(local->mdev);
-                        if (res) {
-                                if (local->ops->stop)
-                                        local->ops->stop(local_to_hw(local));
-                        } else {
-                                res = ieee80211_hw_config(local);
-                                if (res && local->ops->stop)
-                                        local->ops->stop(local_to_hw(local));
-                                else if (!res && local->apdev)
-                                        dev_open(local->apdev);
-                        }
-                }
-                if (res) {
-                        if (local->ops->remove_interface)
-                                local->ops->remove_interface(local_to_hw(local),
-                                                            &conf);
-                        return res;
-                }
-        }
-        local->open_count++;
-
-        if (sdata->type == IEEE80211_IF_TYPE_MNTR) {
-                local->monitors++;
-                local->hw.conf.flags |= IEEE80211_CONF_RADIOTAP;
-        } else
-                ieee80211_if_config(dev);
-
-        if (sdata->type == IEEE80211_IF_TYPE_STA &&
-            !local->user_space_mlme)
-                netif_carrier_off(dev);
-        else
-                netif_carrier_on(dev);
-
-        netif_start_queue(dev);
-        return 0;
-}
-
-
-static int ieee80211_stop(struct net_device *dev)
-{
-        struct ieee80211_sub_if_data *sdata;
-        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
-
-        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-
-        if (sdata->type == IEEE80211_IF_TYPE_MNTR &&
-            local->open_count > 1 &&
-            !(local->hw.flags & IEEE80211_HW_MONITOR_DURING_OPER)) {
-                /* remove "soft monitor" interface */
-                local->open_count--;
-                local->monitors--;
-                if (!local->monitors)
-                        local->hw.conf.flags &= ~IEEE80211_CONF_RADIOTAP;
-                return 0;
-        }
-
-        netif_stop_queue(dev);
-        ieee80211_if_shutdown(dev);
-
-        if (sdata->type == IEEE80211_IF_TYPE_MNTR) {
-                local->monitors--;
-                if (!local->monitors)
-                        local->hw.conf.flags &= ~IEEE80211_CONF_RADIOTAP;
-        }
-
-        local->open_count--;
-        if (local->open_count == 0) {
-                if (netif_running(local->mdev))
-                        dev_close(local->mdev);
-                if (local->apdev)
-                        dev_close(local->apdev);
-                if (local->ops->stop)
-                        local->ops->stop(local_to_hw(local));
-                tasklet_disable(&local->tx_pending_tasklet);
-                tasklet_disable(&local->tasklet);
-        }
-        if (local->ops->remove_interface) {
-                struct ieee80211_if_init_conf conf;
-
-                conf.if_id = dev->ifindex;
-                conf.type = sdata->type;
-                conf.mac_addr = dev->dev_addr;
-                local->ops->remove_interface(local_to_hw(local), &conf);
-        }
-
-        ieee80211_start_hard_monitor(local);
-
-        return 0;
-}
-
-
-static int header_parse_80211(struct sk_buff *skb, unsigned char *haddr)
-{
-        memcpy(haddr, skb_mac_header(skb) + 10, ETH_ALEN); /* addr2 */
-        return ETH_ALEN;
-}
-
 struct ieee80211_rate *
 ieee80211_get_rate(struct ieee80211_local *local, int phymode, int hw_rate)
 {
@@ -949,142 +1144,6 @@ ieee80211_get_rate(struct ieee80211_local *local, int phymode, int hw_rate)
         return NULL;
 }
 
-static void
-ieee80211_fill_frame_info(struct ieee80211_local *local,
-                          struct ieee80211_frame_info *fi,
-                          struct ieee80211_rx_status *status)
-{
-        if (status) {
-                struct timespec ts;
-                struct ieee80211_rate *rate;
-
-                jiffies_to_timespec(jiffies, &ts);
-                fi->hosttime = cpu_to_be64((u64) ts.tv_sec * 1000000 +
-                                           ts.tv_nsec / 1000);
-                fi->mactime = cpu_to_be64(status->mactime);
-                switch (status->phymode) {
-                case MODE_IEEE80211A:
-                        fi->phytype = htonl(ieee80211_phytype_ofdm_dot11_a);
-                        break;
-                case MODE_IEEE80211B:
-                        fi->phytype = htonl(ieee80211_phytype_dsss_dot11_b);
-                        break;
-                case MODE_IEEE80211G:
-                        fi->phytype = htonl(ieee80211_phytype_pbcc_dot11_g);
-                        break;
-                case MODE_ATHEROS_TURBO:
-                        fi->phytype =
-                                htonl(ieee80211_phytype_dsss_dot11_turbo);
-                        break;
-                default:
-                        fi->phytype = htonl(0xAAAAAAAA);
-                        break;
-                }
-                fi->channel = htonl(status->channel);
-                rate = ieee80211_get_rate(local, status->phymode,
-                                          status->rate);
-                if (rate) {
-                        fi->datarate = htonl(rate->rate);
-                        if (rate->flags & IEEE80211_RATE_PREAMBLE2) {
-                                if (status->rate == rate->val)
-                                        fi->preamble = htonl(2); /* long */
-                                else if (status->rate == rate->val2)
-                                        fi->preamble = htonl(1); /* short */
-                        } else
-                                fi->preamble = htonl(0);
-                } else {
-                        fi->datarate = htonl(0);
-                        fi->preamble = htonl(0);
-                }
-
-                fi->antenna = htonl(status->antenna);
-                fi->priority = htonl(0xffffffff); /* no clue */
-                fi->ssi_type = htonl(ieee80211_ssi_raw);
-                fi->ssi_signal = htonl(status->ssi);
-                fi->ssi_noise = 0x00000000;
-                fi->encoding = 0;
-        } else {
-                /* clear everything because we really don't know.
-                 * the msg_type field isn't present on monitor frames
-                 * so we don't know whether it will be present or not,
-                 * but it's ok to not clear it since it'll be assigned
-                 * anyway */
-                memset(fi, 0, sizeof(*fi) - sizeof(fi->msg_type));
-
-                fi->ssi_type = htonl(ieee80211_ssi_none);
-        }
-        fi->version = htonl(IEEE80211_FI_VERSION);
-        fi->length = cpu_to_be32(sizeof(*fi) - sizeof(fi->msg_type));
-}
-
-/* this routine is actually not just for this, but also
- * for pushing fake 'management' frames into userspace.
- * it shall be replaced by a netlink-based system. */
-void
-ieee80211_rx_mgmt(struct ieee80211_local *local, struct sk_buff *skb,
-                  struct ieee80211_rx_status *status, u32 msg_type)
-{
-        struct ieee80211_frame_info *fi;
-        const size_t hlen = sizeof(struct ieee80211_frame_info);
-        struct ieee80211_sub_if_data *sdata;
-
-        skb->dev = local->apdev;
-
-        sdata = IEEE80211_DEV_TO_SUB_IF(local->apdev);
-
-        if (skb_headroom(skb) < hlen) {
-                I802_DEBUG_INC(local->rx_expand_skb_head);
-                if (pskb_expand_head(skb, hlen, 0, GFP_ATOMIC)) {
-                        dev_kfree_skb(skb);
-                        return;
-                }
-        }
-
-        fi = (struct ieee80211_frame_info *) skb_push(skb, hlen);
-
-        ieee80211_fill_frame_info(local, fi, status);
-        fi->msg_type = htonl(msg_type);
-
-        sdata->stats.rx_packets++;
-        sdata->stats.rx_bytes += skb->len;
-
-        skb_set_mac_header(skb, 0);
-        skb->ip_summed = CHECKSUM_UNNECESSARY;
-        skb->pkt_type = PACKET_OTHERHOST;
-        skb->protocol = htons(ETH_P_802_2);
-        memset(skb->cb, 0, sizeof(skb->cb));
-        netif_rx(skb);
-}
-
-int ieee80211_radar_status(struct ieee80211_hw *hw, int channel,
-                           int radar, int radar_type)
-{
-        struct sk_buff *skb;
-        struct ieee80211_radar_info *msg;
-        struct ieee80211_local *local = hw_to_local(hw);
-
-        if (!local->apdev)
-                return 0;
-
-        skb = dev_alloc_skb(sizeof(struct ieee80211_frame_info) +
-                            sizeof(struct ieee80211_radar_info));
-
-        if (!skb)
-                return -ENOMEM;
-        skb_reserve(skb, sizeof(struct ieee80211_frame_info));
-
-        msg = (struct ieee80211_radar_info *)
-                skb_put(skb, sizeof(struct ieee80211_radar_info));
-        msg->channel = channel;
-        msg->radar = radar;
-        msg->radar_type = radar_type;
-
-        ieee80211_rx_mgmt(local, skb, NULL, ieee80211_msg_radar);
-        return 0;
-}
-EXPORT_SYMBOL(ieee80211_radar_status);
-
-
 static void ieee80211_stat_refresh(unsigned long data)
 {
         struct ieee80211_local *local = (struct ieee80211_local *) data;
@@ -1121,7 +1180,6 @@ static void ieee80211_stat_refresh(unsigned long data)
         add_timer(&local->stat_timer);
 }
 
-
 void ieee80211_tx_status_irqsafe(struct ieee80211_hw *hw,
                                  struct sk_buff *skb,
                                  struct ieee80211_tx_status *status)
@@ -1198,7 +1256,6 @@ static void ieee80211_tasklet_handler(unsigned long data)
         }
 }
 
-
 /* Remove added headers (e.g., QoS control), encryption header/MIC, etc. to
  * make a prepared TX frame (one that has been given to hw) to look like brand
  * new IEEE 802.11 frame that is ready to go through TX processing again.
@@ -1261,7 +1318,6 @@ no_key:
         }
 }
 
-
 void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb,
                          struct ieee80211_tx_status *status)
 {
@@ -1480,68 +1536,6 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb,
 }
 EXPORT_SYMBOL(ieee80211_tx_status);
 
-
-int ieee80211_if_update_wds(struct net_device *dev, u8 *remote_addr)
-{
-        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
-        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-        struct sta_info *sta;
-
-        if (compare_ether_addr(remote_addr, sdata->u.wds.remote_addr) == 0)
-                return 0;
-
-        /* Create STA entry for the new peer */
-        sta = sta_info_add(local, dev, remote_addr, GFP_KERNEL);
-        if (!sta)
-                return -ENOMEM;
-        sta_info_put(sta);
-
-        /* Remove STA entry for the old peer */
-        sta = sta_info_get(local, sdata->u.wds.remote_addr);
-        if (sta) {
-                sta_info_put(sta);
-                sta_info_free(sta, 0);
-        } else {
-                printk(KERN_DEBUG "%s: could not find STA entry for WDS link "
-                       "peer " MAC_FMT "\n",
-                       dev->name, MAC_ARG(sdata->u.wds.remote_addr));
-        }
-
-        /* Update WDS link data */
-        memcpy(&sdata->u.wds.remote_addr, remote_addr, ETH_ALEN);
-
-        return 0;
-}
-
-/* Must not be called for mdev and apdev */
-void ieee80211_if_setup(struct net_device *dev)
-{
-        ether_setup(dev);
-        dev->hard_start_xmit = ieee80211_subif_start_xmit;
-        dev->wireless_handlers = &ieee80211_iw_handler_def;
-        dev->set_multicast_list = ieee80211_set_multicast_list;
-        dev->change_mtu = ieee80211_change_mtu;
-        dev->get_stats = ieee80211_get_stats;
-        dev->open = ieee80211_open;
-        dev->stop = ieee80211_stop;
-        dev->uninit = ieee80211_if_reinit;
-        dev->destructor = ieee80211_if_free;
-}
-
-void ieee80211_if_mgmt_setup(struct net_device *dev)
-{
-        ether_setup(dev);
-        dev->hard_start_xmit = ieee80211_mgmt_start_xmit;
-        dev->change_mtu = ieee80211_change_mtu_apdev;
-        dev->get_stats = ieee80211_get_stats;
-        dev->open = ieee80211_mgmt_open;
-        dev->stop = ieee80211_mgmt_stop;
-        dev->type = ARPHRD_IEEE80211_PRISM;
-        dev->hard_header_parse = header_parse_80211;
-        dev->uninit = ieee80211_if_reinit;
-        dev->destructor = ieee80211_if_free;
-}
-
 struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
                                         const struct ieee80211_ops *ops)
 {
@@ -1948,7 +1942,6 @@ static int __init ieee80211_init(void)
         return 0;
 }
 
-
 static void __exit ieee80211_exit(void)
 {
         ieee80211_wme_unregister();