1 files changed, 40 insertions, 126 deletions

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 092a017b237e..0c4f8e122ed6 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -77,81 +77,23 @@ void ieee80211_configure_filter(struct ieee80211_local *local)
         if (local->fif_other_bss)
                 new_flags |= FIF_OTHER_BSS;
 
+        if (local->fif_pspoll)
+                new_flags |= FIF_PSPOLL;
+
         changed_flags = local->filter_flags ^ new_flags;
 
         /* be a bit nasty */
         new_flags |= (1<<31);
 
         drv_configure_filter(local, changed_flags, &new_flags,
-                             local->mdev->mc_count,
-                             local->mdev->mc_list);
+                             local->mc_count,
+                             local->mc_list);
 
         WARN_ON(new_flags & (1<<31));
 
         local->filter_flags = new_flags & ~(1<<31);
 }
 
-/* master interface */
-
-static int header_parse_80211(const struct sk_buff *skb, unsigned char *haddr)
-{
-        memcpy(haddr, skb_mac_header(skb) + 10, ETH_ALEN); /* addr2 */
-        return ETH_ALEN;
-}
-
-static const struct header_ops ieee80211_header_ops = {
-        .create         = eth_header,
-        .parse          = header_parse_80211,
-        .rebuild        = eth_rebuild_header,
-        .cache          = eth_header_cache,
-        .cache_update   = eth_header_cache_update,
-};
-
-static int ieee80211_master_open(struct net_device *dev)
-{
-        struct ieee80211_master_priv *mpriv = netdev_priv(dev);
-        struct ieee80211_local *local = mpriv->local;
-        struct ieee80211_sub_if_data *sdata;
-        int res = -EOPNOTSUPP;
-
-        /* we hold the RTNL here so can safely walk the list */
-        list_for_each_entry(sdata, &local->interfaces, list) {
-                if (netif_running(sdata->dev)) {
-                        res = 0;
-                        break;
-                }
-        }
-
-        if (res)
-                return res;
-
-        netif_tx_start_all_queues(local->mdev);
-
-        return 0;
-}
-
-static int ieee80211_master_stop(struct net_device *dev)
-{
-        struct ieee80211_master_priv *mpriv = netdev_priv(dev);
-        struct ieee80211_local *local = mpriv->local;
-        struct ieee80211_sub_if_data *sdata;
-
-        /* we hold the RTNL here so can safely walk the list */
-        list_for_each_entry(sdata, &local->interfaces, list)
-                if (netif_running(sdata->dev))
-                        dev_close(sdata->dev);
-
-        return 0;
-}
-
-static void ieee80211_master_set_multicast_list(struct net_device *dev)
-{
-        struct ieee80211_master_priv *mpriv = netdev_priv(dev);
-        struct ieee80211_local *local = mpriv->local;
-
-        ieee80211_configure_filter(local);
-}
-
 int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
 {
         struct ieee80211_channel *chan, *scan_chan;
@@ -259,7 +201,8 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata,
         }
 
         if (changed & BSS_CHANGED_BEACON_ENABLED) {
-                if (local->sw_scanning) {
+                if (local->quiescing || !netif_running(sdata->dev) ||
+                    test_bit(SCAN_SW_SCANNING, &local->scanning)) {
                         sdata->vif.bss_conf.enable_beacon = false;
                 } else {
                         /*
@@ -310,7 +253,6 @@ void ieee80211_tx_status_irqsafe(struct ieee80211_hw *hw,
         struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
         int tmp;
 
-        skb->dev = local->mdev;
         skb->pkt_type = IEEE80211_TX_STATUS_MSG;
         skb_queue_tail(info->flags & IEEE80211_TX_CTL_REQ_TX_STATUS ?
                        &local->skb_queue : &local->skb_queue_unreliable, skb);
@@ -330,19 +272,16 @@ static void ieee80211_tasklet_handler(unsigned long data)
 {
         struct ieee80211_local *local = (struct ieee80211_local *) data;
         struct sk_buff *skb;
-        struct ieee80211_rx_status rx_status;
         struct ieee80211_ra_tid *ra_tid;
 
         while ((skb = skb_dequeue(&local->skb_queue)) ||
                (skb = skb_dequeue(&local->skb_queue_unreliable))) {
                 switch (skb->pkt_type) {
                 case IEEE80211_RX_MSG:
-                        /* status is in skb->cb */
-                        memcpy(&rx_status, skb->cb, sizeof(rx_status));
                         /* Clear skb->pkt_type in order to not confuse kernel
                          * netstack. */
                         skb->pkt_type = 0;
-                        __ieee80211_rx(local_to_hw(local), skb, &rx_status);
+                        ieee80211_rx(local_to_hw(local), skb);
                         break;
                 case IEEE80211_TX_STATUS_MSG:
                         skb->pkt_type = 0;
@@ -375,6 +314,31 @@ static void ieee80211_handle_filtered_frame(struct ieee80211_local *local,
 {
         struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
 
+        /*
+         * XXX: This is temporary!
+         *
+         *      The problem here is that when we get here, the driver will
+         *      quite likely have pretty much overwritten info->control by
+         *      using info->driver_data or info->rate_driver_data. Thus,
+         *      when passing out the frame to the driver again, we would be
+         *      passing completely bogus data since the driver would then
+         *      expect a properly filled info->control. In mac80211 itself
+         *      the same problem occurs, since we need info->control.vif
+         *      internally.
+         *
+         *      To fix this, we should send the frame through TX processing
+         *      again. However, it's not that simple, since the frame will
+         *      have been software-encrypted (if applicable) already, and
+         *      encrypting it again doesn't do much good. So to properly do
+         *      that, we not only have to skip the actual 'raw' encryption
+         *      (key selection etc. still has to be done!) but also the
+         *      sequence number assignment since that impacts the crypto
+         *      encapsulation, of course.
+         *
+         *      Hence, for now, fix the bug by just dropping the frame.
+         */
+        goto drop;
+
         sta->tx_filtered_count++;
 
         /*
@@ -428,6 +392,7 @@ static void ieee80211_handle_filtered_frame(struct ieee80211_local *local,
                 return;
         }
 
+ drop:
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
         if (net_ratelimit())
                 printk(KERN_DEBUG "%s: dropped TX filtered frame, "
@@ -685,6 +650,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
         if (!wiphy)
                 return NULL;
 
+        wiphy->netnsok = true;
         wiphy->privid = mac80211_wiphy_privid;
 
         /* Yes, putting cfg80211_bss into ieee80211_bss is a hack */
@@ -719,7 +685,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
         mutex_init(&local->scan_mtx);
 
         spin_lock_init(&local->key_lock);
-
+        spin_lock_init(&local->filter_lock);
         spin_lock_init(&local->queue_stop_reason_lock);
 
         INIT_DELAYED_WORK(&local->scan_work, ieee80211_scan_work);
@@ -755,30 +721,11 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
 }
 EXPORT_SYMBOL(ieee80211_alloc_hw);
 
-static const struct net_device_ops ieee80211_master_ops = {
-        .ndo_start_xmit = ieee80211_master_start_xmit,
-        .ndo_open = ieee80211_master_open,
-        .ndo_stop = ieee80211_master_stop,
-        .ndo_set_multicast_list = ieee80211_master_set_multicast_list,
-        .ndo_select_queue = ieee80211_select_queue,
-};
-
-static void ieee80211_master_setup(struct net_device *mdev)
-{
-        mdev->type = ARPHRD_IEEE80211;
-        mdev->netdev_ops = &ieee80211_master_ops;
-        mdev->header_ops = &ieee80211_header_ops;
-        mdev->tx_queue_len = 1000;
-        mdev->addr_len = ETH_ALEN;
-}
-
 int ieee80211_register_hw(struct ieee80211_hw *hw)
 {
         struct ieee80211_local *local = hw_to_local(hw);
         int result;
         enum ieee80211_band band;
-        struct net_device *mdev;
-        struct ieee80211_master_priv *mpriv;
         int channels, i, j, max_bitrates;
         bool supp_ht;
         static const u32 cipher_suites[] = {
@@ -877,19 +824,9 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
         if (hw->queues > IEEE80211_MAX_QUEUES)
                 hw->queues = IEEE80211_MAX_QUEUES;
 
-        mdev = alloc_netdev_mq(sizeof(struct ieee80211_master_priv),
-                               "wmaster%d", ieee80211_master_setup,
-                               hw->queues);
-        if (!mdev)
-                goto fail_mdev_alloc;
-
-        mpriv = netdev_priv(mdev);
-        mpriv->local = local;
-        local->mdev = mdev;
-
-        local->hw.workqueue =
+        local->workqueue =
                 create_singlethread_workqueue(wiphy_name(local->hw.wiphy));
-        if (!local->hw.workqueue) {
+        if (!local->workqueue) {
                 result = -ENOMEM;
                 goto fail_workqueue;
         }
@@ -921,17 +858,6 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
         }
 
         rtnl_lock();
-        result = dev_alloc_name(local->mdev, local->mdev->name);
-        if (result < 0)
-                goto fail_dev;
-
-        memcpy(local->mdev->dev_addr, local->hw.wiphy->perm_addr, ETH_ALEN);
-        SET_NETDEV_DEV(local->mdev, wiphy_dev(local->hw.wiphy));
-        local->mdev->features |= NETIF_F_NETNS_LOCAL;
-
-        result = register_netdevice(local->mdev);
-        if (result < 0)
-                goto fail_dev;
 
         result = ieee80211_init_rate_ctrl_alg(local,
                                               hw->rate_control_algorithm);
@@ -984,20 +910,14 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
         ieee80211_led_exit(local);
         ieee80211_remove_interfaces(local);
  fail_rate:
-        unregister_netdevice(local->mdev);
-        local->mdev = NULL;
- fail_dev:
         rtnl_unlock();
         ieee80211_wep_free(local);
  fail_wep:
         sta_info_stop(local);
  fail_sta_info:
         debugfs_hw_del(local);
-        destroy_workqueue(local->hw.workqueue);
+        destroy_workqueue(local->workqueue);
  fail_workqueue:
-        if (local->mdev)
-                free_netdev(local->mdev);
- fail_mdev_alloc:
         wiphy_unregister(local->hw.wiphy);
  fail_wiphy_register:
         kfree(local->int_scan_req.channels);
@@ -1022,13 +942,8 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw)
          * because the driver cannot be handing us frames any
          * more and the tasklet is killed.
          */
-
-        /* First, we remove all virtual interfaces. */
         ieee80211_remove_interfaces(local);
 
-        /* then, finally, remove the master interface */
-        unregister_netdevice(local->mdev);
-
         rtnl_unlock();
 
         ieee80211_clear_tx_pending(local);
@@ -1043,11 +958,10 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw)
         skb_queue_purge(&local->skb_queue);
         skb_queue_purge(&local->skb_queue_unreliable);
 
-        destroy_workqueue(local->hw.workqueue);
+        destroy_workqueue(local->workqueue);
         wiphy_unregister(local->hw.wiphy);
         ieee80211_wep_free(local);
         ieee80211_led_exit(local);
-        free_netdev(local->mdev);
         kfree(local->int_scan_req.channels);
 }
 EXPORT_SYMBOL(ieee80211_unregister_hw);