48 files changed, 18410 insertions, 88 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 1e8c37054ea2..b36923e72ce8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2228,6 +2228,16 @@ M:	philb@gnu.org
 W:      http://www.tazenda.demon.co.uk/phil/linux-hp
 S:      Maintained
 
+MAC80211
+P:      Jiri Benc
+M:      jbenc@suse.cz
+P:      Michael Wu
+M:      flamingice@sourmilk.net
+L:      linux-wireless@vger.kernel.org
+W:      http://linuxwireless.org/
+T:      git kernel.org:/pub/scm/linux/kernel/git/jbenc/mac80211.git
+S:      Maintained
+
 MARVELL YUKON / SYSKONNECT DRIVER
 P:      Mirko Lindner
 M:      mlindner@syskonnect.de
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 9488f49ea569..59d6e74a4a5f 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -1300,9 +1300,11 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)
                         msleep(1);
                 }
         }
-        tg3_write_mem(tp, NIC_SRAM_WOL_MBOX, WOL_SIGNATURE |
-                                             WOL_DRV_STATE_SHUTDOWN |
-                                             WOL_DRV_WOL | WOL_SET_MAGIC_PKT);
+        if (tp->tg3_flags & TG3_FLAG_WOL_CAP)
+                tg3_write_mem(tp, NIC_SRAM_WOL_MBOX, WOL_SIGNATURE |
+                                                     WOL_DRV_STATE_SHUTDOWN |
+                                                     WOL_DRV_WOL |
+                                                     WOL_SET_MAGIC_PKT);
 
         pci_read_config_word(tp->pdev, pm + PCI_PM_PMC, &power_caps);
 
@@ -2593,10 +2595,8 @@ static int tg3_setup_fiber_by_hand(struct tg3 *tp, u32 mac_status)
 {
         int current_link_up = 0;
 
-        if (!(mac_status & MAC_STATUS_PCS_SYNCED)) {
-                tp->tg3_flags &= ~TG3_FLAG_GOT_SERDES_FLOWCTL;
+        if (!(mac_status & MAC_STATUS_PCS_SYNCED))
                 goto out;
-        }
 
         if (tp->link_config.autoneg == AUTONEG_ENABLE) {
                 u32 flags;
@@ -2614,7 +2614,6 @@ static int tg3_setup_fiber_by_hand(struct tg3 *tp, u32 mac_status)
 
                         tg3_setup_flow_control(tp, local_adv, remote_adv);
 
-                        tp->tg3_flags |= TG3_FLAG_GOT_SERDES_FLOWCTL;
                         current_link_up = 1;
                 }
                 for (i = 0; i < 30; i++) {
@@ -2637,7 +2636,6 @@ static int tg3_setup_fiber_by_hand(struct tg3 *tp, u32 mac_status)
         } else {
                 /* Forcing 1000FD link up. */
                 current_link_up = 1;
-                tp->tg3_flags |= TG3_FLAG_GOT_SERDES_FLOWCTL;
 
                 tw32_f(MAC_MODE, (tp->mac_mode | MAC_MODE_SEND_CONFIGS));
                 udelay(40);
@@ -3895,8 +3893,7 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
         entry = tp->tx_prod;
         base_flags = 0;
         mss = 0;
-        if (skb->len > (tp->dev->mtu + ETH_HLEN) &&
-            (mss = skb_shinfo(skb)->gso_size) != 0) {
+        if ((mss = skb_shinfo(skb)->gso_size) != 0) {
                 int tcp_opt_len, ip_tcp_len;
 
                 if (skb_header_cloned(skb) &&
@@ -4053,8 +4050,7 @@ static int tg3_start_xmit_dma_bug(struct sk_buff *skb, struct net_device *dev)
         if (skb->ip_summed == CHECKSUM_PARTIAL)
                 base_flags |= TXD_FLAG_TCPUDP_CSUM;
         mss = 0;
-        if (skb->len > (tp->dev->mtu + ETH_HLEN) &&
-            (mss = skb_shinfo(skb)->gso_size) != 0) {
+        if ((mss = skb_shinfo(skb)->gso_size) != 0) {
                 struct iphdr *iph;
                 int tcp_opt_len, ip_tcp_len, hdr_len;
 
@@ -5934,7 +5930,7 @@ static int tg3_load_tso_firmware(struct tg3 *tp)
 
 
 /* tp->lock is held. */
-static void __tg3_set_mac_addr(struct tg3 *tp)
+static void __tg3_set_mac_addr(struct tg3 *tp, int skip_mac_1)
 {
         u32 addr_high, addr_low;
         int i;
@@ -5946,6 +5942,8 @@ static void __tg3_set_mac_addr(struct tg3 *tp)
                     (tp->dev->dev_addr[4] <<  8) |
                     (tp->dev->dev_addr[5] <<  0));
         for (i = 0; i < 4; i++) {
+                if (i == 1 && skip_mac_1)
+                        continue;
                 tw32(MAC_ADDR_0_HIGH + (i * 8), addr_high);
                 tw32(MAC_ADDR_0_LOW + (i * 8), addr_low);
         }
@@ -5972,7 +5970,7 @@ static int tg3_set_mac_addr(struct net_device *dev, void *p)
 {
         struct tg3 *tp = netdev_priv(dev);
         struct sockaddr *addr = p;
-        int err = 0;
+        int err = 0, skip_mac_1 = 0;
 
         if (!is_valid_ether_addr(addr->sa_data))
                 return -EINVAL;
@@ -5983,22 +5981,21 @@ static int tg3_set_mac_addr(struct net_device *dev, void *p)
                 return 0;
 
         if (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) {
-                /* Reset chip so that ASF can re-init any MAC addresses it
-                 * needs.
-                 */
-                tg3_netif_stop(tp);
-                tg3_full_lock(tp, 1);
+                u32 addr0_high, addr0_low, addr1_high, addr1_low;
 
-                tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
-                err = tg3_restart_hw(tp, 0);
-                if (!err)
-                        tg3_netif_start(tp);
-                tg3_full_unlock(tp);
-        } else {
-                spin_lock_bh(&tp->lock);
-                __tg3_set_mac_addr(tp);
-                spin_unlock_bh(&tp->lock);
+                addr0_high = tr32(MAC_ADDR_0_HIGH);
+                addr0_low = tr32(MAC_ADDR_0_LOW);
+                addr1_high = tr32(MAC_ADDR_1_HIGH);
+                addr1_low = tr32(MAC_ADDR_1_LOW);
+
+                /* Skip MAC addr 1 if ASF is using it. */
+                if ((addr0_high != addr1_high || addr0_low != addr1_low) &&
+                    !(addr1_high == 0 && addr1_low == 0))
+                        skip_mac_1 = 1;
         }
+        spin_lock_bh(&tp->lock);
+        __tg3_set_mac_addr(tp, skip_mac_1);
+        spin_unlock_bh(&tp->lock);
 
         return err;
 }
@@ -6315,7 +6312,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
                      tp->rx_jumbo_ptr);
 
         /* Initialize MAC address and backoff seed. */
-        __tg3_set_mac_addr(tp);
+        __tg3_set_mac_addr(tp, 0);
 
         /* MTU + ethernet header + FCS + optional VLAN tag */
         tw32(MAC_RX_MTU_SIZE, tp->dev->mtu + ETH_HLEN + 8);
@@ -6346,8 +6343,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
              tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) ||
             (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750)) {
                 if (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE &&
-                    (tp->pci_chip_rev_id == CHIPREV_ID_5705_A1 ||
-                     tp->pci_chip_rev_id == CHIPREV_ID_5705_A2)) {
+                    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) {
                         rdmac_mode |= RDMAC_MODE_FIFO_SIZE_128;
                 } else if (!(tr32(TG3PCI_PCISTATE) & PCISTATE_BUS_SPEED_HIGH) &&
                            !(tp->tg3_flags2 & TG3_FLG2_IS_5788)) {
@@ -6457,6 +6453,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
                 if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5755)
                         gpio_mask |= GRC_LCLCTRL_GPIO_UART_SEL;
 
+                tp->grc_local_ctrl &= ~gpio_mask;
                 tp->grc_local_ctrl |= tr32(GRC_LOCAL_CTRL) & gpio_mask;
 
                 /* GPIO1 must be driven high for eeprom write protect */
@@ -7036,11 +7033,7 @@ static int tg3_open(struct net_device *dev)
         if (err)
                 return err;
 
-        if ((tp->tg3_flags2 & TG3_FLG2_5750_PLUS) &&
-            (GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5750_AX) &&
-            (GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5750_BX) &&
-            !((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5714) &&
-              (tp->pdev_peer == tp->pdev))) {
+        if (tp->tg3_flags & TG3_FLAG_SUPPORT_MSI) {
                 /* All MSI supporting chips should support tagged
                  * status.  Assert that this is the case.
                  */
@@ -7399,9 +7392,7 @@ static int tg3_close(struct net_device *dev)
 
         tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
         tg3_free_rings(tp);
-        tp->tg3_flags &=
-                ~(TG3_FLAG_INIT_COMPLETE |
-                  TG3_FLAG_GOT_SERDES_FLOWCTL);
+        tp->tg3_flags &= ~TG3_FLAG_INIT_COMPLETE;
 
         tg3_full_unlock(tp);
 
@@ -8036,7 +8027,10 @@ static void tg3_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 {
         struct tg3 *tp = netdev_priv(dev);
 
-        wol->supported = WAKE_MAGIC;
+        if (tp->tg3_flags & TG3_FLAG_WOL_CAP)
+                wol->supported = WAKE_MAGIC;
+        else
+                wol->supported = 0;
         wol->wolopts = 0;
         if (tp->tg3_flags & TG3_FLAG_WOL_ENABLE)
                 wol->wolopts = WAKE_MAGIC;
@@ -8050,8 +8044,7 @@ static int tg3_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
         if (wol->wolopts & ~WAKE_MAGIC)
                 return -EINVAL;
         if ((wol->wolopts & WAKE_MAGIC) &&
-            tp->tg3_flags2 & TG3_FLG2_ANY_SERDES &&
-            !(tp->tg3_flags & TG3_FLAG_SERDES_WOL_CAP))
+            !(tp->tg3_flags & TG3_FLAG_WOL_CAP))
                 return -EINVAL;
 
         spin_lock_bh(&tp->lock);
@@ -9289,7 +9282,7 @@ static void __devinit tg3_get_nvram_size(struct tg3 *tp)
                         return;
                 }
         }
-        tp->nvram_size = 0x20000;
+        tp->nvram_size = 0x80000;
 }
 
 static void __devinit tg3_get_nvram_info(struct tg3 *tp)
@@ -9408,33 +9401,31 @@ static void __devinit tg3_get_5752_nvram_info(struct tg3 *tp)
 
 static void __devinit tg3_get_5755_nvram_info(struct tg3 *tp)
 {
-        u32 nvcfg1;
+        u32 nvcfg1, protect = 0;
 
         nvcfg1 = tr32(NVRAM_CFG1);
 
         /* NVRAM protection for TPM */
-        if (nvcfg1 & (1 << 27))
+        if (nvcfg1 & (1 << 27)) {
                 tp->tg3_flags2 |= TG3_FLG2_PROTECTED_NVRAM;
+                protect = 1;
+        }
 
-        switch (nvcfg1 & NVRAM_CFG1_5752VENDOR_MASK) {
-                case FLASH_5755VENDOR_ATMEL_EEPROM_64KHZ:
-                case FLASH_5755VENDOR_ATMEL_EEPROM_376KHZ:
-                        tp->nvram_jedecnum = JEDEC_ATMEL;
-                        tp->tg3_flags |= TG3_FLAG_NVRAM_BUFFERED;
-                        tp->nvram_pagesize = ATMEL_AT24C512_CHIP_SIZE;
-
-                        nvcfg1 &= ~NVRAM_CFG1_COMPAT_BYPASS;
-                        tw32(NVRAM_CFG1, nvcfg1);
-                        break;
-                case FLASH_5752VENDOR_ATMEL_FLASH_BUFFERED:
+        nvcfg1 &= NVRAM_CFG1_5752VENDOR_MASK;
+        switch (nvcfg1) {
                 case FLASH_5755VENDOR_ATMEL_FLASH_1:
                 case FLASH_5755VENDOR_ATMEL_FLASH_2:
                 case FLASH_5755VENDOR_ATMEL_FLASH_3:
-                case FLASH_5755VENDOR_ATMEL_FLASH_4:
                         tp->nvram_jedecnum = JEDEC_ATMEL;
                         tp->tg3_flags |= TG3_FLAG_NVRAM_BUFFERED;
                         tp->tg3_flags2 |= TG3_FLG2_FLASH;
                         tp->nvram_pagesize = 264;
+                        if (nvcfg1 == FLASH_5755VENDOR_ATMEL_FLASH_1)
+                                tp->nvram_size = (protect ? 0x3e200 : 0x80000);
+                        else if (nvcfg1 == FLASH_5755VENDOR_ATMEL_FLASH_2)
+                                tp->nvram_size = (protect ? 0x1f200 : 0x40000);
+                        else
+                                tp->nvram_size = (protect ? 0x1f200 : 0x20000);
                         break;
                 case FLASH_5752VENDOR_ST_M45PE10:
                 case FLASH_5752VENDOR_ST_M45PE20:
@@ -9443,6 +9434,12 @@ static void __devinit tg3_get_5755_nvram_info(struct tg3 *tp)
                         tp->tg3_flags |= TG3_FLAG_NVRAM_BUFFERED;
                         tp->tg3_flags2 |= TG3_FLG2_FLASH;
                         tp->nvram_pagesize = 256;
+                        if (nvcfg1 == FLASH_5752VENDOR_ST_M45PE10)
+                                tp->nvram_size = (protect ? 0x10000 : 0x20000);
+                        else if (nvcfg1 == FLASH_5752VENDOR_ST_M45PE20)
+                                tp->nvram_size = (protect ? 0x10000 : 0x40000);
+                        else
+                                tp->nvram_size = (protect ? 0x20000 : 0x80000);
                         break;
         }
 }
@@ -9518,6 +9515,8 @@ static void __devinit tg3_nvram_init(struct tg3 *tp)
                 }
                 tg3_enable_nvram_access(tp);
 
+                tp->nvram_size = 0;
+
                 if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752)
                         tg3_get_5752_nvram_info(tp);
                 else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5755)
@@ -9529,7 +9528,8 @@ static void __devinit tg3_nvram_init(struct tg3 *tp)
                 else
                         tg3_get_nvram_info(tp);
 
-                tg3_get_nvram_size(tp);
+                if (tp->nvram_size == 0)
+                        tg3_get_nvram_size(tp);
 
                 tg3_disable_nvram_access(tp);
                 tg3_nvram_unlock(tp);
@@ -9996,8 +9996,8 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
         tp->phy_id = PHY_ID_INVALID;
         tp->led_ctrl = LED_CTRL_MODE_PHY_1;
 
-        /* Assume an onboard device by default.  */
-        tp->tg3_flags |= TG3_FLAG_EEPROM_WRITE_PROT;
+        /* Assume an onboard device and WOL capable by default.  */
+        tp->tg3_flags |= TG3_FLAG_EEPROM_WRITE_PROT | TG3_FLAG_WOL_CAP;
 
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) {
                 if (!(tr32(PCIE_TRANSACTION_CFG) & PCIE_TRANS_CFG_LOM)) {
@@ -10120,8 +10120,9 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
                         if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS)
                                 tp->tg3_flags2 |= TG3_FLG2_ASF_NEW_HANDSHAKE;
                 }
-                if (nic_cfg & NIC_SRAM_DATA_CFG_FIBER_WOL)
-                        tp->tg3_flags |= TG3_FLAG_SERDES_WOL_CAP;
+                if (tp->tg3_flags2 & TG3_FLG2_ANY_SERDES &&
+                    !(nic_cfg & NIC_SRAM_DATA_CFG_FIBER_WOL))
+                        tp->tg3_flags &= ~TG3_FLAG_WOL_CAP;
 
                 if (cfg2 & (1 << 17))
                         tp->tg3_flags2 |= TG3_FLG2_CAPACITIVE_COUPLING;
@@ -10399,6 +10400,8 @@ static void __devinit tg3_read_fw_ver(struct tg3 *tp)
         }
 }
 
+static struct pci_dev * __devinit tg3_find_peer(struct tg3 *);
+
 static int __devinit tg3_get_invariants(struct tg3 *tp)
 {
         static struct pci_device_id write_reorder_chipsets[] = {
@@ -10554,6 +10557,10 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
         tp->pci_hdr_type     = (cacheline_sz_reg >> 16) & 0xff;
         tp->pci_bist         = (cacheline_sz_reg >> 24) & 0xff;
 
+        if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) ||
+            (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5714))
+                tp->pdev_peer = tg3_find_peer(tp);
+
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5755 ||
@@ -10567,6 +10574,14 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
                 tp->tg3_flags2 |= TG3_FLG2_5705_PLUS;
 
         if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS) {
+                tp->tg3_flags |= TG3_FLAG_SUPPORT_MSI;
+                if (GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5750_AX ||
+                    GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5750_BX ||
+                    (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5714 &&
+                     tp->pci_chip_rev_id <= CHIPREV_ID_5714_A2 &&
+                     tp->pdev_peer == tp->pdev))
+                        tp->tg3_flags &= ~TG3_FLAG_SUPPORT_MSI;
+
                 if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5755 ||
                     GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5787 ||
                     GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) {
@@ -10668,17 +10683,6 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
         if (GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5700_BX)
                 tp->tg3_flags |= TG3_FLAG_TXD_MBOX_HWBUG;
 
-        /* Back to back register writes can cause problems on this chip,
-         * the workaround is to read back all reg writes except those to
-         * mailbox regs.  See tg3_write_indirect_reg32().
-         *
-         * PCI Express 5750_A0 rev chips need this workaround too.
-         */
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701 ||
-            ((tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) &&
-             tp->pci_chip_rev_id == CHIPREV_ID_5750_A0))
-                tp->tg3_flags |= TG3_FLAG_5701_REG_WRITE_BUG;
-
         if ((pci_state_reg & PCISTATE_BUS_SPEED_HIGH) != 0)
                 tp->tg3_flags |= TG3_FLAG_PCI_HIGH_SPEED;
         if ((pci_state_reg & PCISTATE_BUS_32BIT) != 0)
@@ -10702,8 +10706,19 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
         /* Various workaround register access methods */
         if (tp->tg3_flags & TG3_FLAG_PCIX_TARGET_HWBUG)
                 tp->write32 = tg3_write_indirect_reg32;
-        else if (tp->tg3_flags & TG3_FLAG_5701_REG_WRITE_BUG)
+        else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701 ||
+                 ((tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) &&
+                  tp->pci_chip_rev_id == CHIPREV_ID_5750_A0)) {
+                /*
+                 * Back to back register writes can cause problems on these
+                 * chips, the workaround is to read back all reg writes
+                 * except those to mailbox regs.
+                 *
+                 * See tg3_write_indirect_reg32().
+                 */
                 tp->write32 = tg3_write_flush_reg32;
+        }
+
 
         if ((tp->tg3_flags & TG3_FLAG_TXD_MBOX_HWBUG) ||
             (tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER)) {
@@ -11892,10 +11907,6 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
                 tp->rx_pending = 63;
         }
 
-        if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) ||
-            (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5714))
-                tp->pdev_peer = tg3_find_peer(tp);
-
         err = tg3_get_device_address(tp);
         if (err) {
                 printk(KERN_ERR PFX "Could not obtain valid ethernet address, "
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index d515ed23841b..dcdfc084966c 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -131,6 +131,7 @@
 #define  CHIPREV_ID_5752_A0_HW           0x5000
 #define  CHIPREV_ID_5752_A0              0x6000
 #define  CHIPREV_ID_5752_A1              0x6001
+#define  CHIPREV_ID_5714_A2              0x9002
 #define  CHIPREV_ID_5906_A1              0xc001
 #define  GET_ASIC_REV(CHIP_REV_ID)      ((CHIP_REV_ID) >> 12)
 #define   ASIC_REV_5700                  0x07
@@ -2199,7 +2200,6 @@ struct tg3 {
 #define TG3_FLAG_USE_LINKCHG_REG        0x00000008
 #define TG3_FLAG_USE_MI_INTERRUPT       0x00000010
 #define TG3_FLAG_ENABLE_ASF             0x00000020
-#define TG3_FLAG_5701_REG_WRITE_BUG     0x00000040
 #define TG3_FLAG_POLL_SERDES            0x00000080
 #define TG3_FLAG_MBOX_WRITE_REORDER     0x00000100
 #define TG3_FLAG_PCIX_TARGET_HWBUG      0x00000200
@@ -2215,14 +2215,14 @@ struct tg3 {
 #define TG3_FLAG_PCI_32BIT              0x00080000
 #define TG3_FLAG_SRAM_USE_CONFIG        0x00100000
 #define TG3_FLAG_TX_RECOVERY_PENDING    0x00200000
-#define TG3_FLAG_SERDES_WOL_CAP         0x00400000
+#define TG3_FLAG_WOL_CAP                0x00400000
 #define TG3_FLAG_JUMBO_RING_ENABLE      0x00800000
 #define TG3_FLAG_10_100_ONLY            0x01000000
 #define TG3_FLAG_PAUSE_AUTONEG          0x02000000
 #define TG3_FLAG_IN_RESET_TASK          0x04000000
 #define TG3_FLAG_40BIT_DMA_BUG          0x08000000
 #define TG3_FLAG_BROKEN_CHECKSUMS       0x10000000
-#define TG3_FLAG_GOT_SERDES_FLOWCTL     0x20000000
+#define TG3_FLAG_SUPPORT_MSI            0x20000000
 #define TG3_FLAG_CHIP_RESETTING         0x40000000
 #define TG3_FLAG_INIT_COMPLETE          0x80000000
         u32                             tg3_flags2;
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
new file mode 100644
index 000000000000..ecd61e8438a5
--- /dev/null
+++ b/include/linux/ieee80211.h
@@ -0,0 +1,342 @@
+/*
+ * IEEE 802.11 defines
+ *
+ * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen
+ * <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2003, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005, Devicescape Software, Inc.
+ * Copyright (c) 2006, Michael Wu <flamingice@sourmilk.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef IEEE80211_H
+#define IEEE80211_H
+
+#include <linux/types.h>
+
+#define FCS_LEN 4
+
+#define IEEE80211_FCTL_VERS             0x0003
+#define IEEE80211_FCTL_FTYPE            0x000c
+#define IEEE80211_FCTL_STYPE            0x00f0
+#define IEEE80211_FCTL_TODS             0x0100
+#define IEEE80211_FCTL_FROMDS           0x0200
+#define IEEE80211_FCTL_MOREFRAGS        0x0400
+#define IEEE80211_FCTL_RETRY            0x0800
+#define IEEE80211_FCTL_PM               0x1000
+#define IEEE80211_FCTL_MOREDATA         0x2000
+#define IEEE80211_FCTL_PROTECTED        0x4000
+#define IEEE80211_FCTL_ORDER            0x8000
+
+#define IEEE80211_SCTL_FRAG             0x000F
+#define IEEE80211_SCTL_SEQ              0xFFF0
+
+#define IEEE80211_FTYPE_MGMT            0x0000
+#define IEEE80211_FTYPE_CTL             0x0004
+#define IEEE80211_FTYPE_DATA            0x0008
+
+/* management */
+#define IEEE80211_STYPE_ASSOC_REQ       0x0000
+#define IEEE80211_STYPE_ASSOC_RESP      0x0010
+#define IEEE80211_STYPE_REASSOC_REQ     0x0020
+#define IEEE80211_STYPE_REASSOC_RESP    0x0030
+#define IEEE80211_STYPE_PROBE_REQ       0x0040
+#define IEEE80211_STYPE_PROBE_RESP      0x0050
+#define IEEE80211_STYPE_BEACON          0x0080
+#define IEEE80211_STYPE_ATIM            0x0090
+#define IEEE80211_STYPE_DISASSOC        0x00A0
+#define IEEE80211_STYPE_AUTH            0x00B0
+#define IEEE80211_STYPE_DEAUTH          0x00C0
+#define IEEE80211_STYPE_ACTION          0x00D0
+
+/* control */
+#define IEEE80211_STYPE_PSPOLL          0x00A0
+#define IEEE80211_STYPE_RTS             0x00B0
+#define IEEE80211_STYPE_CTS             0x00C0
+#define IEEE80211_STYPE_ACK             0x00D0
+#define IEEE80211_STYPE_CFEND           0x00E0
+#define IEEE80211_STYPE_CFENDACK        0x00F0
+
+/* data */
+#define IEEE80211_STYPE_DATA                    0x0000
+#define IEEE80211_STYPE_DATA_CFACK              0x0010
+#define IEEE80211_STYPE_DATA_CFPOLL             0x0020
+#define IEEE80211_STYPE_DATA_CFACKPOLL          0x0030
+#define IEEE80211_STYPE_NULLFUNC                0x0040
+#define IEEE80211_STYPE_CFACK                   0x0050
+#define IEEE80211_STYPE_CFPOLL                  0x0060
+#define IEEE80211_STYPE_CFACKPOLL               0x0070
+#define IEEE80211_STYPE_QOS_DATA                0x0080
+#define IEEE80211_STYPE_QOS_DATA_CFACK          0x0090
+#define IEEE80211_STYPE_QOS_DATA_CFPOLL         0x00A0
+#define IEEE80211_STYPE_QOS_DATA_CFACKPOLL      0x00B0
+#define IEEE80211_STYPE_QOS_NULLFUNC            0x00C0
+#define IEEE80211_STYPE_QOS_CFACK               0x00D0
+#define IEEE80211_STYPE_QOS_CFPOLL              0x00E0
+#define IEEE80211_STYPE_QOS_CFACKPOLL           0x00F0
+
+
+/* miscellaneous IEEE 802.11 constants */
+#define IEEE80211_MAX_FRAG_THRESHOLD    2346
+#define IEEE80211_MAX_RTS_THRESHOLD     2347
+#define IEEE80211_MAX_AID               2007
+#define IEEE80211_MAX_TIM_LEN           251
+#define IEEE80211_MAX_DATA_LEN          2304
+/* Maximum size for the MA-UNITDATA primitive, 802.11 standard section
+   6.2.1.1.2.
+
+   The figure in section 7.1.2 suggests a body size of up to 2312
+   bytes is allowed, which is a bit confusing, I suspect this
+   represents the 2304 bytes of real data, plus a possible 8 bytes of
+   WEP IV and ICV. (this interpretation suggested by Ramiro Barreiro) */
+
+#define IEEE80211_MAX_SSID_LEN          32
+
+struct ieee80211_hdr {
+        __le16 frame_control;
+        __le16 duration_id;
+        u8 addr1[6];
+        u8 addr2[6];
+        u8 addr3[6];
+        __le16 seq_ctrl;
+        u8 addr4[6];
+} __attribute__ ((packed));
+
+
+struct ieee80211_mgmt {
+        __le16 frame_control;
+        __le16 duration;
+        u8 da[6];
+        u8 sa[6];
+        u8 bssid[6];
+        __le16 seq_ctrl;
+        union {
+                struct {
+                        __le16 auth_alg;
+                        __le16 auth_transaction;
+                        __le16 status_code;
+                        /* possibly followed by Challenge text */
+                        u8 variable[0];
+                } __attribute__ ((packed)) auth;
+                struct {
+                        __le16 reason_code;
+                } __attribute__ ((packed)) deauth;
+                struct {
+                        __le16 capab_info;
+                        __le16 listen_interval;
+                        /* followed by SSID and Supported rates */
+                        u8 variable[0];
+                } __attribute__ ((packed)) assoc_req;
+                struct {
+                        __le16 capab_info;
+                        __le16 status_code;
+                        __le16 aid;
+                        /* followed by Supported rates */
+                        u8 variable[0];
+                } __attribute__ ((packed)) assoc_resp, reassoc_resp;
+                struct {
+                        __le16 capab_info;
+                        __le16 listen_interval;
+                        u8 current_ap[6];
+                        /* followed by SSID and Supported rates */
+                        u8 variable[0];
+                } __attribute__ ((packed)) reassoc_req;
+                struct {
+                        __le16 reason_code;
+                } __attribute__ ((packed)) disassoc;
+                struct {
+                        __le64 timestamp;
+                        __le16 beacon_int;
+                        __le16 capab_info;
+                        /* followed by some of SSID, Supported rates,
+                         * FH Params, DS Params, CF Params, IBSS Params, TIM */
+                        u8 variable[0];
+                } __attribute__ ((packed)) beacon;
+                struct {
+                        /* only variable items: SSID, Supported rates */
+                        u8 variable[0];
+                } __attribute__ ((packed)) probe_req;
+                struct {
+                        __le64 timestamp;
+                        __le16 beacon_int;
+                        __le16 capab_info;
+                        /* followed by some of SSID, Supported rates,
+                         * FH Params, DS Params, CF Params, IBSS Params */
+                        u8 variable[0];
+                } __attribute__ ((packed)) probe_resp;
+                struct {
+                        u8 category;
+                        union {
+                                struct {
+                                        u8 action_code;
+                                        u8 dialog_token;
+                                        u8 status_code;
+                                        u8 variable[0];
+                                } __attribute__ ((packed)) wme_action;
+                                struct{
+                                        u8 action_code;
+                                        u8 element_id;
+                                        u8 length;
+                                        u8 switch_mode;
+                                        u8 new_chan;
+                                        u8 switch_count;
+                                } __attribute__((packed)) chan_switch;
+                        } u;
+                } __attribute__ ((packed)) action;
+        } u;
+} __attribute__ ((packed));
+
+
+/* Control frames */
+struct ieee80211_rts {
+        __le16 frame_control;
+        __le16 duration;
+        u8 ra[6];
+        u8 ta[6];
+} __attribute__ ((packed));
+
+struct ieee80211_cts {
+        __le16 frame_control;
+        __le16 duration;
+        u8 ra[6];
+} __attribute__ ((packed));
+
+
+/* Authentication algorithms */
+#define WLAN_AUTH_OPEN 0
+#define WLAN_AUTH_SHARED_KEY 1
+#define WLAN_AUTH_FAST_BSS_TRANSITION 2
+#define WLAN_AUTH_LEAP 128
+
+#define WLAN_AUTH_CHALLENGE_LEN 128
+
+#define WLAN_CAPABILITY_ESS             (1<<0)
+#define WLAN_CAPABILITY_IBSS            (1<<1)
+#define WLAN_CAPABILITY_CF_POLLABLE     (1<<2)
+#define WLAN_CAPABILITY_CF_POLL_REQUEST (1<<3)
+#define WLAN_CAPABILITY_PRIVACY         (1<<4)
+#define WLAN_CAPABILITY_SHORT_PREAMBLE  (1<<5)
+#define WLAN_CAPABILITY_PBCC            (1<<6)
+#define WLAN_CAPABILITY_CHANNEL_AGILITY (1<<7)
+/* 802.11h */
+#define WLAN_CAPABILITY_SPECTRUM_MGMT   (1<<8)
+#define WLAN_CAPABILITY_QOS             (1<<9)
+#define WLAN_CAPABILITY_SHORT_SLOT_TIME (1<<10)
+#define WLAN_CAPABILITY_DSSS_OFDM       (1<<13)
+
+/* Status codes */
+enum ieee80211_statuscode {
+        WLAN_STATUS_SUCCESS = 0,
+        WLAN_STATUS_UNSPECIFIED_FAILURE = 1,
+        WLAN_STATUS_CAPS_UNSUPPORTED = 10,
+        WLAN_STATUS_REASSOC_NO_ASSOC = 11,
+        WLAN_STATUS_ASSOC_DENIED_UNSPEC = 12,
+        WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG = 13,
+        WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION = 14,
+        WLAN_STATUS_CHALLENGE_FAIL = 15,
+        WLAN_STATUS_AUTH_TIMEOUT = 16,
+        WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA = 17,
+        WLAN_STATUS_ASSOC_DENIED_RATES = 18,
+        /* 802.11b */
+        WLAN_STATUS_ASSOC_DENIED_NOSHORTPREAMBLE = 19,
+        WLAN_STATUS_ASSOC_DENIED_NOPBCC = 20,
+        WLAN_STATUS_ASSOC_DENIED_NOAGILITY = 21,
+        /* 802.11h */
+        WLAN_STATUS_ASSOC_DENIED_NOSPECTRUM = 22,
+        WLAN_STATUS_ASSOC_REJECTED_BAD_POWER = 23,
+        WLAN_STATUS_ASSOC_REJECTED_BAD_SUPP_CHAN = 24,
+        /* 802.11g */
+        WLAN_STATUS_ASSOC_DENIED_NOSHORTTIME = 25,
+        WLAN_STATUS_ASSOC_DENIED_NODSSSOFDM = 26,
+        /* 802.11i */
+        WLAN_STATUS_INVALID_IE = 40,
+        WLAN_STATUS_INVALID_GROUP_CIPHER = 41,
+        WLAN_STATUS_INVALID_PAIRWISE_CIPHER = 42,
+        WLAN_STATUS_INVALID_AKMP = 43,
+        WLAN_STATUS_UNSUPP_RSN_VERSION = 44,
+        WLAN_STATUS_INVALID_RSN_IE_CAP = 45,
+        WLAN_STATUS_CIPHER_SUITE_REJECTED = 46,
+};
+
+
+/* Reason codes */
+enum ieee80211_reasoncode {
+        WLAN_REASON_UNSPECIFIED = 1,
+        WLAN_REASON_PREV_AUTH_NOT_VALID = 2,
+        WLAN_REASON_DEAUTH_LEAVING = 3,
+        WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY = 4,
+        WLAN_REASON_DISASSOC_AP_BUSY = 5,
+        WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA = 6,
+        WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA = 7,
+        WLAN_REASON_DISASSOC_STA_HAS_LEFT = 8,
+        WLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH = 9,
+        /* 802.11h */
+        WLAN_REASON_DISASSOC_BAD_POWER = 10,
+        WLAN_REASON_DISASSOC_BAD_SUPP_CHAN = 11,
+        /* 802.11i */
+        WLAN_REASON_INVALID_IE = 13,
+        WLAN_REASON_MIC_FAILURE = 14,
+        WLAN_REASON_4WAY_HANDSHAKE_TIMEOUT = 15,
+        WLAN_REASON_GROUP_KEY_HANDSHAKE_TIMEOUT = 16,
+        WLAN_REASON_IE_DIFFERENT = 17,
+        WLAN_REASON_INVALID_GROUP_CIPHER = 18,
+        WLAN_REASON_INVALID_PAIRWISE_CIPHER = 19,
+        WLAN_REASON_INVALID_AKMP = 20,
+        WLAN_REASON_UNSUPP_RSN_VERSION = 21,
+        WLAN_REASON_INVALID_RSN_IE_CAP = 22,
+        WLAN_REASON_IEEE8021X_FAILED = 23,
+        WLAN_REASON_CIPHER_SUITE_REJECTED = 24,
+};
+
+
+/* Information Element IDs */
+enum ieee80211_eid {
+        WLAN_EID_SSID = 0,
+        WLAN_EID_SUPP_RATES = 1,
+        WLAN_EID_FH_PARAMS = 2,
+        WLAN_EID_DS_PARAMS = 3,
+        WLAN_EID_CF_PARAMS = 4,
+        WLAN_EID_TIM = 5,
+        WLAN_EID_IBSS_PARAMS = 6,
+        WLAN_EID_CHALLENGE = 16,
+        /* 802.11d */
+        WLAN_EID_COUNTRY = 7,
+        WLAN_EID_HP_PARAMS = 8,
+        WLAN_EID_HP_TABLE = 9,
+        WLAN_EID_REQUEST = 10,
+        /* 802.11h */
+        WLAN_EID_PWR_CONSTRAINT = 32,
+        WLAN_EID_PWR_CAPABILITY = 33,
+        WLAN_EID_TPC_REQUEST = 34,
+        WLAN_EID_TPC_REPORT = 35,
+        WLAN_EID_SUPPORTED_CHANNELS = 36,
+        WLAN_EID_CHANNEL_SWITCH = 37,
+        WLAN_EID_MEASURE_REQUEST = 38,
+        WLAN_EID_MEASURE_REPORT = 39,
+        WLAN_EID_QUIET = 40,
+        WLAN_EID_IBSS_DFS = 41,
+        /* 802.11g */
+        WLAN_EID_ERP_INFO = 42,
+        WLAN_EID_EXT_SUPP_RATES = 50,
+        /* 802.11i */
+        WLAN_EID_RSN = 48,
+        WLAN_EID_WPA = 221,
+        WLAN_EID_GENERIC = 221,
+        WLAN_EID_VENDOR_SPECIFIC = 221,
+        WLAN_EID_QOS_PARAMETER = 222
+};
+
+/* cipher suite selectors */
+#define WLAN_CIPHER_SUITE_USE_GROUP     0x000FAC00
+#define WLAN_CIPHER_SUITE_WEP40         0x000FAC01
+#define WLAN_CIPHER_SUITE_TKIP          0x000FAC02
+/* reserved:                            0x000FAC03 */
+#define WLAN_CIPHER_SUITE_CCMP          0x000FAC04
+#define WLAN_CIPHER_SUITE_WEP104        0x000FAC05
+
+#define WLAN_MAX_KEY_LEN                32
+
+#endif /* IEEE80211_H */
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index f41688f56632..2e23353c28a5 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -31,7 +31,7 @@ struct sockaddr_nl
 {
         sa_family_t     nl_family;      /* AF_NETLINK   */
         unsigned short  nl_pad;         /* zero         */
-        __u32           nl_pid;         /* process pid  */
+        __u32           nl_pid;         /* port ID      */
         __u32           nl_groups;      /* multicast groups mask */
 };
 
@@ -41,7 +41,7 @@ struct nlmsghdr
         __u16           nlmsg_type;     /* Message content */
         __u16           nlmsg_flags;    /* Additional flags */
         __u32           nlmsg_seq;      /* Sequence number */
-        __u32           nlmsg_pid;      /* Sending process PID */
+        __u32           nlmsg_pid;      /* Sending process port ID */
 };
 
 /* Flags values */
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
new file mode 100644
index 000000000000..a7f122b79948
--- /dev/null
+++ b/include/net/mac80211.h
@@ -0,0 +1,1045 @@
+/*
+ * Low-level hardware driver -- IEEE 802.11 driver (80211.o) interface
+ * Copyright 2002-2005, Devicescape Software, Inc.
+ * Copyright 2006-2007  Jiri Benc <jbenc@suse.cz>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef MAC80211_H
+#define MAC80211_H
+
+#include <linux/kernel.h>
+#include <linux/if_ether.h>
+#include <linux/skbuff.h>
+#include <linux/wireless.h>
+#include <linux/device.h>
+#include <linux/ieee80211.h>
+#include <net/wireless.h>
+#include <net/cfg80211.h>
+
+/* Note! Only ieee80211_tx_status_irqsafe() and ieee80211_rx_irqsafe() can be
+ * called in hardware interrupt context. The low-level driver must not call any
+ * other functions in hardware interrupt context. If there is a need for such
+ * call, the low-level driver should first ACK the interrupt and perform the
+ * IEEE 802.11 code call after this, e.g., from a scheduled tasklet (in
+ * software interrupt context).
+ */
+
+/*
+ * Frame format used when passing frame between low-level hardware drivers
+ * and IEEE 802.11 driver the same as used in the wireless media, i.e.,
+ * buffers start with IEEE 802.11 header and include the same octets that
+ * are sent over air.
+ *
+ * If hardware uses IEEE 802.3 headers (and perform 802.3 <-> 802.11
+ * conversion in firmware), upper layer 802.11 code needs to be changed to
+ * support this.
+ *
+ * If the receive frame format is not the same as the real frame sent
+ * on the wireless media (e.g., due to padding etc.), upper layer 802.11 code
+ * could be updated to provide support for such format assuming this would
+ * optimize the performance, e.g., by removing need to re-allocation and
+ * copying of the data.
+ */
+
+#define IEEE80211_CHAN_W_SCAN 0x00000001
+#define IEEE80211_CHAN_W_ACTIVE_SCAN 0x00000002
+#define IEEE80211_CHAN_W_IBSS 0x00000004
+
+/* Channel information structure. Low-level driver is expected to fill in chan,
+ * freq, and val fields. Other fields will be filled in by 80211.o based on
+ * hostapd information and low-level driver does not need to use them. The
+ * limits for each channel will be provided in 'struct ieee80211_conf' when
+ * configuring the low-level driver with hw->config callback. If a device has
+ * a default regulatory domain, IEEE80211_HW_DEFAULT_REG_DOMAIN_CONFIGURED
+ * can be set to let the driver configure all fields */
+struct ieee80211_channel {
+        short chan; /* channel number (IEEE 802.11) */
+        short freq; /* frequency in MHz */
+        int val; /* hw specific value for the channel */
+        int flag; /* flag for hostapd use (IEEE80211_CHAN_*) */
+        unsigned char power_level;
+        unsigned char antenna_max;
+};
+
+#define IEEE80211_RATE_ERP 0x00000001
+#define IEEE80211_RATE_BASIC 0x00000002
+#define IEEE80211_RATE_PREAMBLE2 0x00000004
+#define IEEE80211_RATE_SUPPORTED 0x00000010
+#define IEEE80211_RATE_OFDM 0x00000020
+#define IEEE80211_RATE_CCK 0x00000040
+#define IEEE80211_RATE_TURBO 0x00000080
+#define IEEE80211_RATE_MANDATORY 0x00000100
+
+#define IEEE80211_RATE_CCK_2 (IEEE80211_RATE_CCK | IEEE80211_RATE_PREAMBLE2)
+#define IEEE80211_RATE_MODULATION(f) \
+        (f & (IEEE80211_RATE_CCK | IEEE80211_RATE_OFDM))
+
+/* Low-level driver should set PREAMBLE2, OFDM, CCK, and TURBO flags.
+ * BASIC, SUPPORTED, ERP, and MANDATORY flags are set in 80211.o based on the
+ * configuration. */
+struct ieee80211_rate {
+        int rate; /* rate in 100 kbps */
+        int val; /* hw specific value for the rate */
+        int flags; /* IEEE80211_RATE_ flags */
+        int val2; /* hw specific value for the rate when using short preamble
+                   * (only when IEEE80211_RATE_PREAMBLE2 flag is set, i.e., for
+                   * 2, 5.5, and 11 Mbps) */
+        signed char min_rssi_ack;
+        unsigned char min_rssi_ack_delta;
+
+        /* following fields are set by 80211.o and need not be filled by the
+         * low-level driver */
+        int rate_inv; /* inverse of the rate (LCM(all rates) / rate) for
+                       * optimizing channel utilization estimates */
+};
+
+/* 802.11g is backwards-compatible with 802.11b, so a wlan card can
+ * actually be both in 11b and 11g modes at the same time. */
+enum {
+        MODE_IEEE80211A, /* IEEE 802.11a */
+        MODE_IEEE80211B, /* IEEE 802.11b only */
+        MODE_ATHEROS_TURBO, /* Atheros Turbo mode (2x.11a at 5 GHz) */
+        MODE_IEEE80211G, /* IEEE 802.11g (and 802.11b compatibility) */
+        MODE_ATHEROS_TURBOG, /* Atheros Turbo mode (2x.11g at 2.4 GHz) */
+
+        /* keep last */
+        NUM_IEEE80211_MODES
+};
+
+struct ieee80211_hw_mode {
+        int mode; /* MODE_IEEE80211... */
+        int num_channels; /* Number of channels (below) */
+        struct ieee80211_channel *channels; /* Array of supported channels */
+        int num_rates; /* Number of rates (below) */
+        struct ieee80211_rate *rates; /* Array of supported rates */
+
+        struct list_head list; /* Internal, don't touch */
+};
+
+struct ieee80211_tx_queue_params {
+        int aifs; /* 0 .. 255; -1 = use default */
+        int cw_min; /* 2^n-1: 1, 3, 7, .. , 1023; 0 = use default */
+        int cw_max; /* 2^n-1: 1, 3, 7, .. , 1023; 0 = use default */
+        int burst_time; /* maximum burst time in 0.1 ms (i.e., 10 = 1 ms);
+                         * 0 = disabled */
+};
+
+struct ieee80211_tx_queue_stats_data {
+        unsigned int len; /* num packets in queue */
+        unsigned int limit; /* queue len (soft) limit */
+        unsigned int count; /* total num frames sent */
+};
+
+enum {
+        IEEE80211_TX_QUEUE_DATA0,
+        IEEE80211_TX_QUEUE_DATA1,
+        IEEE80211_TX_QUEUE_DATA2,
+        IEEE80211_TX_QUEUE_DATA3,
+        IEEE80211_TX_QUEUE_DATA4,
+        IEEE80211_TX_QUEUE_SVP,
+
+        NUM_TX_DATA_QUEUES,
+
+/* due to stupidity in the sub-ioctl userspace interface, the items in
+ * this struct need to have fixed values. As soon as it is removed, we can
+ * fix these entries. */
+        IEEE80211_TX_QUEUE_AFTER_BEACON = 6,
+        IEEE80211_TX_QUEUE_BEACON = 7
+};
+
+struct ieee80211_tx_queue_stats {
+        struct ieee80211_tx_queue_stats_data data[NUM_TX_DATA_QUEUES];
+};
+
+struct ieee80211_low_level_stats {
+        unsigned int dot11ACKFailureCount;
+        unsigned int dot11RTSFailureCount;
+        unsigned int dot11FCSErrorCount;
+        unsigned int dot11RTSSuccessCount;
+};
+
+/* Transmit control fields. This data structure is passed to low-level driver
+ * with each TX frame. The low-level driver is responsible for configuring
+ * the hardware to use given values (depending on what is supported). */
+#define HW_KEY_IDX_INVALID -1
+
+struct ieee80211_tx_control {
+        int tx_rate; /* Transmit rate, given as the hw specific value for the
+                      * rate (from struct ieee80211_rate) */
+        int rts_cts_rate; /* Transmit rate for RTS/CTS frame, given as the hw
+                           * specific value for the rate (from
+                           * struct ieee80211_rate) */
+
+#define IEEE80211_TXCTL_REQ_TX_STATUS   (1<<0)/* request TX status callback for
+                                                * this frame */
+#define IEEE80211_TXCTL_DO_NOT_ENCRYPT  (1<<1) /* send this frame without
+                                                * encryption; e.g., for EAPOL
+                                                * frames */
+#define IEEE80211_TXCTL_USE_RTS_CTS     (1<<2) /* use RTS-CTS before sending
+                                                * frame */
+#define IEEE80211_TXCTL_USE_CTS_PROTECT (1<<3) /* use CTS protection for the
+                                                * frame (e.g., for combined
+                                                * 802.11g / 802.11b networks) */
+#define IEEE80211_TXCTL_NO_ACK          (1<<4) /* tell the low level not to
+                                                * wait for an ack */
+#define IEEE80211_TXCTL_RATE_CTRL_PROBE (1<<5)
+#define IEEE80211_TXCTL_CLEAR_DST_MASK  (1<<6)
+#define IEEE80211_TXCTL_REQUEUE         (1<<7)
+#define IEEE80211_TXCTL_FIRST_FRAGMENT  (1<<8) /* this is a first fragment of
+                                                * the frame */
+#define IEEE80211_TXCTL_TKIP_NEW_PHASE1_KEY (1<<9)
+        u32 flags;                             /* tx control flags defined
+                                                * above */
+        u8 retry_limit;         /* 1 = only first attempt, 2 = one retry, .. */
+        u8 power_level;         /* per-packet transmit power level, in dBm */
+        u8 antenna_sel_tx;      /* 0 = default/diversity, 1 = Ant0, 2 = Ant1 */
+        s8 key_idx;             /* -1 = do not encrypt, >= 0 keyidx from
+                                 * hw->set_key() */
+        u8 icv_len;             /* length of the ICV/MIC field in octets */
+        u8 iv_len;              /* length of the IV field in octets */
+        u8 tkip_key[16];        /* generated phase2/phase1 key for hw TKIP */
+        u8 queue;               /* hardware queue to use for this frame;
+                                 * 0 = highest, hw->queues-1 = lowest */
+        u8 sw_retry_attempt;    /* number of times hw has tried to
+                                 * transmit frame (not incl. hw retries) */
+
+        struct ieee80211_rate *rate;            /* internal 80211.o rate */
+        struct ieee80211_rate *rts_rate;        /* internal 80211.o rate
+                                                 * for RTS/CTS */
+        int alt_retry_rate; /* retry rate for the last retries, given as the
+                             * hw specific value for the rate (from
+                             * struct ieee80211_rate). To be used to limit
+                             * packet dropping when probing higher rates, if hw
+                             * supports multiple retry rates. -1 = not used */
+        int type;       /* internal */
+        int ifindex;    /* internal */
+};
+
+/* Receive status. The low-level driver should provide this information
+ * (the subset supported by hardware) to the 802.11 code with each received
+ * frame. */
+struct ieee80211_rx_status {
+        u64 mactime;
+        int freq; /* receive frequency in Mhz */
+        int channel;
+        int phymode;
+        int ssi;
+        int signal; /* used as qual in statistics reporting */
+        int noise;
+        int antenna;
+        int rate;
+#define RX_FLAG_MMIC_ERROR      (1<<0)
+#define RX_FLAG_DECRYPTED       (1<<1)
+#define RX_FLAG_RADIOTAP        (1<<2)
+        int flag;
+};
+
+/* Transmit status. The low-level driver should provide this information
+ * (the subset supported by hardware) to the 802.11 code for each transmit
+ * frame. */
+struct ieee80211_tx_status {
+        /* copied ieee80211_tx_control structure */
+        struct ieee80211_tx_control control;
+
+#define IEEE80211_TX_STATUS_TX_FILTERED (1<<0)
+#define IEEE80211_TX_STATUS_ACK         (1<<1) /* whether the TX frame was ACKed */
+        u32 flags;              /* tx staus flags defined above */
+
+        int ack_signal; /* measured signal strength of the ACK frame */
+        int excessive_retries;
+        int retry_count;
+
+        int queue_length;      /* information about TX queue */
+        int queue_number;
+};
+
+
+/**
+ * struct ieee80211_conf - configuration of the device
+ *
+ * This struct indicates how the driver shall configure the hardware.
+ *
+ * @radio_enabled: when zero, driver is required to switch off the radio.
+ */
+struct ieee80211_conf {
+        int channel;                    /* IEEE 802.11 channel number */
+        int freq;                       /* MHz */
+        int channel_val;                /* hw specific value for the channel */
+
+        int phymode;                    /* MODE_IEEE80211A, .. */
+        struct ieee80211_channel *chan;
+        struct ieee80211_hw_mode *mode;
+        unsigned int regulatory_domain;
+        int radio_enabled;
+
+        int beacon_int;
+
+#define IEEE80211_CONF_SHORT_SLOT_TIME  (1<<0) /* use IEEE 802.11g Short Slot
+                                                * Time */
+#define IEEE80211_CONF_SSID_HIDDEN      (1<<1) /* do not broadcast the ssid */
+#define IEEE80211_CONF_RADIOTAP         (1<<2) /* use radiotap if supported
+                                                  check this bit at RX time */
+        u32 flags;                      /* configuration flags defined above */
+
+        u8 power_level;                 /* transmit power limit for current
+                                         * regulatory domain; in dBm */
+        u8 antenna_max;                 /* maximum antenna gain */
+        short tx_power_reduction; /* in 0.1 dBm */
+
+        /* 0 = default/diversity, 1 = Ant0, 2 = Ant1 */
+        u8 antenna_sel_tx;
+        u8 antenna_sel_rx;
+
+        int antenna_def;
+        int antenna_mode;
+
+        /* Following five fields are used for IEEE 802.11H */
+        unsigned int radar_detect;
+        unsigned int spect_mgmt;
+        /* All following fields are currently unused. */
+        unsigned int quiet_duration; /* duration of quiet period */
+        unsigned int quiet_offset; /* how far into the beacon is the quiet
+                                    * period */
+        unsigned int quiet_period;
+        u8 radar_firpwr_threshold;
+        u8 radar_rssi_threshold;
+        u8 pulse_height_threshold;
+        u8 pulse_rssi_threshold;
+        u8 pulse_inband_threshold;
+};
+
+/**
+ * enum ieee80211_if_types - types of 802.11 network interfaces
+ *
+ * @IEEE80211_IF_TYPE_AP: interface in AP mode.
+ * @IEEE80211_IF_TYPE_MGMT: special interface for communication with hostap
+ *      daemon. Drivers should never see this type.
+ * @IEEE80211_IF_TYPE_STA: interface in STA (client) mode.
+ * @IEEE80211_IF_TYPE_IBSS: interface in IBSS (ad-hoc) mode.
+ * @IEEE80211_IF_TYPE_MNTR: interface in monitor (rfmon) mode.
+ * @IEEE80211_IF_TYPE_WDS: interface in WDS mode.
+ * @IEEE80211_IF_TYPE_VLAN: not used.
+ */
+enum ieee80211_if_types {
+        IEEE80211_IF_TYPE_AP = 0x00000000,
+        IEEE80211_IF_TYPE_MGMT = 0x00000001,
+        IEEE80211_IF_TYPE_STA = 0x00000002,
+        IEEE80211_IF_TYPE_IBSS = 0x00000003,
+        IEEE80211_IF_TYPE_MNTR = 0x00000004,
+        IEEE80211_IF_TYPE_WDS = 0x5A580211,
+        IEEE80211_IF_TYPE_VLAN = 0x00080211,
+};
+
+/**
+ * struct ieee80211_if_init_conf - initial configuration of an interface
+ *
+ * @if_id: internal interface ID. This number has no particular meaning to
+ *      drivers and the only allowed usage is to pass it to
+ *      ieee80211_beacon_get() and ieee80211_get_buffered_bc() functions.
+ *      This field is not valid for monitor interfaces
+ *      (interfaces of %IEEE80211_IF_TYPE_MNTR type).
+ * @type: one of &enum ieee80211_if_types constants. Determines the type of
+ *      added/removed interface.
+ * @mac_addr: pointer to MAC address of the interface. This pointer is valid
+ *      until the interface is removed (i.e. it cannot be used after
+ *      remove_interface() callback was called for this interface).
+ *
+ * This structure is used in add_interface() and remove_interface()
+ * callbacks of &struct ieee80211_hw.
+ */
+struct ieee80211_if_init_conf {
+        int if_id;
+        int type;
+        void *mac_addr;
+};
+
+/**
+ * struct ieee80211_if_conf - configuration of an interface
+ *
+ * @type: type of the interface. This is always the same as was specified in
+ *      &struct ieee80211_if_init_conf. The type of an interface never changes
+ *      during the life of the interface; this field is present only for
+ *      convenience.
+ * @bssid: BSSID of the network we are associated to/creating.
+ * @ssid: used (together with @ssid_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.
+ * @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.
+ * @beacon_control: tx_control for the beacon template, this field is only
+ *      valid when the @beacon field was set.
+ *
+ * This structure is passed to the config_interface() callback of
+ * &struct ieee80211_hw.
+ */
+struct ieee80211_if_conf {
+        int type;
+        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;
+};
+
+typedef enum { ALG_NONE, ALG_WEP, ALG_TKIP, ALG_CCMP, ALG_NULL }
+ieee80211_key_alg;
+
+
+struct ieee80211_key_conf {
+
+        int hw_key_idx;                 /* filled + used by low-level driver */
+        ieee80211_key_alg alg;
+        int keylen;
+
+#define IEEE80211_KEY_FORCE_SW_ENCRYPT (1<<0) /* to be cleared by low-level
+                                                 driver */
+#define IEEE80211_KEY_DEFAULT_TX_KEY   (1<<1) /* This key is the new default TX
+                                                 key (used only for broadcast
+                                                 keys). */
+#define IEEE80211_KEY_DEFAULT_WEP_ONLY (1<<2) /* static WEP is the only
+                                                 configured security policy;
+                                                 this allows some low-level
+                                                 drivers to determine when
+                                                 hwaccel can be used */
+        u32 flags; /* key configuration flags defined above */
+
+        s8 keyidx;                      /* WEP key index */
+        u8 key[0];
+};
+
+#define IEEE80211_SEQ_COUNTER_RX        0
+#define IEEE80211_SEQ_COUNTER_TX        1
+
+typedef enum {
+        SET_KEY, DISABLE_KEY, REMOVE_ALL_KEYS,
+} set_key_cmd;
+
+/* This is driver-visible part of the per-hw state the stack keeps. */
+struct ieee80211_hw {
+        /* points to the cfg80211 wiphy for this piece. Note
+         * that you must fill in the perm_addr and dev fields
+         * of this structure, use the macros provided below. */
+        struct wiphy *wiphy;
+
+        /* assigned by mac80211, don't write */
+        struct ieee80211_conf conf;
+
+        /* Single thread workqueue available for driver use
+         * Allocated by mac80211 on registration */
+        struct workqueue_struct *workqueue;
+
+        /* Pointer to the private area that was
+         * allocated with this struct for you. */
+        void *priv;
+
+        /* The rest is information about your hardware */
+
+        /* TODO: frame_type 802.11/802.3, sw_encryption requirements */
+
+        /* Some wireless LAN chipsets generate beacons in the hardware/firmware
+         * and others rely on host generated beacons. This option is used to
+         * configure the upper layer IEEE 802.11 module to generate beacons.
+         * The low-level driver can use ieee80211_beacon_get() to fetch the
+         * next beacon frame. */
+#define IEEE80211_HW_HOST_GEN_BEACON (1<<0)
+
+        /* The device needs to be supplied with a beacon template only. */
+#define IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE (1<<1)
+
+        /* Some devices handle decryption internally and do not
+         * indicate whether the frame was encrypted (unencrypted frames
+         * will be dropped by the hardware, unless specifically allowed
+         * through) */
+#define IEEE80211_HW_DEVICE_HIDES_WEP (1<<2)
+
+        /* Whether RX frames passed to ieee80211_rx() include FCS in the end */
+#define IEEE80211_HW_RX_INCLUDES_FCS (1<<3)
+
+        /* Some wireless LAN chipsets buffer broadcast/multicast frames for
+         * power saving stations in the hardware/firmware and others rely on
+         * the host system for such buffering. This option is used to
+         * configure the IEEE 802.11 upper layer to buffer broadcast/multicast
+         * frames when there are power saving stations so that low-level driver
+         * can fetch them with ieee80211_get_buffered_bc(). */
+#define IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING (1<<4)
+
+#define IEEE80211_HW_WEP_INCLUDE_IV (1<<5)
+
+        /* will data nullfunc frames get proper TX status callback */
+#define IEEE80211_HW_DATA_NULLFUNC_ACK (1<<6)
+
+        /* Force software encryption for TKIP packets if WMM is enabled. */
+#define IEEE80211_HW_NO_TKIP_WMM_HWACCEL (1<<7)
+
+        /* Some devices handle Michael MIC internally and do not include MIC in
+         * the received packets passed up. device_strips_mic must be set
+         * for such devices. The 'encryption' frame control bit is expected to
+         * be still set in the IEEE 802.11 header with this option unlike with
+         * the device_hides_wep configuration option.
+         */
+#define IEEE80211_HW_DEVICE_STRIPS_MIC (1<<8)
+
+        /* Device is capable of performing full monitor mode even during
+         * normal operation. */
+#define IEEE80211_HW_MONITOR_DURING_OPER (1<<9)
+
+        /* Device does not need BSSID filter set to broadcast in order to
+         * receive all probe responses while scanning */
+#define IEEE80211_HW_NO_PROBE_FILTERING (1<<10)
+
+        /* Channels are already configured to the default regulatory domain
+         * specified in the device's EEPROM */
+#define IEEE80211_HW_DEFAULT_REG_DOMAIN_CONFIGURED (1<<11)
+
+        /* calculate Michael MIC for an MSDU when doing hwcrypto */
+#define IEEE80211_HW_TKIP_INCLUDE_MMIC (1<<12)
+        /* Do TKIP phase1 key mixing in stack to support cards only do
+         * phase2 key mixing when doing hwcrypto */
+#define IEEE80211_HW_TKIP_REQ_PHASE1_KEY (1<<13)
+        /* Do TKIP phase1 and phase2 key mixing in stack and send the generated
+         * per-packet RC4 key with each TX frame when doing hwcrypto */
+#define IEEE80211_HW_TKIP_REQ_PHASE2_KEY (1<<14)
+
+        u32 flags;                      /* hardware flags defined above */
+
+        /* Set to the size of a needed device specific skb headroom for TX skbs. */
+        unsigned int extra_tx_headroom;
+
+        /* This is the time in us to change channels
+         */
+        int channel_change_time;
+        /* Maximum values for various statistics.
+         * Leave at 0 to indicate no support. Use negative numbers for dBm. */
+        s8 max_rssi;
+        s8 max_signal;
+        s8 max_noise;
+
+        /* Number of available hardware TX queues for data packets.
+         * WMM requires at least four queues. */
+        int queues;
+};
+
+static inline void SET_IEEE80211_DEV(struct ieee80211_hw *hw, struct device *dev)
+{
+        set_wiphy_dev(hw->wiphy, dev);
+}
+
+static inline void SET_IEEE80211_PERM_ADDR(struct ieee80211_hw *hw, u8 *addr)
+{
+        memcpy(hw->wiphy->perm_addr, addr, ETH_ALEN);
+}
+
+/* Configuration block used by the low-level driver to tell the 802.11 code
+ * about supported hardware features and to pass function pointers to callback
+ * functions. */
+struct ieee80211_ops {
+        /* Handler that 802.11 module calls for each transmitted frame.
+         * skb contains the buffer starting from the IEEE 802.11 header.
+         * The low-level driver should send the frame out based on
+         * configuration in the TX control data.
+         * Must be atomic. */
+        int (*tx)(struct ieee80211_hw *hw, struct sk_buff *skb,
+                  struct ieee80211_tx_control *control);
+
+        /* Handler for performing hardware reset. */
+        int (*reset)(struct ieee80211_hw *hw);
+
+        /* Handler that is called when any netdevice attached to the hardware
+         * device is set UP for the first time. This can be used, e.g., to
+         * enable interrupts and beacon sending. */
+        int (*open)(struct ieee80211_hw *hw);
+
+        /* Handler that is called when the last netdevice attached to the
+         * hardware device is set DOWN. This can be used, e.g., to disable
+         * interrupts and beacon sending. */
+        int (*stop)(struct ieee80211_hw *hw);
+
+        /* Handler for asking a driver if a new interface can be added (or,
+         * more exactly, set UP). If the handler returns zero, the interface
+         * is added. Driver should perform any initialization it needs prior
+         * to returning zero. By returning non-zero addition of the interface
+         * is inhibited. Unless monitor_during_oper is set, it is guaranteed
+         * that monitor interfaces and normal interfaces are mutually
+         * exclusive. The open() handler is called after add_interface()
+         * if this is the first device added. At least one of the open()
+         * open() and add_interface() callbacks has to be assigned. If
+         * add_interface() is NULL, one STA interface is permitted only. */
+        int (*add_interface)(struct ieee80211_hw *hw,
+                             struct ieee80211_if_init_conf *conf);
+
+        /* Notify a driver that an interface is going down. The stop() handler
+         * is called prior to this if this is a last interface. */
+        void (*remove_interface)(struct ieee80211_hw *hw,
+                                 struct ieee80211_if_init_conf *conf);
+
+        /* Handler for configuration requests. IEEE 802.11 code calls this
+         * function to change hardware configuration, e.g., channel. */
+        int (*config)(struct ieee80211_hw *hw, struct ieee80211_conf *conf);
+
+        /* Handler for configuration requests related to interfaces (e.g.
+         * BSSID). */
+        int (*config_interface)(struct ieee80211_hw *hw,
+                                int if_id, struct ieee80211_if_conf *conf);
+
+        /* ieee80211 drivers do not have access to the &struct net_device
+         * that is (are) connected with their device. Hence (and because
+         * we need to combine the multicast lists and flags for multiple
+         * virtual interfaces), they cannot assign set_multicast_list.
+         * The parameters here replace dev->flags and dev->mc_count,
+         * dev->mc_list is replaced by calling ieee80211_get_mc_list_item.
+         * Must be atomic. */
+        void (*set_multicast_list)(struct ieee80211_hw *hw,
+                                   unsigned short flags, int mc_count);
+
+        /* Set TIM bit handler. If the hardware/firmware takes care of beacon
+         * generation, IEEE 802.11 code uses this function to tell the
+         * low-level to set (or clear if set==0) TIM bit for the given aid. If
+         * host system is used to generate beacons, this handler is not used
+         * and low-level driver should set it to NULL.
+         * Must be atomic. */
+        int (*set_tim)(struct ieee80211_hw *hw, int aid, int set);
+
+        /* Set encryption key. IEEE 802.11 module calls this function to set
+         * encryption keys. addr is ff:ff:ff:ff:ff:ff for default keys and
+         * station hwaddr for individual keys. aid of the station is given
+         * to help low-level driver in selecting which key->hw_key_idx to use
+         * for this key. TX control data will use the hw_key_idx selected by
+         * the low-level driver.
+         * Must be atomic. */
+        int (*set_key)(struct ieee80211_hw *hw, set_key_cmd cmd,
+                       u8 *addr, struct ieee80211_key_conf *key, int aid);
+
+        /* Set TX key index for default/broadcast keys. This is needed in cases
+         * where wlan card is doing full WEP/TKIP encapsulation (wep_include_iv
+         * is not set), in other cases, this function pointer can be set to
+         * NULL since the IEEE 802. 11 module takes care of selecting the key
+         * index for each TX frame. */
+        int (*set_key_idx)(struct ieee80211_hw *hw, int idx);
+
+        /* Enable/disable IEEE 802.1X. This item requests wlan card to pass
+         * unencrypted EAPOL-Key frames even when encryption is configured.
+         * If the wlan card does not require such a configuration, this
+         * function pointer can be set to NULL. */
+        int (*set_ieee8021x)(struct ieee80211_hw *hw, int use_ieee8021x);
+
+        /* Set port authorization state (IEEE 802.1X PAE) to be authorized
+         * (authorized=1) or unauthorized (authorized=0). This function can be
+         * used if the wlan hardware or low-level driver implements PAE.
+         * 80211.o module will anyway filter frames based on authorization
+         * state, so this function pointer can be NULL if low-level driver does
+         * not require event notification about port state changes.
+         * Currently unused. */
+        int (*set_port_auth)(struct ieee80211_hw *hw, u8 *addr,
+                             int authorized);
+
+        /* Ask the hardware to service the scan request, no need to start
+         * the scan state machine in stack. */
+        int (*hw_scan)(struct ieee80211_hw *hw, u8 *ssid, size_t len);
+
+        /* return low-level statistics */
+        int (*get_stats)(struct ieee80211_hw *hw,
+                         struct ieee80211_low_level_stats *stats);
+
+        /* For devices that generate their own beacons and probe response
+         * or association responses this updates the state of privacy_invoked
+         * returns 0 for success or an error number */
+        int (*set_privacy_invoked)(struct ieee80211_hw *hw,
+                                   int privacy_invoked);
+
+        /* For devices that have internal sequence counters, allow 802.11
+         * code to access the current value of a counter */
+        int (*get_sequence_counter)(struct ieee80211_hw *hw,
+                                    u8* addr, u8 keyidx, u8 txrx,
+                                    u32* iv32, u16* iv16);
+
+        /* Configuration of RTS threshold (if device needs it) */
+        int (*set_rts_threshold)(struct ieee80211_hw *hw, u32 value);
+
+        /* Configuration of fragmentation threshold.
+         * Assign this if the device does fragmentation by itself,
+         * if this method is assigned then the stack will not do
+         * fragmentation. */
+        int (*set_frag_threshold)(struct ieee80211_hw *hw, u32 value);
+
+        /* Configuration of retry limits (if device needs it) */
+        int (*set_retry_limit)(struct ieee80211_hw *hw,
+                               u32 short_retry, u32 long_retr);
+
+        /* Number of STAs in STA table notification (NULL = disabled).
+         * Must be atomic. */
+        void (*sta_table_notification)(struct ieee80211_hw *hw,
+                                       int num_sta);
+
+        /* Configure TX queue parameters (EDCF (aifs, cw_min, cw_max),
+         * bursting) for a hardware TX queue.
+         * queue = IEEE80211_TX_QUEUE_*.
+         * Must be atomic. */
+        int (*conf_tx)(struct ieee80211_hw *hw, int queue,
+                       const struct ieee80211_tx_queue_params *params);
+
+        /* Get statistics of the current TX queue status. This is used to get
+         * number of currently queued packets (queue length), maximum queue
+         * size (limit), and total number of packets sent using each TX queue
+         * (count).
+         * Currently unused. */
+        int (*get_tx_stats)(struct ieee80211_hw *hw,
+                            struct ieee80211_tx_queue_stats *stats);
+
+        /* Get the current TSF timer value from firmware/hardware. Currently,
+         * this is only used for IBSS mode debugging and, as such, is not a
+         * required function.
+         * Must be atomic. */
+        u64 (*get_tsf)(struct ieee80211_hw *hw);
+
+        /* Reset the TSF timer and allow firmware/hardware to synchronize with
+         * other STAs in the IBSS. This is only used in IBSS mode. This
+         * function is optional if the firmware/hardware takes full care of
+         * TSF synchronization. */
+        void (*reset_tsf)(struct ieee80211_hw *hw);
+
+        /* Setup beacon data for IBSS beacons. Unlike access point (Master),
+         * IBSS uses a fixed beacon frame which is configured using this
+         * function. This handler is required only for IBSS mode. */
+        int (*beacon_update)(struct ieee80211_hw *hw,
+                             struct sk_buff *skb,
+                             struct ieee80211_tx_control *control);
+
+        /* Determine whether the last IBSS beacon was sent by us. This is
+         * needed only for IBSS mode and the result of this function is used to
+         * determine whether to reply to Probe Requests. */
+        int (*tx_last_beacon)(struct ieee80211_hw *hw);
+};
+
+/* Allocate a new hardware device. This must be called once for each
+ * hardware device. The returned pointer must be used to refer to this
+ * device when calling other functions. 802.11 code allocates a private data
+ * area for the low-level driver. The size of this area is given as
+ * priv_data_len.
+ */
+struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
+                                        const struct ieee80211_ops *ops);
+
+/* Register hardware device to the IEEE 802.11 code and kernel. Low-level
+ * drivers must call this function before using any other IEEE 802.11
+ * function except ieee80211_register_hwmode. */
+int ieee80211_register_hw(struct ieee80211_hw *hw);
+
+/* driver can use this and ieee80211_get_rx_led_name to get the
+ * name of the registered LEDs after ieee80211_register_hw
+ * was called.
+ * This is useful to set the default trigger on the LED class
+ * device that your driver should export for each LED the device
+ * has, that way the default behaviour will be as expected but
+ * the user can still change it/turn off the LED etc.
+ */
+#ifdef CONFIG_MAC80211_LEDS
+extern char *__ieee80211_get_tx_led_name(struct ieee80211_hw *hw);
+extern char *__ieee80211_get_rx_led_name(struct ieee80211_hw *hw);
+#endif
+static inline char *ieee80211_get_tx_led_name(struct ieee80211_hw *hw)
+{
+#ifdef CONFIG_MAC80211_LEDS
+        return __ieee80211_get_tx_led_name(hw);
+#else
+        return NULL;
+#endif
+}
+
+static inline char *ieee80211_get_rx_led_name(struct ieee80211_hw *hw)
+{
+#ifdef CONFIG_MAC80211_LEDS
+        return __ieee80211_get_rx_led_name(hw);
+#else
+        return NULL;
+#endif
+}
+
+/* Register a new hardware PHYMODE capability to the stack. */
+int ieee80211_register_hwmode(struct ieee80211_hw *hw,
+                              struct ieee80211_hw_mode *mode);
+
+/* Unregister a hardware device. This function instructs 802.11 code to free
+ * allocated resources and unregister netdevices from the kernel. */
+void ieee80211_unregister_hw(struct ieee80211_hw *hw);
+
+/* Free everything that was allocated including private data of a driver. */
+void ieee80211_free_hw(struct ieee80211_hw *hw);
+
+/* Receive frame callback function. The low-level driver uses this function to
+ * send received frames to the IEEE 802.11 code. Receive buffer (skb) must
+ * start with IEEE 802.11 header. */
+void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb,
+                    struct ieee80211_rx_status *status);
+void ieee80211_rx_irqsafe(struct ieee80211_hw *hw,
+                          struct sk_buff *skb,
+                          struct ieee80211_rx_status *status);
+
+/* Transmit status callback function. The low-level driver must call this
+ * function to report transmit status for all the TX frames that had
+ * req_tx_status set in the transmit control fields. In addition, this should
+ * be called at least for all unicast frames to provide information for TX rate
+ * control algorithm. In order to maintain all statistics, this function is
+ * recommended to be called after each frame, including multicast/broadcast, is
+ * sent. */
+void ieee80211_tx_status(struct ieee80211_hw *hw,
+                         struct sk_buff *skb,
+                         struct ieee80211_tx_status *status);
+void ieee80211_tx_status_irqsafe(struct ieee80211_hw *hw,
+                                 struct sk_buff *skb,
+                                 struct ieee80211_tx_status *status);
+
+/**
+ * ieee80211_beacon_get - beacon generation function
+ * @hw: pointer obtained from ieee80211_alloc_hw().
+ * @if_id: interface ID from &struct ieee80211_if_init_conf.
+ * @control: will be filled with information needed to send this beacon.
+ *
+ * If the beacon frames are generated by the host system (i.e., not in
+ * hardware/firmware), the low-level driver uses this function to receive
+ * the next beacon frame from the 802.11 code. The low-level is responsible
+ * for calling this function before beacon data is needed (e.g., based on
+ * hardware interrupt). Returned skb is used only once and low-level driver
+ * is responsible of freeing it.
+ */
+struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw,
+                                     int if_id,
+                                     struct ieee80211_tx_control *control);
+
+/**
+ * ieee80211_rts_get - RTS frame generation function
+ * @hw: pointer obtained from ieee80211_alloc_hw().
+ * @frame: pointer to the frame that is going to be protected by the RTS.
+ * @frame_len: the frame length (in octets).
+ * @frame_txctl: &struct ieee80211_tx_control of the frame.
+ * @rts: The buffer where to store the RTS frame.
+ *
+ * If the RTS frames are generated by the host system (i.e., not in
+ * hardware/firmware), the low-level driver uses this function to receive
+ * the next RTS frame from the 802.11 code. The low-level is responsible
+ * for calling this function before and RTS frame is needed.
+ */
+void ieee80211_rts_get(struct ieee80211_hw *hw,
+                       const void *frame, size_t frame_len,
+                       const struct ieee80211_tx_control *frame_txctl,
+                       struct ieee80211_rts *rts);
+
+/**
+ * ieee80211_rts_duration - Get the duration field for an RTS frame
+ * @hw: pointer obtained from ieee80211_alloc_hw().
+ * @frame_len: the length of the frame that is going to be protected by the RTS.
+ * @frame_txctl: &struct ieee80211_tx_control of the frame.
+ *
+ * If the RTS is generated in firmware, but the host system must provide
+ * the duration field, the low-level driver uses this function to receive
+ * the duration field value in little-endian byteorder.
+ */
+__le16 ieee80211_rts_duration(struct ieee80211_hw *hw,
+                              size_t frame_len,
+                              const struct ieee80211_tx_control *frame_txctl);
+
+/**
+ * ieee80211_ctstoself_get - CTS-to-self frame generation function
+ * @hw: pointer obtained from ieee80211_alloc_hw().
+ * @frame: pointer to the frame that is going to be protected by the CTS-to-self.
+ * @frame_len: the frame length (in octets).
+ * @frame_txctl: &struct ieee80211_tx_control of the frame.
+ * @cts: The buffer where to store the CTS-to-self frame.
+ *
+ * If the CTS-to-self frames are generated by the host system (i.e., not in
+ * hardware/firmware), the low-level driver uses this function to receive
+ * the next CTS-to-self frame from the 802.11 code. The low-level is responsible
+ * for calling this function before and CTS-to-self frame is needed.
+ */
+void ieee80211_ctstoself_get(struct ieee80211_hw *hw,
+                             const void *frame, size_t frame_len,
+                             const struct ieee80211_tx_control *frame_txctl,
+                             struct ieee80211_cts *cts);
+
+/**
+ * ieee80211_ctstoself_duration - Get the duration field for a CTS-to-self frame
+ * @hw: pointer obtained from ieee80211_alloc_hw().
+ * @frame_len: the length of the frame that is going to be protected by the CTS-to-self.
+ * @frame_txctl: &struct ieee80211_tx_control of the frame.
+ *
+ * If the CTS-to-self is generated in firmware, but the host system must provide
+ * the duration field, the low-level driver uses this function to receive
+ * the duration field value in little-endian byteorder.
+ */
+__le16 ieee80211_ctstoself_duration(struct ieee80211_hw *hw,
+                                    size_t frame_len,
+                                    const struct ieee80211_tx_control *frame_txctl);
+
+/**
+ * ieee80211_generic_frame_duration - Calculate the duration field for a frame
+ * @hw: pointer obtained from ieee80211_alloc_hw().
+ * @frame_len: the length of the frame.
+ * @rate: the rate (in 100kbps) at which the frame is going to be transmitted.
+ *
+ * Calculate the duration field of some generic frame, given its
+ * length and transmission rate (in 100kbps).
+ */
+__le16 ieee80211_generic_frame_duration(struct ieee80211_hw *hw,
+                                        size_t frame_len,
+                                        int rate);
+
+/**
+ * ieee80211_get_buffered_bc - accessing buffered broadcast and multicast frames
+ * @hw: pointer as obtained from ieee80211_alloc_hw().
+ * @if_id: interface ID from &struct ieee80211_if_init_conf.
+ * @control: will be filled with information needed to send returned frame.
+ *
+ * Function for accessing buffered broadcast and multicast frames. If
+ * hardware/firmware does not implement buffering of broadcast/multicast
+ * frames when power saving is used, 802.11 code buffers them in the host
+ * memory. The low-level driver uses this function to fetch next buffered
+ * frame. In most cases, this is used when generating beacon frame. This
+ * function returns a pointer to the next buffered skb or NULL if no more
+ * buffered frames are available.
+ *
+ * Note: buffered frames are returned only after DTIM beacon frame was
+ * generated with ieee80211_beacon_get() and the low-level driver must thus
+ * call ieee80211_beacon_get() first. ieee80211_get_buffered_bc() returns
+ * NULL if the previous generated beacon was not DTIM, so the low-level driver
+ * does not need to check for DTIM beacons separately and should be able to
+ * use common code for all beacons.
+ */
+struct sk_buff *
+ieee80211_get_buffered_bc(struct ieee80211_hw *hw, int if_id,
+                          struct ieee80211_tx_control *control);
+
+/* Low level drivers that have their own MLME and MAC indicate
+ * the aid for an associating station with this call */
+int ieee80211_set_aid_for_sta(struct ieee80211_hw *hw,
+                              u8 *peer_address, u16 aid);
+
+
+/* Given an sk_buff with a raw 802.11 header at the data pointer this function
+ * returns the 802.11 header length in bytes (not including encryption
+ * headers). If the data in the sk_buff is too short to contain a valid 802.11
+ * header the function returns 0.
+ */
+int ieee80211_get_hdrlen_from_skb(const struct sk_buff *skb);
+
+/* Like ieee80211_get_hdrlen_from_skb() but takes a FC in CPU order. */
+int ieee80211_get_hdrlen(u16 fc);
+
+/**
+ * ieee80211_wake_queue - wake specific queue
+ * @hw: pointer as obtained from ieee80211_alloc_hw().
+ * @queue: queue number (counted from zero).
+ *
+ * Drivers should use this function instead of netif_wake_queue.
+ */
+void ieee80211_wake_queue(struct ieee80211_hw *hw, int queue);
+
+/**
+ * ieee80211_stop_queue - stop specific queue
+ * @hw: pointer as obtained from ieee80211_alloc_hw().
+ * @queue: queue number (counted from zero).
+ *
+ * Drivers should use this function instead of netif_stop_queue.
+ */
+void ieee80211_stop_queue(struct ieee80211_hw *hw, int queue);
+
+/**
+ * ieee80211_start_queues - start all queues
+ * @hw: pointer to as obtained from ieee80211_alloc_hw().
+ *
+ * Drivers should use this function instead of netif_start_queue.
+ */
+void ieee80211_start_queues(struct ieee80211_hw *hw);
+
+/**
+ * ieee80211_stop_queues - stop all queues
+ * @hw: pointer as obtained from ieee80211_alloc_hw().
+ *
+ * Drivers should use this function instead of netif_stop_queue.
+ */
+void ieee80211_stop_queues(struct ieee80211_hw *hw);
+
+/**
+ * ieee80211_wake_queues - wake all queues
+ * @hw: pointer as obtained from ieee80211_alloc_hw().
+ *
+ * Drivers should use this function instead of netif_wake_queue.
+ */
+void ieee80211_wake_queues(struct ieee80211_hw *hw);
+
+/**
+ * ieee80211_get_mc_list_item - iteration over items in multicast list
+ * @hw: pointer as obtained from ieee80211_alloc_hw().
+ * @prev: value returned by previous call to ieee80211_get_mc_list_item() or
+ *      NULL to start a new iteration.
+ * @ptr: pointer to buffer of void * type for internal usage of
+ *      ieee80211_get_mc_list_item().
+ *
+ * Iterates over items in multicast list of given device. To get the first
+ * item, pass NULL in @prev and in *@ptr. In subsequent calls, pass the
+ * value returned by previous call in @prev. Don't alter *@ptr during
+ * iteration. When there are no more items, NULL is returned.
+ */
+struct dev_mc_list *
+ieee80211_get_mc_list_item(struct ieee80211_hw *hw,
+                           struct dev_mc_list *prev,
+                           void **ptr);
+
+/* called by driver to notify scan status completed */
+void ieee80211_scan_completed(struct ieee80211_hw *hw);
+
+/* Function to indicate Radar Detection. The low level driver must call this
+ * function to indicate the presence of radar in the current channel.
+ * Additionally the radar type also could be sent */
+int  ieee80211_radar_status(struct ieee80211_hw *hw, int channel,
+                            int radar, int radar_type);
+
+/* return a pointer to the source address (SA) */
+static inline u8 *ieee80211_get_SA(struct ieee80211_hdr *hdr)
+{
+        u8 *raw = (u8 *) hdr;
+        u8 tofrom = (*(raw+1)) & 3; /* get the TODS and FROMDS bits */
+
+        switch (tofrom) {
+                case 2:
+                        return hdr->addr3;
+                case 3:
+                        return hdr->addr4;
+        }
+        return hdr->addr2;
+}
+
+/* return a pointer to the destination address (DA) */
+static inline u8 *ieee80211_get_DA(struct ieee80211_hdr *hdr)
+{
+        u8 *raw = (u8 *) hdr;
+        u8 to_ds = (*(raw+1)) & 1; /* get the TODS bit */
+
+        if (to_ds)
+                return hdr->addr3;
+        return hdr->addr1;
+}
+
+static inline int ieee80211_get_morefrag(struct ieee80211_hdr *hdr)
+{
+        return (le16_to_cpu(hdr->frame_control) &
+                IEEE80211_FCTL_MOREFRAGS) != 0;
+}
+
+#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"
+#define MAC_ARG(x) ((u8*)(x))[0], ((u8*)(x))[1], ((u8*)(x))[2], \
+                   ((u8*)(x))[3], ((u8*)(x))[4], ((u8*)(x))[5]
+
+#endif /* MAC80211_H */
diff --git a/net/Kconfig b/net/Kconfig
index 2fc8e77b1e62..5b2227813923 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -220,6 +220,7 @@ config FIB_RULES
 menu "Wireless"
 
 source "net/wireless/Kconfig"
+source "net/mac80211/Kconfig"
 source "net/ieee80211/Kconfig"
 
 endmenu
diff --git a/net/Makefile b/net/Makefile
index 6b74d4118c5b..9fdb60c2e4a1 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -45,6 +45,8 @@ obj-$(CONFIG_ECONET)		+= econet/
 obj-$(CONFIG_VLAN_8021Q)        += 8021q/
 obj-$(CONFIG_IP_DCCP)           += dccp/
 obj-$(CONFIG_IP_SCTP)           += sctp/
+obj-y                           += wireless/
+obj-$(CONFIG_MAC80211)          += mac80211/
 obj-$(CONFIG_IEEE80211)         += ieee80211/
 obj-$(CONFIG_TIPC)              += tipc/
 obj-$(CONFIG_NETLABEL)          += netlabel/
@@ -53,5 +55,3 @@ obj-$(CONFIG_IUCV)		+= iucv/
 ifeq ($(CONFIG_NET),y)
 obj-$(CONFIG_SYSCTL)            += sysctl_net.o
 endif
-
-obj-y                           += wireless/
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index 2f1373855a8b..d9e9ddb8eac5 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -961,7 +961,7 @@ static void iucv_callback_connack(struct iucv_path *path, u8 ipuser[16])
 }
 
 static int iucv_fragment_skb(struct sock *sk, struct sk_buff *skb, int len,
-                             struct sk_buff_head fragmented_skb_q)
+                             struct sk_buff_head *fragmented_skb_q)
 {
         int dataleft, size, copied = 0;
         struct sk_buff *nskb;
@@ -981,8 +981,8 @@ static int iucv_fragment_skb(struct sock *sk, struct sk_buff *skb, int len,
                 copied += size;
                 dataleft -= size;
 
-                nskb->h.raw = nskb->data;
-                nskb->nh.raw = nskb->data;
+                skb_reset_transport_header(nskb);
+                skb_reset_network_header(nskb);
                 nskb->len = size;
 
                 skb_queue_tail(fragmented_skb_q, nskb);
diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
new file mode 100644
index 000000000000..6fffb3845ab6
--- /dev/null
+++ b/net/mac80211/Kconfig
@@ -0,0 +1,78 @@
+config MAC80211
+        tristate "Generic IEEE 802.11 Networking Stack (mac80211)"
+        depends on EXPERIMENTAL
+        select CRYPTO
+        select CRYPTO_ECB
+        select CRYPTO_ARC4
+        select CRYPTO_AES
+        select CRC32
+        select WIRELESS_EXT
+        select CFG80211
+        select NET_SCH_FIFO
+        ---help---
+        This option enables the hardware independent IEEE 802.11
+        networking stack.
+
+config MAC80211_LEDS
+        bool "Enable LED triggers"
+        depends on MAC80211 && LEDS_TRIGGERS
+        ---help---
+        This option enables a few LED triggers for different
+        packet receive/transmit events.
+
+config MAC80211_DEBUGFS
+        bool "Export mac80211 internals in DebugFS"
+        depends on MAC80211 && DEBUG_FS
+        ---help---
+          Select this to see extensive information about
+          the internal state of mac80211 in debugfs.
+
+          Say N unless you know you need this.
+
+config MAC80211_DEBUG
+        bool "Enable debugging output"
+        depends on MAC80211
+        ---help---
+          This option will enable debug tracing output for the
+          ieee80211 network stack.
+
+          If you are not trying to debug or develop the ieee80211
+          subsystem, you most likely want to say N here.
+
+config MAC80211_VERBOSE_DEBUG
+        bool "Verbose debugging output"
+        depends on MAC80211_DEBUG
+
+config MAC80211_LOWTX_FRAME_DUMP
+        bool "Debug frame dumping"
+        depends on MAC80211_DEBUG
+        ---help---
+          Selecting this option will cause the stack to
+          print a message for each frame that is handed
+          to the lowlevel driver for transmission. This
+          message includes all MAC addresses and the
+          frame control field.
+
+          If unsure, say N and insert the debugging code
+          you require into the driver you are debugging.
+
+config TKIP_DEBUG
+        bool "TKIP debugging"
+        depends on MAC80211_DEBUG
+
+config MAC80211_DEBUG_COUNTERS
+        bool "Extra statistics for TX/RX debugging"
+        depends on MAC80211_DEBUG
+
+config MAC80211_IBSS_DEBUG
+        bool "Support for IBSS testing"
+        depends on MAC80211_DEBUG
+        ---help---
+          Say Y here if you intend to debug the IBSS code.
+
+config MAC80211_VERBOSE_PS_DEBUG
+        bool "Verbose powersave mode debugging"
+        depends on MAC80211_DEBUG
+        ---help---
+          Say Y here to print out verbose powersave
+          mode debug messages.
diff --git a/net/mac80211/Makefile b/net/mac80211/Makefile
new file mode 100644
index 000000000000..e9738dad2d7c
--- /dev/null
+++ b/net/mac80211/Makefile
@@ -0,0 +1,20 @@
+obj-$(CONFIG_MAC80211) += mac80211.o rc80211_simple.o
+
+mac80211-objs-$(CONFIG_MAC80211_LEDS) += ieee80211_led.o
+mac80211-objs-$(CONFIG_MAC80211_DEBUGFS) += debugfs.o debugfs_sta.o debugfs_netdev.o debugfs_key.o
+
+mac80211-objs := \
+        ieee80211.o \
+        ieee80211_ioctl.o \
+        sta_info.o \
+        wep.o \
+        wpa.o \
+        ieee80211_sta.o \
+        ieee80211_iface.o \
+        ieee80211_rate.o \
+        michael.o \
+        tkip.o \
+        aes_ccm.o \
+        wme.o \
+        ieee80211_cfg.o \
+        $(mac80211-objs-y)
diff --git a/net/mac80211/aes_ccm.c b/net/mac80211/aes_ccm.c
new file mode 100644
index 000000000000..e55569bee7d0
--- /dev/null
+++ b/net/mac80211/aes_ccm.c
@@ -0,0 +1,155 @@
+/*
+ * Copyright 2003-2004, Instant802 Networks, Inc.
+ * Copyright 2005-2006, Devicescape Software, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/types.h>
+#include <linux/crypto.h>
+#include <linux/err.h>
+#include <asm/scatterlist.h>
+
+#include <net/mac80211.h>
+#include "ieee80211_key.h"
+#include "aes_ccm.h"
+
+
+static void ieee80211_aes_encrypt(struct crypto_cipher *tfm,
+                                  const u8 pt[16], u8 ct[16])
+{
+        crypto_cipher_encrypt_one(tfm, ct, pt);
+}
+
+
+static inline void aes_ccm_prepare(struct crypto_cipher *tfm, u8 *b_0, u8 *aad,
+                                   u8 *b, u8 *s_0, u8 *a)
+{
+        int i;
+
+        ieee80211_aes_encrypt(tfm, b_0, b);
+
+        /* Extra Authenticate-only data (always two AES blocks) */
+        for (i = 0; i < AES_BLOCK_LEN; i++)
+                aad[i] ^= b[i];
+        ieee80211_aes_encrypt(tfm, aad, b);
+
+        aad += AES_BLOCK_LEN;
+
+        for (i = 0; i < AES_BLOCK_LEN; i++)
+                aad[i] ^= b[i];
+        ieee80211_aes_encrypt(tfm, aad, a);
+
+        /* Mask out bits from auth-only-b_0 */
+        b_0[0] &= 0x07;
+
+        /* S_0 is used to encrypt T (= MIC) */
+        b_0[14] = 0;
+        b_0[15] = 0;
+        ieee80211_aes_encrypt(tfm, b_0, s_0);
+}
+
+
+void ieee80211_aes_ccm_encrypt(struct crypto_cipher *tfm, u8 *scratch,
+                               u8 *b_0, u8 *aad, u8 *data, size_t data_len,
+                               u8 *cdata, u8 *mic)
+{
+        int i, j, last_len, num_blocks;
+        u8 *pos, *cpos, *b, *s_0, *e;
+
+        b = scratch;
+        s_0 = scratch + AES_BLOCK_LEN;
+        e = scratch + 2 * AES_BLOCK_LEN;
+
+        num_blocks = (data_len + AES_BLOCK_LEN - 1) / AES_BLOCK_LEN;
+        last_len = data_len % AES_BLOCK_LEN;
+        aes_ccm_prepare(tfm, b_0, aad, b, s_0, b);
+
+        /* Process payload blocks */
+        pos = data;
+        cpos = cdata;
+        for (j = 1; j <= num_blocks; j++) {
+                int blen = (j == num_blocks && last_len) ?
+                        last_len : AES_BLOCK_LEN;
+
+                /* Authentication followed by encryption */
+                for (i = 0; i < blen; i++)
+                        b[i] ^= pos[i];
+                ieee80211_aes_encrypt(tfm, b, b);
+
+                b_0[14] = (j >> 8) & 0xff;
+                b_0[15] = j & 0xff;
+                ieee80211_aes_encrypt(tfm, b_0, e);
+                for (i = 0; i < blen; i++)
+                        *cpos++ = *pos++ ^ e[i];
+        }
+
+        for (i = 0; i < CCMP_MIC_LEN; i++)
+                mic[i] = b[i] ^ s_0[i];
+}
+
+
+int ieee80211_aes_ccm_decrypt(struct crypto_cipher *tfm, u8 *scratch,
+                              u8 *b_0, u8 *aad, u8 *cdata, size_t data_len,
+                              u8 *mic, u8 *data)
+{
+        int i, j, last_len, num_blocks;
+        u8 *pos, *cpos, *b, *s_0, *a;
+
+        b = scratch;
+        s_0 = scratch + AES_BLOCK_LEN;
+        a = scratch + 2 * AES_BLOCK_LEN;
+
+        num_blocks = (data_len + AES_BLOCK_LEN - 1) / AES_BLOCK_LEN;
+        last_len = data_len % AES_BLOCK_LEN;
+        aes_ccm_prepare(tfm, b_0, aad, b, s_0, a);
+
+        /* Process payload blocks */
+        cpos = cdata;
+        pos = data;
+        for (j = 1; j <= num_blocks; j++) {
+                int blen = (j == num_blocks && last_len) ?
+                        last_len : AES_BLOCK_LEN;
+
+                /* Decryption followed by authentication */
+                b_0[14] = (j >> 8) & 0xff;
+                b_0[15] = j & 0xff;
+                ieee80211_aes_encrypt(tfm, b_0, b);
+                for (i = 0; i < blen; i++) {
+                        *pos = *cpos++ ^ b[i];
+                        a[i] ^= *pos++;
+                }
+
+                ieee80211_aes_encrypt(tfm, a, a);
+        }
+
+        for (i = 0; i < CCMP_MIC_LEN; i++) {
+                if ((mic[i] ^ s_0[i]) != a[i])
+                        return -1;
+        }
+
+        return 0;
+}
+
+
+struct crypto_cipher * ieee80211_aes_key_setup_encrypt(const u8 key[])
+{
+        struct crypto_cipher *tfm;
+
+        tfm = crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC);
+        if (IS_ERR(tfm))
+                return NULL;
+
+        crypto_cipher_setkey(tfm, key, ALG_CCMP_KEY_LEN);
+
+        return tfm;
+}
+
+
+void ieee80211_aes_key_free(struct crypto_cipher *tfm)
+{
+        if (tfm)
+                crypto_free_cipher(tfm);
+}
diff --git a/net/mac80211/aes_ccm.h b/net/mac80211/aes_ccm.h
new file mode 100644
index 000000000000..885f19030b29
--- /dev/null
+++ b/net/mac80211/aes_ccm.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2003-2004, Instant802 Networks, Inc.
+ * Copyright 2006, Devicescape Software, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef AES_CCM_H
+#define AES_CCM_H
+
+#include <linux/crypto.h>
+
+#define AES_BLOCK_LEN 16
+
+struct crypto_cipher * ieee80211_aes_key_setup_encrypt(const u8 key[]);
+void ieee80211_aes_ccm_encrypt(struct crypto_cipher *tfm, u8 *scratch,
+                               u8 *b_0, u8 *aad, u8 *data, size_t data_len,
+                               u8 *cdata, u8 *mic);
+int ieee80211_aes_ccm_decrypt(struct crypto_cipher *tfm, u8 *scratch,
+                              u8 *b_0, u8 *aad, u8 *cdata, size_t data_len,
+                              u8 *mic, u8 *data);
+void ieee80211_aes_key_free(struct crypto_cipher *tfm);
+
+#endif /* AES_CCM_H */
diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c
new file mode 100644
index 000000000000..bb6c0feb2d48
--- /dev/null
+++ b/net/mac80211/debugfs.c
@@ -0,0 +1,433 @@
+/*
+ * mac80211 debugfs for wireless PHYs
+ *
+ * Copyright 2007       Johannes Berg <johannes@sipsolutions.net>
+ *
+ * GPLv2
+ *
+ */
+
+#include <linux/debugfs.h>
+#include <linux/rtnetlink.h>
+#include "ieee80211_i.h"
+#include "ieee80211_rate.h"
+#include "debugfs.h"
+
+int mac80211_open_file_generic(struct inode *inode, struct file *file)
+{
+        file->private_data = inode->i_private;
+        return 0;
+}
+
+static const char *ieee80211_mode_str(int mode)
+{
+        switch (mode) {
+        case MODE_IEEE80211A:
+                return "IEEE 802.11a";
+        case MODE_IEEE80211B:
+                return "IEEE 802.11b";
+        case MODE_IEEE80211G:
+                return "IEEE 802.11g";
+        case MODE_ATHEROS_TURBO:
+                return "Atheros Turbo (5 GHz)";
+        default:
+                return "UNKNOWN";
+        }
+}
+
+static ssize_t modes_read(struct file *file, char __user *userbuf,
+                          size_t count, loff_t *ppos)
+{
+        struct ieee80211_local *local = file->private_data;
+        struct ieee80211_hw_mode *mode;
+        char buf[150], *p = buf;
+
+        /* FIXME: locking! */
+        list_for_each_entry(mode, &local->modes_list, list) {
+                p += scnprintf(p, sizeof(buf)+buf-p,
+                               "%s\n", ieee80211_mode_str(mode->mode));
+        }
+
+        return simple_read_from_buffer(userbuf, count, ppos, buf, p-buf);
+}
+
+static const struct file_operations modes_ops = {
+        .read = modes_read,
+        .open = mac80211_open_file_generic,
+};
+
+#define DEBUGFS_READONLY_FILE(name, buflen, fmt, value...)              \
+static ssize_t name## _read(struct file *file, char __user *userbuf,    \
+                            size_t count, loff_t *ppos)                 \
+{                                                                       \
+        struct ieee80211_local *local = file->private_data;             \
+        char buf[buflen];                                               \
+        int res;                                                        \
+                                                                        \
+        res = scnprintf(buf, buflen, fmt "\n", ##value);                \
+        return simple_read_from_buffer(userbuf, count, ppos, buf, res); \
+}                                                                       \
+                                                                        \
+static const struct file_operations name## _ops = {                     \
+        .read = name## _read,                                           \
+        .open = mac80211_open_file_generic,                             \
+};
+
+#define DEBUGFS_ADD(name)                                               \
+        local->debugfs.name = debugfs_create_file(#name, 0444, phyd,    \
+                                                  local, &name## _ops);
+
+#define DEBUGFS_DEL(name)                                               \
+        debugfs_remove(local->debugfs.name);                            \
+        local->debugfs.name = NULL;
+
+
+DEBUGFS_READONLY_FILE(channel, 20, "%d",
+                      local->hw.conf.channel);
+DEBUGFS_READONLY_FILE(frequency, 20, "%d",
+                      local->hw.conf.freq);
+DEBUGFS_READONLY_FILE(radar_detect, 20, "%d",
+                      local->hw.conf.radar_detect);
+DEBUGFS_READONLY_FILE(antenna_sel_tx, 20, "%d",
+                      local->hw.conf.antenna_sel_tx);
+DEBUGFS_READONLY_FILE(antenna_sel_rx, 20, "%d",
+                      local->hw.conf.antenna_sel_rx);
+DEBUGFS_READONLY_FILE(bridge_packets, 20, "%d",
+                      local->bridge_packets);
+DEBUGFS_READONLY_FILE(key_tx_rx_threshold, 20, "%d",
+                      local->key_tx_rx_threshold);
+DEBUGFS_READONLY_FILE(rts_threshold, 20, "%d",
+                      local->rts_threshold);
+DEBUGFS_READONLY_FILE(fragmentation_threshold, 20, "%d",
+                      local->fragmentation_threshold);
+DEBUGFS_READONLY_FILE(short_retry_limit, 20, "%d",
+                      local->short_retry_limit);
+DEBUGFS_READONLY_FILE(long_retry_limit, 20, "%d",
+                      local->long_retry_limit);
+DEBUGFS_READONLY_FILE(total_ps_buffered, 20, "%d",
+                      local->total_ps_buffered);
+DEBUGFS_READONLY_FILE(mode, 20, "%s",
+                      ieee80211_mode_str(local->hw.conf.phymode));
+DEBUGFS_READONLY_FILE(wep_iv, 20, "%#06x",
+                      local->wep_iv & 0xffffff);
+DEBUGFS_READONLY_FILE(tx_power_reduction, 20, "%d.%d dBm",
+                      local->hw.conf.tx_power_reduction / 10,
+                      local->hw.conf.tx_power_reduction & 10);
+DEBUGFS_READONLY_FILE(rate_ctrl_alg, 100, "%s",
+                      local->rate_ctrl ? local->rate_ctrl->ops->name : "<unset>");
+
+/* statistics stuff */
+
+static inline int rtnl_lock_local(struct ieee80211_local *local)
+{
+        rtnl_lock();
+        if (unlikely(local->reg_state != IEEE80211_DEV_REGISTERED)) {
+                rtnl_unlock();
+                return -ENODEV;
+        }
+        return 0;
+}
+
+#define DEBUGFS_STATS_FILE(name, buflen, fmt, value...)                 \
+        DEBUGFS_READONLY_FILE(stats_ ##name, buflen, fmt, ##value)
+
+static ssize_t format_devstat_counter(struct ieee80211_local *local,
+        char __user *userbuf,
+        size_t count, loff_t *ppos,
+        int (*printvalue)(struct ieee80211_low_level_stats *stats, char *buf,
+                          int buflen))
+{
+        struct ieee80211_low_level_stats stats;
+        char buf[20];
+        int res;
+
+        if (!local->ops->get_stats)
+                return -EOPNOTSUPP;
+
+        res = rtnl_lock_local(local);
+        if (res)
+                return res;
+
+        res = local->ops->get_stats(local_to_hw(local), &stats);
+        rtnl_unlock();
+        if (!res)
+                res = printvalue(&stats, buf, sizeof(buf));
+        return simple_read_from_buffer(userbuf, count, ppos, buf, res);
+}
+
+#define DEBUGFS_DEVSTATS_FILE(name)                                     \
+static int print_devstats_##name(struct ieee80211_low_level_stats *stats,\
+                                 char *buf, int buflen)                 \
+{                                                                       \
+        return scnprintf(buf, buflen, "%u\n", stats->name);             \
+}                                                                       \
+static ssize_t stats_ ##name## _read(struct file *file,                 \
+                                     char __user *userbuf,              \
+                                     size_t count, loff_t *ppos)        \
+{                                                                       \
+        return format_devstat_counter(file->private_data,               \
+                                      userbuf,                          \
+                                      count,                            \
+                                      ppos,                             \
+                                      print_devstats_##name);           \
+}                                                                       \
+                                                                        \
+static const struct file_operations stats_ ##name## _ops = {            \
+        .read = stats_ ##name## _read,                                  \
+        .open = mac80211_open_file_generic,                             \
+};
+
+#define DEBUGFS_STATS_ADD(name)                                         \
+        local->debugfs.stats.name = debugfs_create_file(#name, 0444, statsd,\
+                local, &stats_ ##name## _ops);
+
+#define DEBUGFS_STATS_DEL(name)                                         \
+        debugfs_remove(local->debugfs.stats.name);                      \
+        local->debugfs.stats.name = NULL;
+
+DEBUGFS_STATS_FILE(transmitted_fragment_count, 20, "%u",
+                   local->dot11TransmittedFragmentCount);
+DEBUGFS_STATS_FILE(multicast_transmitted_frame_count, 20, "%u",
+                   local->dot11MulticastTransmittedFrameCount);
+DEBUGFS_STATS_FILE(failed_count, 20, "%u",
+                   local->dot11FailedCount);
+DEBUGFS_STATS_FILE(retry_count, 20, "%u",
+                   local->dot11RetryCount);
+DEBUGFS_STATS_FILE(multiple_retry_count, 20, "%u",
+                   local->dot11MultipleRetryCount);
+DEBUGFS_STATS_FILE(frame_duplicate_count, 20, "%u",
+                   local->dot11FrameDuplicateCount);
+DEBUGFS_STATS_FILE(received_fragment_count, 20, "%u",
+                   local->dot11ReceivedFragmentCount);
+DEBUGFS_STATS_FILE(multicast_received_frame_count, 20, "%u",
+                   local->dot11MulticastReceivedFrameCount);
+DEBUGFS_STATS_FILE(transmitted_frame_count, 20, "%u",
+                   local->dot11TransmittedFrameCount);
+DEBUGFS_STATS_FILE(wep_undecryptable_count, 20, "%u",
+                   local->dot11WEPUndecryptableCount);
+#ifdef CONFIG_MAC80211_DEBUG_COUNTERS
+DEBUGFS_STATS_FILE(tx_handlers_drop, 20, "%u",
+                   local->tx_handlers_drop);
+DEBUGFS_STATS_FILE(tx_handlers_queued, 20, "%u",
+                   local->tx_handlers_queued);
+DEBUGFS_STATS_FILE(tx_handlers_drop_unencrypted, 20, "%u",
+                   local->tx_handlers_drop_unencrypted);
+DEBUGFS_STATS_FILE(tx_handlers_drop_fragment, 20, "%u",
+                   local->tx_handlers_drop_fragment);
+DEBUGFS_STATS_FILE(tx_handlers_drop_wep, 20, "%u",
+                   local->tx_handlers_drop_wep);
+DEBUGFS_STATS_FILE(tx_handlers_drop_not_assoc, 20, "%u",
+                   local->tx_handlers_drop_not_assoc);
+DEBUGFS_STATS_FILE(tx_handlers_drop_unauth_port, 20, "%u",
+                   local->tx_handlers_drop_unauth_port);
+DEBUGFS_STATS_FILE(rx_handlers_drop, 20, "%u",
+                   local->rx_handlers_drop);
+DEBUGFS_STATS_FILE(rx_handlers_queued, 20, "%u",
+                   local->rx_handlers_queued);
+DEBUGFS_STATS_FILE(rx_handlers_drop_nullfunc, 20, "%u",
+                   local->rx_handlers_drop_nullfunc);
+DEBUGFS_STATS_FILE(rx_handlers_drop_defrag, 20, "%u",
+                   local->rx_handlers_drop_defrag);
+DEBUGFS_STATS_FILE(rx_handlers_drop_short, 20, "%u",
+                   local->rx_handlers_drop_short);
+DEBUGFS_STATS_FILE(rx_handlers_drop_passive_scan, 20, "%u",
+                   local->rx_handlers_drop_passive_scan);
+DEBUGFS_STATS_FILE(tx_expand_skb_head, 20, "%u",
+                   local->tx_expand_skb_head);
+DEBUGFS_STATS_FILE(tx_expand_skb_head_cloned, 20, "%u",
+                   local->tx_expand_skb_head_cloned);
+DEBUGFS_STATS_FILE(rx_expand_skb_head, 20, "%u",
+                   local->rx_expand_skb_head);
+DEBUGFS_STATS_FILE(rx_expand_skb_head2, 20, "%u",
+                   local->rx_expand_skb_head2);
+DEBUGFS_STATS_FILE(rx_handlers_fragments, 20, "%u",
+                   local->rx_handlers_fragments);
+DEBUGFS_STATS_FILE(tx_status_drop, 20, "%u",
+                   local->tx_status_drop);
+
+static ssize_t stats_wme_rx_queue_read(struct file *file,
+                                       char __user *userbuf,
+                                       size_t count, loff_t *ppos)
+{
+        struct ieee80211_local *local = file->private_data;
+        char buf[NUM_RX_DATA_QUEUES*15], *p = buf;
+        int i;
+
+        for (i = 0; i < NUM_RX_DATA_QUEUES; i++)
+                p += scnprintf(p, sizeof(buf)+buf-p,
+                               "%u\n", local->wme_rx_queue[i]);
+
+        return simple_read_from_buffer(userbuf, count, ppos, buf, p-buf);
+}
+
+static const struct file_operations stats_wme_rx_queue_ops = {
+        .read = stats_wme_rx_queue_read,
+        .open = mac80211_open_file_generic,
+};
+
+static ssize_t stats_wme_tx_queue_read(struct file *file,
+                                       char __user *userbuf,
+                                       size_t count, loff_t *ppos)
+{
+        struct ieee80211_local *local = file->private_data;
+        char buf[NUM_TX_DATA_QUEUES*15], *p = buf;
+        int i;
+
+        for (i = 0; i < NUM_TX_DATA_QUEUES; i++)
+                p += scnprintf(p, sizeof(buf)+buf-p,
+                               "%u\n", local->wme_tx_queue[i]);
+
+        return simple_read_from_buffer(userbuf, count, ppos, buf, p-buf);
+}
+
+static const struct file_operations stats_wme_tx_queue_ops = {
+        .read = stats_wme_tx_queue_read,
+        .open = mac80211_open_file_generic,
+};
+#endif
+
+DEBUGFS_DEVSTATS_FILE(dot11ACKFailureCount);
+DEBUGFS_DEVSTATS_FILE(dot11RTSFailureCount);
+DEBUGFS_DEVSTATS_FILE(dot11FCSErrorCount);
+DEBUGFS_DEVSTATS_FILE(dot11RTSSuccessCount);
+
+
+void debugfs_hw_add(struct ieee80211_local *local)
+{
+        struct dentry *phyd = local->hw.wiphy->debugfsdir;
+        struct dentry *statsd;
+
+        if (!phyd)
+                return;
+
+        local->debugfs.stations = debugfs_create_dir("stations", phyd);
+        local->debugfs.keys = debugfs_create_dir("keys", phyd);
+
+        DEBUGFS_ADD(channel);
+        DEBUGFS_ADD(frequency);
+        DEBUGFS_ADD(radar_detect);
+        DEBUGFS_ADD(antenna_sel_tx);
+        DEBUGFS_ADD(antenna_sel_rx);
+        DEBUGFS_ADD(bridge_packets);
+        DEBUGFS_ADD(key_tx_rx_threshold);
+        DEBUGFS_ADD(rts_threshold);
+        DEBUGFS_ADD(fragmentation_threshold);
+        DEBUGFS_ADD(short_retry_limit);
+        DEBUGFS_ADD(long_retry_limit);
+        DEBUGFS_ADD(total_ps_buffered);
+        DEBUGFS_ADD(mode);
+        DEBUGFS_ADD(wep_iv);
+        DEBUGFS_ADD(tx_power_reduction);
+        DEBUGFS_ADD(modes);
+
+        statsd = debugfs_create_dir("statistics", phyd);
+        local->debugfs.statistics = statsd;
+
+        /* if the dir failed, don't put all the other things into the root! */
+        if (!statsd)
+                return;
+
+        DEBUGFS_STATS_ADD(transmitted_fragment_count);
+        DEBUGFS_STATS_ADD(multicast_transmitted_frame_count);
+        DEBUGFS_STATS_ADD(failed_count);
+        DEBUGFS_STATS_ADD(retry_count);
+        DEBUGFS_STATS_ADD(multiple_retry_count);
+        DEBUGFS_STATS_ADD(frame_duplicate_count);
+        DEBUGFS_STATS_ADD(received_fragment_count);
+        DEBUGFS_STATS_ADD(multicast_received_frame_count);
+        DEBUGFS_STATS_ADD(transmitted_frame_count);
+        DEBUGFS_STATS_ADD(wep_undecryptable_count);
+#ifdef CONFIG_MAC80211_DEBUG_COUNTERS
+        DEBUGFS_STATS_ADD(tx_handlers_drop);
+        DEBUGFS_STATS_ADD(tx_handlers_queued);
+        DEBUGFS_STATS_ADD(tx_handlers_drop_unencrypted);
+        DEBUGFS_STATS_ADD(tx_handlers_drop_fragment);
+        DEBUGFS_STATS_ADD(tx_handlers_drop_wep);
+        DEBUGFS_STATS_ADD(tx_handlers_drop_not_assoc);
+        DEBUGFS_STATS_ADD(tx_handlers_drop_unauth_port);
+        DEBUGFS_STATS_ADD(rx_handlers_drop);
+        DEBUGFS_STATS_ADD(rx_handlers_queued);
+        DEBUGFS_STATS_ADD(rx_handlers_drop_nullfunc);
+        DEBUGFS_STATS_ADD(rx_handlers_drop_defrag);
+        DEBUGFS_STATS_ADD(rx_handlers_drop_short);
+        DEBUGFS_STATS_ADD(rx_handlers_drop_passive_scan);
+        DEBUGFS_STATS_ADD(tx_expand_skb_head);
+        DEBUGFS_STATS_ADD(tx_expand_skb_head_cloned);
+        DEBUGFS_STATS_ADD(rx_expand_skb_head);
+        DEBUGFS_STATS_ADD(rx_expand_skb_head2);
+        DEBUGFS_STATS_ADD(rx_handlers_fragments);
+        DEBUGFS_STATS_ADD(tx_status_drop);
+        DEBUGFS_STATS_ADD(wme_tx_queue);
+        DEBUGFS_STATS_ADD(wme_rx_queue);
+#endif
+        DEBUGFS_STATS_ADD(dot11ACKFailureCount);
+        DEBUGFS_STATS_ADD(dot11RTSFailureCount);
+        DEBUGFS_STATS_ADD(dot11FCSErrorCount);
+        DEBUGFS_STATS_ADD(dot11RTSSuccessCount);
+}
+
+void debugfs_hw_del(struct ieee80211_local *local)
+{
+        DEBUGFS_DEL(channel);
+        DEBUGFS_DEL(frequency);
+        DEBUGFS_DEL(radar_detect);
+        DEBUGFS_DEL(antenna_sel_tx);
+        DEBUGFS_DEL(antenna_sel_rx);
+        DEBUGFS_DEL(bridge_packets);
+        DEBUGFS_DEL(key_tx_rx_threshold);
+        DEBUGFS_DEL(rts_threshold);
+        DEBUGFS_DEL(fragmentation_threshold);
+        DEBUGFS_DEL(short_retry_limit);
+        DEBUGFS_DEL(long_retry_limit);
+        DEBUGFS_DEL(total_ps_buffered);
+        DEBUGFS_DEL(mode);
+        DEBUGFS_DEL(wep_iv);
+        DEBUGFS_DEL(tx_power_reduction);
+        DEBUGFS_DEL(modes);
+
+        DEBUGFS_STATS_DEL(transmitted_fragment_count);
+        DEBUGFS_STATS_DEL(multicast_transmitted_frame_count);
+        DEBUGFS_STATS_DEL(failed_count);
+        DEBUGFS_STATS_DEL(retry_count);
+        DEBUGFS_STATS_DEL(multiple_retry_count);
+        DEBUGFS_STATS_DEL(frame_duplicate_count);
+        DEBUGFS_STATS_DEL(received_fragment_count);
+        DEBUGFS_STATS_DEL(multicast_received_frame_count);
+        DEBUGFS_STATS_DEL(transmitted_frame_count);
+        DEBUGFS_STATS_DEL(wep_undecryptable_count);
+        DEBUGFS_STATS_DEL(num_scans);
+#ifdef CONFIG_MAC80211_DEBUG_COUNTERS
+        DEBUGFS_STATS_DEL(tx_handlers_drop);
+        DEBUGFS_STATS_DEL(tx_handlers_queued);
+        DEBUGFS_STATS_DEL(tx_handlers_drop_unencrypted);
+        DEBUGFS_STATS_DEL(tx_handlers_drop_fragment);
+        DEBUGFS_STATS_DEL(tx_handlers_drop_wep);
+        DEBUGFS_STATS_DEL(tx_handlers_drop_not_assoc);
+        DEBUGFS_STATS_DEL(tx_handlers_drop_unauth_port);
+        DEBUGFS_STATS_DEL(rx_handlers_drop);
+        DEBUGFS_STATS_DEL(rx_handlers_queued);
+        DEBUGFS_STATS_DEL(rx_handlers_drop_nullfunc);
+        DEBUGFS_STATS_DEL(rx_handlers_drop_defrag);
+        DEBUGFS_STATS_DEL(rx_handlers_drop_short);
+        DEBUGFS_STATS_DEL(rx_handlers_drop_passive_scan);
+        DEBUGFS_STATS_DEL(tx_expand_skb_head);
+        DEBUGFS_STATS_DEL(tx_expand_skb_head_cloned);
+        DEBUGFS_STATS_DEL(rx_expand_skb_head);
+        DEBUGFS_STATS_DEL(rx_expand_skb_head2);
+        DEBUGFS_STATS_DEL(rx_handlers_fragments);
+        DEBUGFS_STATS_DEL(tx_status_drop);
+        DEBUGFS_STATS_DEL(wme_tx_queue);
+        DEBUGFS_STATS_DEL(wme_rx_queue);
+#endif
+        DEBUGFS_STATS_DEL(dot11ACKFailureCount);
+        DEBUGFS_STATS_DEL(dot11RTSFailureCount);
+        DEBUGFS_STATS_DEL(dot11FCSErrorCount);
+        DEBUGFS_STATS_DEL(dot11RTSSuccessCount);
+
+        debugfs_remove(local->debugfs.statistics);
+        local->debugfs.statistics = NULL;
+        debugfs_remove(local->debugfs.stations);
+        local->debugfs.stations = NULL;
+        debugfs_remove(local->debugfs.keys);
+        local->debugfs.keys = NULL;
+}
diff --git a/net/mac80211/debugfs.h b/net/mac80211/debugfs.h
new file mode 100644
index 000000000000..dd2541935c27
--- /dev/null
+++ b/net/mac80211/debugfs.h
@@ -0,0 +1,16 @@
+#ifndef __MAC80211_DEBUGFS_H
+#define __MAC80211_DEBUGFS_H
+
+#ifdef CONFIG_MAC80211_DEBUGFS
+extern void debugfs_hw_add(struct ieee80211_local *local);
+extern void debugfs_hw_del(struct ieee80211_local *local);
+extern int mac80211_open_file_generic(struct inode *inode, struct file *file);
+#else
+static inline void debugfs_hw_add(struct ieee80211_local *local)
+{
+        return;
+}
+static inline void debugfs_hw_del(struct ieee80211_local *local) {}
+#endif
+
+#endif /* __MAC80211_DEBUGFS_H */
diff --git a/net/mac80211/debugfs_key.c b/net/mac80211/debugfs_key.c
new file mode 100644
index 000000000000..7d56dc9e7326
--- /dev/null
+++ b/net/mac80211/debugfs_key.c
@@ -0,0 +1,252 @@
+/*
+ * Copyright 2003-2005  Devicescape Software, Inc.
+ * Copyright (c) 2006   Jiri Benc <jbenc@suse.cz>
+ * Copyright 2007       Johannes Berg <johannes@sipsolutions.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/kobject.h>
+#include "ieee80211_i.h"
+#include "ieee80211_key.h"
+#include "debugfs.h"
+#include "debugfs_key.h"
+
+#define KEY_READ(name, buflen, format_string)                           \
+static ssize_t key_##name##_read(struct file *file,                     \
+                                 char __user *userbuf,                  \
+                                 size_t count, loff_t *ppos)            \
+{                                                                       \
+        char buf[buflen];                                               \
+        struct ieee80211_key *key = file->private_data;                 \
+        int res = scnprintf(buf, buflen, format_string, key->name);     \
+        return simple_read_from_buffer(userbuf, count, ppos, buf, res); \
+}
+#define KEY_READ_D(name) KEY_READ(name, 20, "%d\n")
+
+#define KEY_OPS(name)                                                   \
+static const struct file_operations key_ ##name## _ops = {              \
+        .read = key_##name##_read,                                      \
+        .open = mac80211_open_file_generic,                             \
+}
+
+#define KEY_FILE(name, format)                                          \
+                 KEY_READ_##format(name)                                \
+                 KEY_OPS(name)
+
+KEY_FILE(keylen, D);
+KEY_FILE(force_sw_encrypt, D);
+KEY_FILE(keyidx, D);
+KEY_FILE(hw_key_idx, D);
+KEY_FILE(tx_rx_count, D);
+
+static ssize_t key_algorithm_read(struct file *file,
+                                  char __user *userbuf,
+                                  size_t count, loff_t *ppos)
+{
+        char *alg;
+        struct ieee80211_key *key = file->private_data;
+
+        switch (key->alg) {
+        case ALG_WEP:
+                alg = "WEP\n";
+                break;
+        case ALG_TKIP:
+                alg = "TKIP\n";
+                break;
+        case ALG_CCMP:
+                alg = "CCMP\n";
+                break;
+        default:
+                return 0;
+        }
+        return simple_read_from_buffer(userbuf, count, ppos, alg, strlen(alg));
+}
+KEY_OPS(algorithm);
+
+static ssize_t key_tx_spec_read(struct file *file, char __user *userbuf,
+                                size_t count, loff_t *ppos)
+{
+        const u8 *tpn;
+        char buf[20];
+        int len;
+        struct ieee80211_key *key = file->private_data;
+
+        switch (key->alg) {
+        case ALG_WEP:
+                len = scnprintf(buf, sizeof(buf), "\n");
+        case ALG_TKIP:
+                len = scnprintf(buf, sizeof(buf), "%08x %04x\n",
+                                key->u.tkip.iv32,
+                                key->u.tkip.iv16);
+        case ALG_CCMP:
+                tpn = key->u.ccmp.tx_pn;
+                len = scnprintf(buf, sizeof(buf), "%02x%02x%02x%02x%02x%02x\n",
+                                tpn[0], tpn[1], tpn[2], tpn[3], tpn[4], tpn[5]);
+        default:
+                return 0;
+        }
+        return simple_read_from_buffer(userbuf, count, ppos, buf, len);
+}
+KEY_OPS(tx_spec);
+
+static ssize_t key_rx_spec_read(struct file *file, char __user *userbuf,
+                                size_t count, loff_t *ppos)
+{
+        struct ieee80211_key *key = file->private_data;
+        char buf[14*NUM_RX_DATA_QUEUES+1], *p = buf;
+        int i, len;
+        const u8 *rpn;
+
+        switch (key->alg) {
+        case ALG_WEP:
+                len = scnprintf(buf, sizeof(buf), "\n");
+        case ALG_TKIP:
+                for (i = 0; i < NUM_RX_DATA_QUEUES; i++)
+                        p += scnprintf(p, sizeof(buf)+buf-p,
+                                       "%08x %04x\n",
+                                       key->u.tkip.iv32_rx[i],
+                                       key->u.tkip.iv16_rx[i]);
+                len = p - buf;
+        case ALG_CCMP:
+                for (i = 0; i < NUM_RX_DATA_QUEUES; i++) {
+                        rpn = key->u.ccmp.rx_pn[i];
+                        p += scnprintf(p, sizeof(buf)+buf-p,
+                                       "%02x%02x%02x%02x%02x%02x\n",
+                                       rpn[0], rpn[1], rpn[2],
+                                       rpn[3], rpn[4], rpn[5]);
+                }
+                len = p - buf;
+        default:
+                return 0;
+        }
+        return simple_read_from_buffer(userbuf, count, ppos, buf, len);
+}
+KEY_OPS(rx_spec);
+
+static ssize_t key_replays_read(struct file *file, char __user *userbuf,
+                                size_t count, loff_t *ppos)
+{
+        struct ieee80211_key *key = file->private_data;
+        char buf[20];
+        int len;
+
+        if (key->alg != ALG_CCMP)
+                return 0;
+        len = scnprintf(buf, sizeof(buf), "%u\n", key->u.ccmp.replays);
+        return simple_read_from_buffer(userbuf, count, ppos, buf, len);
+}
+KEY_OPS(replays);
+
+static ssize_t key_key_read(struct file *file, char __user *userbuf,
+                            size_t count, loff_t *ppos)
+{
+        struct ieee80211_key *key = file->private_data;
+        int i, res, bufsize = 2*key->keylen+2;
+        char *buf = kmalloc(bufsize, GFP_KERNEL);
+        char *p = buf;
+
+        for (i = 0; i < key->keylen; i++)
+                p += scnprintf(p, bufsize+buf-p, "%02x", key->key[i]);
+        p += scnprintf(p, bufsize+buf-p, "\n");
+        res = simple_read_from_buffer(userbuf, count, ppos, buf, p - buf);
+        kfree(buf);
+        return res;
+}
+KEY_OPS(key);
+
+#define DEBUGFS_ADD(name) \
+        key->debugfs.name = debugfs_create_file(#name, 0400,\
+                                key->debugfs.dir, key, &key_##name##_ops);
+
+void ieee80211_debugfs_key_add(struct ieee80211_local *local,
+                               struct ieee80211_key *key)
+{
+        char buf[20];
+
+        if (!local->debugfs.keys)
+                return;
+
+        sprintf(buf, "%d", key->keyidx);
+        key->debugfs.dir = debugfs_create_dir(buf,
+                                        local->debugfs.keys);
+
+        if (!key->debugfs.dir)
+                return;
+
+        DEBUGFS_ADD(keylen);
+        DEBUGFS_ADD(force_sw_encrypt);
+        DEBUGFS_ADD(keyidx);
+        DEBUGFS_ADD(hw_key_idx);
+        DEBUGFS_ADD(tx_rx_count);
+        DEBUGFS_ADD(algorithm);
+        DEBUGFS_ADD(tx_spec);
+        DEBUGFS_ADD(rx_spec);
+        DEBUGFS_ADD(replays);
+        DEBUGFS_ADD(key);
+};
+
+#define DEBUGFS_DEL(name) \
+        debugfs_remove(key->debugfs.name); key->debugfs.name = NULL;
+
+void ieee80211_debugfs_key_remove(struct ieee80211_key *key)
+{
+        if (!key)
+                return;
+
+        DEBUGFS_DEL(keylen);
+        DEBUGFS_DEL(force_sw_encrypt);
+        DEBUGFS_DEL(keyidx);
+        DEBUGFS_DEL(hw_key_idx);
+        DEBUGFS_DEL(tx_rx_count);
+        DEBUGFS_DEL(algorithm);
+        DEBUGFS_DEL(tx_spec);
+        DEBUGFS_DEL(rx_spec);
+        DEBUGFS_DEL(replays);
+        DEBUGFS_DEL(key);
+
+        debugfs_remove(key->debugfs.stalink);
+        key->debugfs.stalink = NULL;
+        debugfs_remove(key->debugfs.dir);
+        key->debugfs.dir = NULL;
+}
+void ieee80211_debugfs_key_add_default(struct ieee80211_sub_if_data *sdata)
+{
+        char buf[50];
+
+        if (!sdata->debugfsdir)
+                return;
+
+        sprintf(buf, "../keys/%d", sdata->default_key->keyidx);
+        sdata->debugfs.default_key =
+                debugfs_create_symlink("default_key", sdata->debugfsdir, buf);
+}
+void ieee80211_debugfs_key_remove_default(struct ieee80211_sub_if_data *sdata)
+{
+        if (!sdata)
+                return;
+
+        debugfs_remove(sdata->debugfs.default_key);
+        sdata->debugfs.default_key = NULL;
+}
+void ieee80211_debugfs_key_sta_link(struct ieee80211_key *key,
+                                    struct sta_info *sta)
+{
+        char buf[50];
+
+        if (!key->debugfs.dir)
+                return;
+
+        sprintf(buf, "../sta/" MAC_FMT, MAC_ARG(sta->addr));
+        key->debugfs.stalink =
+                debugfs_create_symlink("station", key->debugfs.dir, buf);
+}
+
+void ieee80211_debugfs_key_sta_del(struct ieee80211_key *key,
+                                   struct sta_info *sta)
+{
+        debugfs_remove(key->debugfs.stalink);
+        key->debugfs.stalink = NULL;
+}
diff --git a/net/mac80211/debugfs_key.h b/net/mac80211/debugfs_key.h
new file mode 100644
index 000000000000..aecfce395da6
--- /dev/null
+++ b/net/mac80211/debugfs_key.h
@@ -0,0 +1,34 @@
+#ifndef __MAC80211_DEBUGFS_KEY_H
+#define __MAC80211_DEBUGFS_KEY_H
+
+#ifdef CONFIG_MAC80211_DEBUGFS
+void ieee80211_debugfs_key_add(struct ieee80211_local *local,
+                               struct ieee80211_key *key);
+void ieee80211_debugfs_key_remove(struct ieee80211_key *key);
+void ieee80211_debugfs_key_add_default(struct ieee80211_sub_if_data *sdata);
+void ieee80211_debugfs_key_remove_default(struct ieee80211_sub_if_data *sdata);
+void ieee80211_debugfs_key_sta_link(struct ieee80211_key *key,
+                                    struct sta_info *sta);
+void ieee80211_debugfs_key_sta_del(struct ieee80211_key *key,
+                                   struct sta_info *sta);
+#else
+static inline void ieee80211_debugfs_key_add(struct ieee80211_local *local,
+                                             struct ieee80211_key *key)
+{}
+static inline void ieee80211_debugfs_key_remove(struct ieee80211_key *key)
+{}
+static inline void ieee80211_debugfs_key_add_default(
+        struct ieee80211_sub_if_data *sdata)
+{}
+static inline void ieee80211_debugfs_key_remove_default(
+        struct ieee80211_sub_if_data *sdata)
+{}
+static inline void ieee80211_debugfs_key_sta_link(
+        struct ieee80211_key *key, struct sta_info *sta)
+{}
+static inline void ieee80211_debugfs_key_sta_del(struct ieee80211_key *key,
+                                                 struct sta_info *sta)
+{}
+#endif
+
+#endif /* __MAC80211_DEBUGFS_KEY_H */
diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c
new file mode 100644
index 000000000000..9e3964638bad
--- /dev/null
+++ b/net/mac80211/debugfs_netdev.c
@@ -0,0 +1,440 @@
+/*
+ * Copyright (c) 2006   Jiri Benc <jbenc@suse.cz>
+ * Copyright 2007       Johannes Berg <johannes@sipsolutions.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/device.h>
+#include <linux/if.h>
+#include <linux/interrupt.h>
+#include <linux/netdevice.h>
+#include <linux/rtnetlink.h>
+#include <linux/notifier.h>
+#include <net/mac80211.h>
+#include <net/cfg80211.h>
+#include "ieee80211_i.h"
+#include "ieee80211_rate.h"
+#include "debugfs.h"
+#include "debugfs_netdev.h"
+
+static ssize_t ieee80211_if_read(
+        struct ieee80211_sub_if_data *sdata,
+        char __user *userbuf,
+        size_t count, loff_t *ppos,
+        ssize_t (*format)(const struct ieee80211_sub_if_data *, char *, int))
+{
+        char buf[70];
+        ssize_t ret = -EINVAL;
+
+        read_lock(&dev_base_lock);
+        if (sdata->dev->reg_state == NETREG_REGISTERED) {
+                ret = (*format)(sdata, buf, sizeof(buf));
+                ret = simple_read_from_buffer(userbuf, count, ppos, buf, ret);
+        }
+        read_unlock(&dev_base_lock);
+        return ret;
+}
+
+#define IEEE80211_IF_FMT(name, field, format_string)                    \
+static ssize_t ieee80211_if_fmt_##name(                                 \
+        const struct ieee80211_sub_if_data *sdata, char *buf,           \
+        int buflen)                                                     \
+{                                                                       \
+        return scnprintf(buf, buflen, format_string, sdata->field);     \
+}
+#define IEEE80211_IF_FMT_DEC(name, field)                               \
+                IEEE80211_IF_FMT(name, field, "%d\n")
+#define IEEE80211_IF_FMT_HEX(name, field)                               \
+                IEEE80211_IF_FMT(name, field, "%#x\n")
+#define IEEE80211_IF_FMT_SIZE(name, field)                              \
+                IEEE80211_IF_FMT(name, field, "%zd\n")
+
+#define IEEE80211_IF_FMT_ATOMIC(name, field)                            \
+static ssize_t ieee80211_if_fmt_##name(                                 \
+        const struct ieee80211_sub_if_data *sdata,                      \
+        char *buf, int buflen)                                          \
+{                                                                       \
+        return scnprintf(buf, buflen, "%d\n", atomic_read(&sdata->field));\
+}
+
+#define IEEE80211_IF_FMT_MAC(name, field)                               \
+static ssize_t ieee80211_if_fmt_##name(                                 \
+        const struct ieee80211_sub_if_data *sdata, char *buf,           \
+        int buflen)                                                     \
+{                                                                       \
+        return scnprintf(buf, buflen, MAC_FMT "\n", MAC_ARG(sdata->field));\
+}
+
+#define __IEEE80211_IF_FILE(name)                                       \
+static ssize_t ieee80211_if_read_##name(struct file *file,              \
+                                        char __user *userbuf,           \
+                                        size_t count, loff_t *ppos)     \
+{                                                                       \
+        return ieee80211_if_read(file->private_data,                    \
+                                 userbuf, count, ppos,                  \
+                                 ieee80211_if_fmt_##name);              \
+}                                                                       \
+static const struct file_operations name##_ops = {                      \
+        .read = ieee80211_if_read_##name,                               \
+        .open = mac80211_open_file_generic,                             \
+}
+
+#define IEEE80211_IF_FILE(name, field, format)                          \
+                IEEE80211_IF_FMT_##format(name, field)                  \
+                __IEEE80211_IF_FILE(name)
+
+/* common attributes */
+IEEE80211_IF_FILE(channel_use, channel_use, DEC);
+IEEE80211_IF_FILE(drop_unencrypted, drop_unencrypted, DEC);
+IEEE80211_IF_FILE(eapol, eapol, DEC);
+IEEE80211_IF_FILE(ieee8021_x, ieee802_1x, DEC);
+
+/* STA/IBSS attributes */
+IEEE80211_IF_FILE(state, u.sta.state, DEC);
+IEEE80211_IF_FILE(bssid, u.sta.bssid, MAC);
+IEEE80211_IF_FILE(prev_bssid, u.sta.prev_bssid, MAC);
+IEEE80211_IF_FILE(ssid_len, u.sta.ssid_len, SIZE);
+IEEE80211_IF_FILE(aid, u.sta.aid, DEC);
+IEEE80211_IF_FILE(ap_capab, u.sta.ap_capab, HEX);
+IEEE80211_IF_FILE(capab, u.sta.capab, HEX);
+IEEE80211_IF_FILE(extra_ie_len, u.sta.extra_ie_len, SIZE);
+IEEE80211_IF_FILE(auth_tries, u.sta.auth_tries, DEC);
+IEEE80211_IF_FILE(assoc_tries, u.sta.assoc_tries, DEC);
+IEEE80211_IF_FILE(auth_algs, u.sta.auth_algs, HEX);
+IEEE80211_IF_FILE(auth_alg, u.sta.auth_alg, DEC);
+IEEE80211_IF_FILE(auth_transaction, u.sta.auth_transaction, DEC);
+
+static ssize_t ieee80211_if_fmt_flags(
+        const struct ieee80211_sub_if_data *sdata, char *buf, int buflen)
+{
+        return scnprintf(buf, buflen, "%s%s%s%s%s%s%s\n",
+                         sdata->u.sta.ssid_set ? "SSID\n" : "",
+                         sdata->u.sta.bssid_set ? "BSSID\n" : "",
+                         sdata->u.sta.prev_bssid_set ? "prev BSSID\n" : "",
+                         sdata->u.sta.authenticated ? "AUTH\n" : "",
+                         sdata->u.sta.associated ? "ASSOC\n" : "",
+                         sdata->u.sta.probereq_poll ? "PROBEREQ POLL\n" : "",
+                         sdata->u.sta.use_protection ? "CTS prot\n" : "");
+}
+__IEEE80211_IF_FILE(flags);
+
+/* AP attributes */
+IEEE80211_IF_FILE(num_sta_ps, u.ap.num_sta_ps, ATOMIC);
+IEEE80211_IF_FILE(dtim_period, u.ap.dtim_period, DEC);
+IEEE80211_IF_FILE(dtim_count, u.ap.dtim_count, DEC);
+IEEE80211_IF_FILE(num_beacons, u.ap.num_beacons, DEC);
+IEEE80211_IF_FILE(force_unicast_rateidx, u.ap.force_unicast_rateidx, DEC);
+IEEE80211_IF_FILE(max_ratectrl_rateidx, u.ap.max_ratectrl_rateidx, DEC);
+
+static ssize_t ieee80211_if_fmt_num_buffered_multicast(
+        const struct ieee80211_sub_if_data *sdata, char *buf, int buflen)
+{
+        return scnprintf(buf, buflen, "%u\n",
+                         skb_queue_len(&sdata->u.ap.ps_bc_buf));
+}
+__IEEE80211_IF_FILE(num_buffered_multicast);
+
+static ssize_t ieee80211_if_fmt_beacon_head_len(
+        const struct ieee80211_sub_if_data *sdata, char *buf, int buflen)
+{
+        if (sdata->u.ap.beacon_head)
+                return scnprintf(buf, buflen, "%d\n",
+                                 sdata->u.ap.beacon_head_len);
+        return scnprintf(buf, buflen, "\n");
+}
+__IEEE80211_IF_FILE(beacon_head_len);
+
+static ssize_t ieee80211_if_fmt_beacon_tail_len(
+        const struct ieee80211_sub_if_data *sdata, char *buf, int buflen)
+{
+        if (sdata->u.ap.beacon_tail)
+                return scnprintf(buf, buflen, "%d\n",
+                                 sdata->u.ap.beacon_tail_len);
+        return scnprintf(buf, buflen, "\n");
+}
+__IEEE80211_IF_FILE(beacon_tail_len);
+
+/* WDS attributes */
+IEEE80211_IF_FILE(peer, u.wds.remote_addr, MAC);
+
+/* VLAN attributes */
+IEEE80211_IF_FILE(vlan_id, u.vlan.id, DEC);
+
+/* MONITOR attributes */
+static ssize_t ieee80211_if_fmt_mode(
+        const struct ieee80211_sub_if_data *sdata, char *buf, int buflen)
+{
+        struct ieee80211_local *local = sdata->local;
+
+        return scnprintf(buf, buflen, "%s\n",
+                         ((local->hw.flags & IEEE80211_HW_MONITOR_DURING_OPER) ||
+                          local->open_count == local->monitors) ?
+                         "hard" : "soft");
+}
+__IEEE80211_IF_FILE(mode);
+
+
+#define DEBUGFS_ADD(name, type)\
+        sdata->debugfs.type.name = debugfs_create_file(#name, 0444,\
+                sdata->debugfsdir, sdata, &name##_ops);
+
+static void add_sta_files(struct ieee80211_sub_if_data *sdata)
+{
+        DEBUGFS_ADD(channel_use, sta);
+        DEBUGFS_ADD(drop_unencrypted, sta);
+        DEBUGFS_ADD(eapol, sta);
+        DEBUGFS_ADD(ieee8021_x, sta);
+        DEBUGFS_ADD(state, sta);
+        DEBUGFS_ADD(bssid, sta);
+        DEBUGFS_ADD(prev_bssid, sta);
+        DEBUGFS_ADD(ssid_len, sta);
+        DEBUGFS_ADD(aid, sta);
+        DEBUGFS_ADD(ap_capab, sta);
+        DEBUGFS_ADD(capab, sta);
+        DEBUGFS_ADD(extra_ie_len, sta);
+        DEBUGFS_ADD(auth_tries, sta);
+        DEBUGFS_ADD(assoc_tries, sta);
+        DEBUGFS_ADD(auth_algs, sta);
+        DEBUGFS_ADD(auth_alg, sta);
+        DEBUGFS_ADD(auth_transaction, sta);
+        DEBUGFS_ADD(flags, sta);
+}
+
+static void add_ap_files(struct ieee80211_sub_if_data *sdata)
+{
+        DEBUGFS_ADD(channel_use, ap);
+        DEBUGFS_ADD(drop_unencrypted, ap);
+        DEBUGFS_ADD(eapol, ap);
+        DEBUGFS_ADD(ieee8021_x, ap);
+        DEBUGFS_ADD(num_sta_ps, ap);
+        DEBUGFS_ADD(dtim_period, ap);
+        DEBUGFS_ADD(dtim_count, ap);
+        DEBUGFS_ADD(num_beacons, ap);
+        DEBUGFS_ADD(force_unicast_rateidx, ap);
+        DEBUGFS_ADD(max_ratectrl_rateidx, ap);
+        DEBUGFS_ADD(num_buffered_multicast, ap);
+        DEBUGFS_ADD(beacon_head_len, ap);
+        DEBUGFS_ADD(beacon_tail_len, ap);
+}
+
+static void add_wds_files(struct ieee80211_sub_if_data *sdata)
+{
+        DEBUGFS_ADD(channel_use, wds);
+        DEBUGFS_ADD(drop_unencrypted, wds);
+        DEBUGFS_ADD(eapol, wds);
+        DEBUGFS_ADD(ieee8021_x, wds);
+        DEBUGFS_ADD(peer, wds);
+}
+
+static void add_vlan_files(struct ieee80211_sub_if_data *sdata)
+{
+        DEBUGFS_ADD(channel_use, vlan);
+        DEBUGFS_ADD(drop_unencrypted, vlan);
+        DEBUGFS_ADD(eapol, vlan);
+        DEBUGFS_ADD(ieee8021_x, vlan);
+        DEBUGFS_ADD(vlan_id, vlan);
+}
+
+static void add_monitor_files(struct ieee80211_sub_if_data *sdata)
+{
+        DEBUGFS_ADD(mode, monitor);
+}
+
+static void add_files(struct ieee80211_sub_if_data *sdata)
+{
+        if (!sdata->debugfsdir)
+                return;
+
+        switch (sdata->type) {
+        case IEEE80211_IF_TYPE_STA:
+        case IEEE80211_IF_TYPE_IBSS:
+                add_sta_files(sdata);
+                break;
+        case IEEE80211_IF_TYPE_AP:
+                add_ap_files(sdata);
+                break;
+        case IEEE80211_IF_TYPE_WDS:
+                add_wds_files(sdata);
+                break;
+        case IEEE80211_IF_TYPE_MNTR:
+                add_monitor_files(sdata);
+                break;
+        case IEEE80211_IF_TYPE_VLAN:
+                add_vlan_files(sdata);
+                break;
+        default:
+                break;
+        }
+}
+
+#define DEBUGFS_DEL(name, type)\
+        debugfs_remove(sdata->debugfs.type.name);\
+        sdata->debugfs.type.name = NULL;
+
+static void del_sta_files(struct ieee80211_sub_if_data *sdata)
+{
+        DEBUGFS_DEL(channel_use, sta);
+        DEBUGFS_DEL(drop_unencrypted, sta);
+        DEBUGFS_DEL(eapol, sta);
+        DEBUGFS_DEL(ieee8021_x, sta);
+        DEBUGFS_DEL(state, sta);
+        DEBUGFS_DEL(bssid, sta);
+        DEBUGFS_DEL(prev_bssid, sta);
+        DEBUGFS_DEL(ssid_len, sta);
+        DEBUGFS_DEL(aid, sta);
+        DEBUGFS_DEL(ap_capab, sta);
+        DEBUGFS_DEL(capab, sta);
+        DEBUGFS_DEL(extra_ie_len, sta);
+        DEBUGFS_DEL(auth_tries, sta);
+        DEBUGFS_DEL(assoc_tries, sta);
+        DEBUGFS_DEL(auth_algs, sta);
+        DEBUGFS_DEL(auth_alg, sta);
+        DEBUGFS_DEL(auth_transaction, sta);
+        DEBUGFS_DEL(flags, sta);
+}
+
+static void del_ap_files(struct ieee80211_sub_if_data *sdata)
+{
+        DEBUGFS_DEL(channel_use, ap);
+        DEBUGFS_DEL(drop_unencrypted, ap);
+        DEBUGFS_DEL(eapol, ap);
+        DEBUGFS_DEL(ieee8021_x, ap);
+        DEBUGFS_DEL(num_sta_ps, ap);
+        DEBUGFS_DEL(dtim_period, ap);
+        DEBUGFS_DEL(dtim_count, ap);
+        DEBUGFS_DEL(num_beacons, ap);
+        DEBUGFS_DEL(force_unicast_rateidx, ap);
+        DEBUGFS_DEL(max_ratectrl_rateidx, ap);
+        DEBUGFS_DEL(num_buffered_multicast, ap);
+        DEBUGFS_DEL(beacon_head_len, ap);
+        DEBUGFS_DEL(beacon_tail_len, ap);
+}
+
+static void del_wds_files(struct ieee80211_sub_if_data *sdata)
+{
+        DEBUGFS_DEL(channel_use, wds);
+        DEBUGFS_DEL(drop_unencrypted, wds);
+        DEBUGFS_DEL(eapol, wds);
+        DEBUGFS_DEL(ieee8021_x, wds);
+        DEBUGFS_DEL(peer, wds);
+}
+
+static void del_vlan_files(struct ieee80211_sub_if_data *sdata)
+{
+        DEBUGFS_DEL(channel_use, vlan);
+        DEBUGFS_DEL(drop_unencrypted, vlan);
+        DEBUGFS_DEL(eapol, vlan);
+        DEBUGFS_DEL(ieee8021_x, vlan);
+        DEBUGFS_DEL(vlan_id, vlan);
+}
+
+static void del_monitor_files(struct ieee80211_sub_if_data *sdata)
+{
+        DEBUGFS_DEL(mode, monitor);
+}
+
+static void del_files(struct ieee80211_sub_if_data *sdata, int type)
+{
+        if (!sdata->debugfsdir)
+                return;
+
+        switch (type) {
+        case IEEE80211_IF_TYPE_STA:
+        case IEEE80211_IF_TYPE_IBSS:
+                del_sta_files(sdata);
+                break;
+        case IEEE80211_IF_TYPE_AP:
+                del_ap_files(sdata);
+                break;
+        case IEEE80211_IF_TYPE_WDS:
+                del_wds_files(sdata);
+                break;
+        case IEEE80211_IF_TYPE_MNTR:
+                del_monitor_files(sdata);
+                break;
+        case IEEE80211_IF_TYPE_VLAN:
+                del_vlan_files(sdata);
+                break;
+        default:
+                break;
+        }
+}
+
+static int notif_registered;
+
+void ieee80211_debugfs_add_netdev(struct ieee80211_sub_if_data *sdata)
+{
+        char buf[10+IFNAMSIZ];
+
+        if (!notif_registered)
+                return;
+
+        sprintf(buf, "netdev:%s", sdata->dev->name);
+        sdata->debugfsdir = debugfs_create_dir(buf,
+                sdata->local->hw.wiphy->debugfsdir);
+}
+
+void ieee80211_debugfs_remove_netdev(struct ieee80211_sub_if_data *sdata)
+{
+        del_files(sdata, sdata->type);
+        debugfs_remove(sdata->debugfsdir);
+        sdata->debugfsdir = NULL;
+}
+
+void ieee80211_debugfs_change_if_type(struct ieee80211_sub_if_data *sdata,
+                                      int oldtype)
+{
+        del_files(sdata, oldtype);
+        add_files(sdata);
+}
+
+static int netdev_notify(struct notifier_block * nb,
+                         unsigned long state,
+                         void *ndev)
+{
+        struct net_device *dev = ndev;
+        char buf[10+IFNAMSIZ];
+
+        if (state != NETDEV_CHANGENAME)
+                return 0;
+
+        if (!dev->ieee80211_ptr || !dev->ieee80211_ptr->wiphy)
+                return 0;
+
+        if (dev->ieee80211_ptr->wiphy->privid != mac80211_wiphy_privid)
+                return 0;
+
+        /* TODO
+        sprintf(buf, "netdev:%s", dev->name);
+        debugfs_rename(IEEE80211_DEV_TO_SUB_IF(dev)->debugfsdir, buf);
+        */
+
+        return 0;
+}
+
+static struct notifier_block mac80211_debugfs_netdev_notifier = {
+        .notifier_call = netdev_notify,
+};
+
+void ieee80211_debugfs_netdev_init(void)
+{
+        int err;
+
+        err = register_netdevice_notifier(&mac80211_debugfs_netdev_notifier);
+        if (err) {
+                printk(KERN_ERR
+                       "mac80211: failed to install netdev notifier,"
+                       " disabling per-netdev debugfs!\n");
+        } else
+                notif_registered = 1;
+}
+
+void ieee80211_debugfs_netdev_exit(void)
+{
+        unregister_netdevice_notifier(&mac80211_debugfs_netdev_notifier);
+        notif_registered = 0;
+}
diff --git a/net/mac80211/debugfs_netdev.h b/net/mac80211/debugfs_netdev.h
new file mode 100644
index 000000000000..a690071fde8a
--- /dev/null
+++ b/net/mac80211/debugfs_netdev.h
@@ -0,0 +1,30 @@
+/* routines exported for debugfs handling */
+
+#ifndef __IEEE80211_DEBUGFS_NETDEV_H
+#define __IEEE80211_DEBUGFS_NETDEV_H
+
+#ifdef CONFIG_MAC80211_DEBUGFS
+void ieee80211_debugfs_add_netdev(struct ieee80211_sub_if_data *sdata);
+void ieee80211_debugfs_remove_netdev(struct ieee80211_sub_if_data *sdata);
+void ieee80211_debugfs_change_if_type(struct ieee80211_sub_if_data *sdata,
+                                     int oldtype);
+void ieee80211_debugfs_netdev_init(void);
+void ieee80211_debugfs_netdev_exit(void);
+#else
+static inline void ieee80211_debugfs_add_netdev(
+        struct ieee80211_sub_if_data *sdata)
+{}
+static inline void ieee80211_debugfs_remove_netdev(
+        struct ieee80211_sub_if_data *sdata)
+{}
+static inline void ieee80211_debugfs_change_if_type(
+        struct ieee80211_sub_if_data *sdata, int oldtype)
+{}
+static inline void ieee80211_debugfs_netdev_init(void)
+{}
+
+static inline void ieee80211_debugfs_netdev_exit(void)
+{}
+#endif
+
+#endif /* __IEEE80211_DEBUGFS_NETDEV_H */
diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c
new file mode 100644
index 000000000000..d41e696f3980
--- /dev/null
+++ b/net/mac80211/debugfs_sta.c
@@ -0,0 +1,246 @@
+/*
+ * Copyright 2003-2005  Devicescape Software, Inc.
+ * Copyright (c) 2006   Jiri Benc <jbenc@suse.cz>
+ * Copyright 2007       Johannes Berg <johannes@sipsolutions.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/debugfs.h>
+#include <linux/ieee80211.h>
+#include "ieee80211_i.h"
+#include "debugfs.h"
+#include "debugfs_sta.h"
+#include "sta_info.h"
+
+/* sta attributtes */
+
+#define STA_READ(name, buflen, field, format_string)                    \
+static ssize_t sta_ ##name## _read(struct file *file,                   \
+                                   char __user *userbuf,                \
+                                   size_t count, loff_t *ppos)          \
+{                                                                       \
+        int res;                                                        \
+        struct sta_info *sta = file->private_data;                      \
+        char buf[buflen];                                               \
+        res = scnprintf(buf, buflen, format_string, sta->field);        \
+        return simple_read_from_buffer(userbuf, count, ppos, buf, res); \
+}
+#define STA_READ_D(name, field) STA_READ(name, 20, field, "%d\n")
+#define STA_READ_U(name, field) STA_READ(name, 20, field, "%u\n")
+#define STA_READ_LU(name, field) STA_READ(name, 20, field, "%lu\n")
+#define STA_READ_S(name, field) STA_READ(name, 20, field, "%s\n")
+
+#define STA_READ_RATE(name, field)                                      \
+static ssize_t sta_##name##_read(struct file *file,                     \
+                                 char __user *userbuf,                  \
+                                 size_t count, loff_t *ppos)            \
+{                                                                       \
+        struct sta_info *sta = file->private_data;                      \
+        struct ieee80211_local *local = wdev_priv(sta->dev->ieee80211_ptr);\
+        struct ieee80211_hw_mode *mode = local->oper_hw_mode;           \
+        char buf[20];                                                   \
+        int res = scnprintf(buf, sizeof(buf), "%d\n",                   \
+                            (sta->field >= 0 &&                         \
+                            sta->field < mode->num_rates) ?             \
+                            mode->rates[sta->field].rate : -1);         \
+        return simple_read_from_buffer(userbuf, count, ppos, buf, res); \
+}
+
+#define STA_OPS(name)                                                   \
+static const struct file_operations sta_ ##name## _ops = {              \
+        .read = sta_##name##_read,                                      \
+        .open = mac80211_open_file_generic,                             \
+}
+
+#define STA_FILE(name, field, format)                                   \
+                STA_READ_##format(name, field)                          \
+                STA_OPS(name)
+
+STA_FILE(aid, aid, D);
+STA_FILE(key_idx_compression, key_idx_compression, D);
+STA_FILE(dev, dev->name, S);
+STA_FILE(vlan_id, vlan_id, D);
+STA_FILE(rx_packets, rx_packets, LU);
+STA_FILE(tx_packets, tx_packets, LU);
+STA_FILE(rx_bytes, rx_bytes, LU);
+STA_FILE(tx_bytes, tx_bytes, LU);
+STA_FILE(rx_duplicates, num_duplicates, LU);
+STA_FILE(rx_fragments, rx_fragments, LU);
+STA_FILE(rx_dropped, rx_dropped, LU);
+STA_FILE(tx_fragments, tx_fragments, LU);
+STA_FILE(tx_filtered, tx_filtered_count, LU);
+STA_FILE(txrate, txrate, RATE);
+STA_FILE(last_txrate, last_txrate, RATE);
+STA_FILE(tx_retry_failed, tx_retry_failed, LU);
+STA_FILE(tx_retry_count, tx_retry_count, LU);
+STA_FILE(last_rssi, last_rssi, D);
+STA_FILE(last_signal, last_signal, D);
+STA_FILE(last_noise, last_noise, D);
+STA_FILE(channel_use, channel_use, D);
+STA_FILE(wep_weak_iv_count, wep_weak_iv_count, D);
+
+static ssize_t sta_flags_read(struct file *file, char __user *userbuf,
+                              size_t count, loff_t *ppos)
+{
+        char buf[100];
+        struct sta_info *sta = file->private_data;
+        int res = scnprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s%s%s",
+                sta->flags & WLAN_STA_AUTH ? "AUTH\n" : "",
+                sta->flags & WLAN_STA_ASSOC ? "ASSOC\n" : "",
+                sta->flags & WLAN_STA_PS ? "PS\n" : "",
+                sta->flags & WLAN_STA_TIM ? "TIM\n" : "",
+                sta->flags & WLAN_STA_PERM ? "PERM\n" : "",
+                sta->flags & WLAN_STA_AUTHORIZED ? "AUTHORIZED\n" : "",
+                sta->flags & WLAN_STA_SHORT_PREAMBLE ? "SHORT PREAMBLE\n" : "",
+                sta->flags & WLAN_STA_WME ? "WME\n" : "",
+                sta->flags & WLAN_STA_WDS ? "WDS\n" : "");
+        return simple_read_from_buffer(userbuf, count, ppos, buf, res);
+}
+STA_OPS(flags);
+
+static ssize_t sta_num_ps_buf_frames_read(struct file *file,
+                                          char __user *userbuf,
+                                          size_t count, loff_t *ppos)
+{
+        char buf[20];
+        struct sta_info *sta = file->private_data;
+        int res = scnprintf(buf, sizeof(buf), "%u\n",
+                            skb_queue_len(&sta->ps_tx_buf));
+        return simple_read_from_buffer(userbuf, count, ppos, buf, res);
+}
+STA_OPS(num_ps_buf_frames);
+
+static ssize_t sta_last_ack_rssi_read(struct file *file, char __user *userbuf,
+                                      size_t count, loff_t *ppos)
+{
+        char buf[100];
+        struct sta_info *sta = file->private_data;
+        int res = scnprintf(buf, sizeof(buf), "%d %d %d\n",
+                            sta->last_ack_rssi[0],
+                            sta->last_ack_rssi[1],
+                            sta->last_ack_rssi[2]);
+        return simple_read_from_buffer(userbuf, count, ppos, buf, res);
+}
+STA_OPS(last_ack_rssi);
+
+static ssize_t sta_last_ack_ms_read(struct file *file, char __user *userbuf,
+                                    size_t count, loff_t *ppos)
+{
+        char buf[20];
+        struct sta_info *sta = file->private_data;
+        int res = scnprintf(buf, sizeof(buf), "%d\n",
+                            sta->last_ack ?
+                            jiffies_to_msecs(jiffies - sta->last_ack) : -1);
+        return simple_read_from_buffer(userbuf, count, ppos, buf, res);
+}
+STA_OPS(last_ack_ms);
+
+static ssize_t sta_inactive_ms_read(struct file *file, char __user *userbuf,
+                                    size_t count, loff_t *ppos)
+{
+        char buf[20];
+        struct sta_info *sta = file->private_data;
+        int res = scnprintf(buf, sizeof(buf), "%d\n",
+                            jiffies_to_msecs(jiffies - sta->last_rx));
+        return simple_read_from_buffer(userbuf, count, ppos, buf, res);
+}
+STA_OPS(inactive_ms);
+
+static ssize_t sta_last_seq_ctrl_read(struct file *file, char __user *userbuf,
+                                      size_t count, loff_t *ppos)
+{
+        char buf[15*NUM_RX_DATA_QUEUES], *p = buf;
+        int i;
+        struct sta_info *sta = file->private_data;
+        for (i = 0; i < NUM_RX_DATA_QUEUES; i++)
+                p += scnprintf(p, sizeof(buf)+buf-p, "%x ",
+                               sta->last_seq_ctrl[i]);
+        p += scnprintf(p, sizeof(buf)+buf-p, "\n");
+        return simple_read_from_buffer(userbuf, count, ppos, buf, p - buf);
+}
+STA_OPS(last_seq_ctrl);
+
+#ifdef CONFIG_MAC80211_DEBUG_COUNTERS
+static ssize_t sta_wme_rx_queue_read(struct file *file, char __user *userbuf,
+                                     size_t count, loff_t *ppos)
+{
+        char buf[15*NUM_RX_DATA_QUEUES], *p = buf;
+        int i;
+        struct sta_info *sta = file->private_data;
+        for (i = 0; i < NUM_RX_DATA_QUEUES; i++)
+                p += scnprintf(p, sizeof(buf)+buf-p, "%u ",
+                               sta->wme_rx_queue[i]);
+        p += scnprintf(p, sizeof(buf)+buf-p, "\n");
+        return simple_read_from_buffer(userbuf, count, ppos, buf, p - buf);
+}
+STA_OPS(wme_rx_queue);
+
+static ssize_t sta_wme_tx_queue_read(struct file *file, char __user *userbuf,
+                                     size_t count, loff_t *ppos)
+{
+        char buf[15*NUM_TX_DATA_QUEUES], *p = buf;
+        int i;
+        struct sta_info *sta = file->private_data;
+        for (i = 0; i < NUM_TX_DATA_QUEUES; i++)
+                p += scnprintf(p, sizeof(buf)+buf-p, "%u ",
+                               sta->wme_tx_queue[i]);
+        p += scnprintf(p, sizeof(buf)+buf-p, "\n");
+        return simple_read_from_buffer(userbuf, count, ppos, buf, p - buf);
+}
+STA_OPS(wme_tx_queue);
+#endif
+
+#define DEBUGFS_ADD(name) \
+        sta->debugfs.name = debugfs_create_file(#name, 0444, \
+                sta->debugfs.dir, sta, &sta_ ##name## _ops);
+
+#define DEBUGFS_DEL(name) \
+        debugfs_remove(sta->debugfs.name);\
+        sta->debugfs.name = NULL;
+
+
+void ieee80211_sta_debugfs_add(struct sta_info *sta)
+{
+        char buf[3*6];
+        struct dentry *stations_dir = sta->local->debugfs.stations;
+
+        if (!stations_dir)
+                return;
+
+        sprintf(buf, MAC_FMT, MAC_ARG(sta->addr));
+
+        sta->debugfs.dir = debugfs_create_dir(buf, stations_dir);
+        if (!sta->debugfs.dir)
+                return;
+
+        DEBUGFS_ADD(flags);
+        DEBUGFS_ADD(num_ps_buf_frames);
+        DEBUGFS_ADD(last_ack_rssi);
+        DEBUGFS_ADD(last_ack_ms);
+        DEBUGFS_ADD(inactive_ms);
+        DEBUGFS_ADD(last_seq_ctrl);
+#ifdef CONFIG_MAC80211_DEBUG_COUNTERS
+        DEBUGFS_ADD(wme_rx_queue);
+        DEBUGFS_ADD(wme_tx_queue);
+#endif
+}
+
+void ieee80211_sta_debugfs_remove(struct sta_info *sta)
+{
+        DEBUGFS_DEL(flags);
+        DEBUGFS_DEL(num_ps_buf_frames);
+        DEBUGFS_DEL(last_ack_rssi);
+        DEBUGFS_DEL(last_ack_ms);
+        DEBUGFS_DEL(inactive_ms);
+        DEBUGFS_DEL(last_seq_ctrl);
+#ifdef CONFIG_MAC80211_DEBUG_COUNTERS
+        DEBUGFS_DEL(wme_rx_queue);
+        DEBUGFS_DEL(wme_tx_queue);
+#endif
+
+        debugfs_remove(sta->debugfs.dir);
+        sta->debugfs.dir = NULL;
+}
diff --git a/net/mac80211/debugfs_sta.h b/net/mac80211/debugfs_sta.h
new file mode 100644
index 000000000000..574a1cd54b96
--- /dev/null
+++ b/net/mac80211/debugfs_sta.h
@@ -0,0 +1,12 @@
+#ifndef __MAC80211_DEBUGFS_STA_H
+#define __MAC80211_DEBUGFS_STA_H
+
+#ifdef CONFIG_MAC80211_DEBUGFS
+void ieee80211_sta_debugfs_add(struct sta_info *sta);
+void ieee80211_sta_debugfs_remove(struct sta_info *sta);
+#else
+static inline void ieee80211_sta_debugfs_add(struct sta_info *sta) {}
+static inline void ieee80211_sta_debugfs_remove(struct sta_info *sta) {}
+#endif
+
+#endif /* __MAC80211_DEBUGFS_STA_H */
diff --git a/net/mac80211/hostapd_ioctl.h b/net/mac80211/hostapd_ioctl.h
new file mode 100644
index 000000000000..34fa128e9872
--- /dev/null
+++ b/net/mac80211/hostapd_ioctl.h
@@ -0,0 +1,108 @@
+/*
+ * Host AP (software wireless LAN access point) user space daemon for
+ * Host AP kernel driver
+ * Copyright 2002-2003, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright 2002-2004, Instant802 Networks, Inc.
+ * Copyright 2005, Devicescape Software, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef HOSTAPD_IOCTL_H
+#define HOSTAPD_IOCTL_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+#endif /* __KERNEL__ */
+
+#define PRISM2_IOCTL_PRISM2_PARAM (SIOCIWFIRSTPRIV + 0)
+#define PRISM2_IOCTL_GET_PRISM2_PARAM (SIOCIWFIRSTPRIV + 1)
+#define PRISM2_IOCTL_HOSTAPD (SIOCIWFIRSTPRIV + 3)
+
+/* PRISM2_IOCTL_PRISM2_PARAM ioctl() subtypes:
+ * This table is no longer added to, the whole sub-ioctl
+ * mess shall be deleted completely. */
+enum {
+        PRISM2_PARAM_IEEE_802_1X = 23,
+        PRISM2_PARAM_ANTSEL_TX = 24,
+        PRISM2_PARAM_ANTSEL_RX = 25,
+
+        /* Instant802 additions */
+        PRISM2_PARAM_CTS_PROTECT_ERP_FRAMES = 1001,
+        PRISM2_PARAM_DROP_UNENCRYPTED = 1002,
+        PRISM2_PARAM_PREAMBLE = 1003,
+        PRISM2_PARAM_SHORT_SLOT_TIME = 1006,
+        PRISM2_PARAM_NEXT_MODE = 1008,
+        PRISM2_PARAM_CLEAR_KEYS = 1009,
+        PRISM2_PARAM_RADIO_ENABLED = 1010,
+        PRISM2_PARAM_ANTENNA_MODE = 1013,
+        PRISM2_PARAM_STAT_TIME = 1016,
+        PRISM2_PARAM_STA_ANTENNA_SEL = 1017,
+        PRISM2_PARAM_FORCE_UNICAST_RATE = 1018,
+        PRISM2_PARAM_RATE_CTRL_NUM_UP = 1019,
+        PRISM2_PARAM_RATE_CTRL_NUM_DOWN = 1020,
+        PRISM2_PARAM_MAX_RATECTRL_RATE = 1021,
+        PRISM2_PARAM_TX_POWER_REDUCTION = 1022,
+        PRISM2_PARAM_KEY_TX_RX_THRESHOLD = 1024,
+        PRISM2_PARAM_DEFAULT_WEP_ONLY = 1026,
+        PRISM2_PARAM_WIFI_WME_NOACK_TEST = 1033,
+        PRISM2_PARAM_SCAN_FLAGS = 1035,
+        PRISM2_PARAM_HW_MODES = 1036,
+        PRISM2_PARAM_CREATE_IBSS = 1037,
+        PRISM2_PARAM_WMM_ENABLED = 1038,
+        PRISM2_PARAM_MIXED_CELL = 1039,
+        PRISM2_PARAM_RADAR_DETECT = 1043,
+        PRISM2_PARAM_SPECTRUM_MGMT = 1044,
+};
+
+enum {
+        IEEE80211_KEY_MGMT_NONE = 0,
+        IEEE80211_KEY_MGMT_IEEE8021X = 1,
+        IEEE80211_KEY_MGMT_WPA_PSK = 2,
+        IEEE80211_KEY_MGMT_WPA_EAP = 3,
+};
+
+
+/* Data structures used for get_hw_features ioctl */
+struct hostapd_ioctl_hw_modes_hdr {
+        int mode;
+        int num_channels;
+        int num_rates;
+};
+
+struct ieee80211_channel_data {
+        short chan; /* channel number (IEEE 802.11) */
+        short freq; /* frequency in MHz */
+        int flag; /* flag for hostapd use (IEEE80211_CHAN_*) */
+};
+
+struct ieee80211_rate_data {
+        int rate; /* rate in 100 kbps */
+        int flags; /* IEEE80211_RATE_ flags */
+};
+
+
+/* ADD_IF, REMOVE_IF, and UPDATE_IF 'type' argument */
+enum {
+        HOSTAP_IF_WDS = 1, HOSTAP_IF_VLAN = 2, HOSTAP_IF_BSS = 3,
+        HOSTAP_IF_STA = 4
+};
+
+struct hostapd_if_wds {
+        u8 remote_addr[ETH_ALEN];
+};
+
+struct hostapd_if_vlan {
+        u8 id;
+};
+
+struct hostapd_if_bss {
+        u8 bssid[ETH_ALEN];
+};
+
+struct hostapd_if_sta {
+};
+
+#endif /* HOSTAPD_IOCTL_H */
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
new file mode 100644
index 000000000000..6e36df67f8d5
--- /dev/null
+++ b/net/mac80211/ieee80211.c
@@ -0,0 +1,4984 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
+ * Copyright 2005-2006, Devicescape Software, Inc.
+ * Copyright 2006-2007  Jiri Benc <jbenc@suse.cz>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <net/mac80211.h>
+#include <net/ieee80211_radiotap.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/netdevice.h>
+#include <linux/types.h>
+#include <linux/slab.h>
+#include <linux/skbuff.h>
+#include <linux/etherdevice.h>
+#include <linux/if_arp.h>
+#include <linux/wireless.h>
+#include <linux/rtnetlink.h>
+#include <net/iw_handler.h>
+#include <linux/compiler.h>
+#include <linux/bitmap.h>
+#include <net/cfg80211.h>
+
+#include "ieee80211_common.h"
+#include "ieee80211_i.h"
+#include "ieee80211_rate.h"
+#include "wep.h"
+#include "wpa.h"
+#include "tkip.h"
+#include "wme.h"
+#include "aes_ccm.h"
+#include "ieee80211_led.h"
+#include "ieee80211_cfg.h"
+#include "debugfs.h"
+#include "debugfs_netdev.h"
+#include "debugfs_key.h"
+
+/* privid for wiphys to determine whether they belong to us or not */
+void *mac80211_wiphy_privid = &mac80211_wiphy_privid;
+
+/* See IEEE 802.1H for LLC/SNAP encapsulation/decapsulation */
+/* Ethernet-II snap header (RFC1042 for most EtherTypes) */
+static const unsigned char rfc1042_header[] =
+        { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
+
+/* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */
+static const unsigned char bridge_tunnel_header[] =
+        { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 };
+
+/* No encapsulation header if EtherType < 0x600 (=length) */
+static const unsigned char eapol_header[] =
+        { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00, 0x88, 0x8e };
+
+
+static inline void ieee80211_include_sequence(struct ieee80211_sub_if_data *sdata,
+                                              struct ieee80211_hdr *hdr)
+{
+        /* Set the sequence number for this frame. */
+        hdr->seq_ctrl = cpu_to_le16(sdata->sequence);
+
+        /* Increase the sequence number. */
+        sdata->sequence = (sdata->sequence + 0x10) & IEEE80211_SCTL_SEQ;
+}
+
+struct ieee80211_key_conf *
+ieee80211_key_data2conf(struct ieee80211_local *local,
+                        const struct ieee80211_key *data)
+{
+        struct ieee80211_key_conf *conf;
+
+        conf = kmalloc(sizeof(*conf) + data->keylen, GFP_ATOMIC);
+        if (!conf)
+                return NULL;
+
+        conf->hw_key_idx = data->hw_key_idx;
+        conf->alg = data->alg;
+        conf->keylen = data->keylen;
+        conf->flags = 0;
+        if (data->force_sw_encrypt)
+                conf->flags |= IEEE80211_KEY_FORCE_SW_ENCRYPT;
+        conf->keyidx = data->keyidx;
+        if (data->default_tx_key)
+                conf->flags |= IEEE80211_KEY_DEFAULT_TX_KEY;
+        if (local->default_wep_only)
+                conf->flags |= IEEE80211_KEY_DEFAULT_WEP_ONLY;
+        memcpy(conf->key, data->key, data->keylen);
+
+        return conf;
+}
+
+struct ieee80211_key *ieee80211_key_alloc(struct ieee80211_sub_if_data *sdata,
+                                          int idx, size_t key_len, gfp_t flags)
+{
+        struct ieee80211_key *key;
+
+        key = kzalloc(sizeof(struct ieee80211_key) + key_len, flags);
+        if (!key)
+                return NULL;
+        kref_init(&key->kref);
+        return key;
+}
+
+static void ieee80211_key_release(struct kref *kref)
+{
+        struct ieee80211_key *key;
+
+        key = container_of(kref, struct ieee80211_key, kref);
+        if (key->alg == ALG_CCMP)
+                ieee80211_aes_key_free(key->u.ccmp.tfm);
+        ieee80211_debugfs_key_remove(key);
+        kfree(key);
+}
+
+void ieee80211_key_free(struct ieee80211_key *key)
+{
+        if (key)
+                kref_put(&key->kref, ieee80211_key_release);
+}
+
+static int rate_list_match(const int *rate_list, int rate)
+{
+        int i;
+
+        if (!rate_list)
+                return 0;
+
+        for (i = 0; rate_list[i] >= 0; i++)
+                if (rate_list[i] == rate)
+                        return 1;
+
+        return 0;
+}
+
+
+void ieee80211_prepare_rates(struct ieee80211_local *local,
+                             struct ieee80211_hw_mode *mode)
+{
+        int i;
+
+        for (i = 0; i < mode->num_rates; i++) {
+                struct ieee80211_rate *rate = &mode->rates[i];
+
+                rate->flags &= ~(IEEE80211_RATE_SUPPORTED |
+                                 IEEE80211_RATE_BASIC);
+
+                if (local->supp_rates[mode->mode]) {
+                        if (!rate_list_match(local->supp_rates[mode->mode],
+                                             rate->rate))
+                                continue;
+                }
+
+                rate->flags |= IEEE80211_RATE_SUPPORTED;
+
+                /* Use configured basic rate set if it is available. If not,
+                 * use defaults that are sane for most cases. */
+                if (local->basic_rates[mode->mode]) {
+                        if (rate_list_match(local->basic_rates[mode->mode],
+                                            rate->rate))
+                                rate->flags |= IEEE80211_RATE_BASIC;
+                } else switch (mode->mode) {
+                case MODE_IEEE80211A:
+                        if (rate->rate == 60 || rate->rate == 120 ||
+                            rate->rate == 240)
+                                rate->flags |= IEEE80211_RATE_BASIC;
+                        break;
+                case MODE_IEEE80211B:
+                        if (rate->rate == 10 || rate->rate == 20)
+                                rate->flags |= IEEE80211_RATE_BASIC;
+                        break;
+                case MODE_ATHEROS_TURBO:
+                        if (rate->rate == 120 || rate->rate == 240 ||
+                            rate->rate == 480)
+                                rate->flags |= IEEE80211_RATE_BASIC;
+                        break;
+                case MODE_IEEE80211G:
+                        if (rate->rate == 10 || rate->rate == 20 ||
+                            rate->rate == 55 || rate->rate == 110)
+                                rate->flags |= IEEE80211_RATE_BASIC;
+                        break;
+                }
+
+                /* Set ERP and MANDATORY flags based on phymode */
+                switch (mode->mode) {
+                case MODE_IEEE80211A:
+                        if (rate->rate == 60 || rate->rate == 120 ||
+                            rate->rate == 240)
+                                rate->flags |= IEEE80211_RATE_MANDATORY;
+                        break;
+                case MODE_IEEE80211B:
+                        if (rate->rate == 10)
+                                rate->flags |= IEEE80211_RATE_MANDATORY;
+                        break;
+                case MODE_ATHEROS_TURBO:
+                        break;
+                case MODE_IEEE80211G:
+                        if (rate->rate == 10 || rate->rate == 20 ||
+                            rate->rate == 55 || rate->rate == 110 ||
+                            rate->rate == 60 || rate->rate == 120 ||
+                            rate->rate == 240)
+                                rate->flags |= IEEE80211_RATE_MANDATORY;
+                        break;
+                }
+                if (ieee80211_is_erp_rate(mode->mode, rate->rate))
+                        rate->flags |= IEEE80211_RATE_ERP;
+        }
+}
+
+
+static 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 u8 * ieee80211_get_bssid(struct ieee80211_hdr *hdr, size_t len)
+{
+        u16 fc;
+
+        if (len < 24)
+                return NULL;
+
+        fc = le16_to_cpu(hdr->frame_control);
+
+        switch (fc & IEEE80211_FCTL_FTYPE) {
+        case IEEE80211_FTYPE_DATA:
+                switch (fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) {
+                case IEEE80211_FCTL_TODS:
+                        return hdr->addr1;
+                case (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS):
+                        return NULL;
+                case IEEE80211_FCTL_FROMDS:
+                        return hdr->addr2;
+                case 0:
+                        return hdr->addr3;
+                }
+                break;
+        case IEEE80211_FTYPE_MGMT:
+                return hdr->addr3;
+        case IEEE80211_FTYPE_CTL:
+                if ((fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PSPOLL)
+                        return hdr->addr1;
+                else
+                        return NULL;
+        }
+
+        return NULL;
+}
+
+int ieee80211_get_hdrlen(u16 fc)
+{
+        int hdrlen = 24;
+
+        switch (fc & IEEE80211_FCTL_FTYPE) {
+        case IEEE80211_FTYPE_DATA:
+                if ((fc & IEEE80211_FCTL_FROMDS) && (fc & IEEE80211_FCTL_TODS))
+                        hdrlen = 30; /* Addr4 */
+                /*
+                 * The QoS Control field is two bytes and its presence is
+                 * indicated by the IEEE80211_STYPE_QOS_DATA bit. Add 2 to
+                 * hdrlen if that bit is set.
+                 * This works by masking out the bit and shifting it to
+                 * bit position 1 so the result has the value 0 or 2.
+                 */
+                hdrlen += (fc & IEEE80211_STYPE_QOS_DATA)
+                                >> (ilog2(IEEE80211_STYPE_QOS_DATA)-1);
+                break;
+        case IEEE80211_FTYPE_CTL:
+                /*
+                 * ACK and CTS are 10 bytes, all others 16. To see how
+                 * to get this condition consider
+                 *   subtype mask:   0b0000000011110000 (0x00F0)
+                 *   ACK subtype:    0b0000000011010000 (0x00D0)
+                 *   CTS subtype:    0b0000000011000000 (0x00C0)
+                 *   bits that matter:         ^^^      (0x00E0)
+                 *   value of those: 0b0000000011000000 (0x00C0)
+                 */
+                if ((fc & 0xE0) == 0xC0)
+                        hdrlen = 10;
+                else
+                        hdrlen = 16;
+                break;
+        }
+
+        return hdrlen;
+}
+EXPORT_SYMBOL(ieee80211_get_hdrlen);
+
+int ieee80211_get_hdrlen_from_skb(const struct sk_buff *skb)
+{
+        const struct ieee80211_hdr *hdr = (const struct ieee80211_hdr *) skb->data;
+        int hdrlen;
+
+        if (unlikely(skb->len < 10))
+                return 0;
+        hdrlen = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_control));
+        if (unlikely(hdrlen > skb->len))
+                return 0;
+        return hdrlen;
+}
+EXPORT_SYMBOL(ieee80211_get_hdrlen_from_skb);
+
+static int ieee80211_get_radiotap_len(struct sk_buff *skb)
+{
+        struct ieee80211_radiotap_header *hdr =
+                (struct ieee80211_radiotap_header *) skb->data;
+
+        return le16_to_cpu(hdr->it_len);
+}
+
+#ifdef CONFIG_MAC80211_LOWTX_FRAME_DUMP
+static void ieee80211_dump_frame(const char *ifname, const char *title,
+                                 const struct sk_buff *skb)
+{
+        const struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+        u16 fc;
+        int hdrlen;
+
+        printk(KERN_DEBUG "%s: %s (len=%d)", ifname, title, skb->len);
+        if (skb->len < 4) {
+                printk("\n");
+                return;
+        }
+
+        fc = le16_to_cpu(hdr->frame_control);
+        hdrlen = ieee80211_get_hdrlen(fc);
+        if (hdrlen > skb->len)
+                hdrlen = skb->len;
+        if (hdrlen >= 4)
+                printk(" FC=0x%04x DUR=0x%04x",
+                       fc, le16_to_cpu(hdr->duration_id));
+        if (hdrlen >= 10)
+                printk(" A1=" MAC_FMT, MAC_ARG(hdr->addr1));
+        if (hdrlen >= 16)
+                printk(" A2=" MAC_FMT, MAC_ARG(hdr->addr2));
+        if (hdrlen >= 24)
+                printk(" A3=" MAC_FMT, MAC_ARG(hdr->addr3));
+        if (hdrlen >= 30)
+                printk(" A4=" MAC_FMT, MAC_ARG(hdr->addr4));
+        printk("\n");
+}
+#else /* CONFIG_MAC80211_LOWTX_FRAME_DUMP */
+static inline void ieee80211_dump_frame(const char *ifname, const char *title,
+                                        struct sk_buff *skb)
+{
+}
+#endif /* CONFIG_MAC80211_LOWTX_FRAME_DUMP */
+
+
+static int ieee80211_is_eapol(const struct sk_buff *skb)
+{
+        const struct ieee80211_hdr *hdr;
+        u16 fc;
+        int hdrlen;
+
+        if (unlikely(skb->len < 10))
+                return 0;
+
+        hdr = (const struct ieee80211_hdr *) skb->data;
+        fc = le16_to_cpu(hdr->frame_control);
+
+        if (unlikely(!WLAN_FC_DATA_PRESENT(fc)))
+                return 0;
+
+        hdrlen = ieee80211_get_hdrlen(fc);
+
+        if (unlikely(skb->len >= hdrlen + sizeof(eapol_header) &&
+                     memcmp(skb->data + hdrlen, eapol_header,
+                            sizeof(eapol_header)) == 0))
+                return 1;
+
+        return 0;
+}
+
+
+static ieee80211_txrx_result
+ieee80211_tx_h_rate_ctrl(struct ieee80211_txrx_data *tx)
+{
+        struct rate_control_extra extra;
+
+        memset(&extra, 0, sizeof(extra));
+        extra.mode = tx->u.tx.mode;
+        extra.mgmt_data = tx->sdata &&
+                tx->sdata->type == IEEE80211_IF_TYPE_MGMT;
+        extra.ethertype = tx->ethertype;
+
+        tx->u.tx.rate = rate_control_get_rate(tx->local, tx->dev, tx->skb,
+                                              &extra);
+        if (unlikely(extra.probe != NULL)) {
+                tx->u.tx.control->flags |= IEEE80211_TXCTL_RATE_CTRL_PROBE;
+                tx->u.tx.probe_last_frag = 1;
+                tx->u.tx.control->alt_retry_rate = tx->u.tx.rate->val;
+                tx->u.tx.rate = extra.probe;
+        } else {
+                tx->u.tx.control->alt_retry_rate = -1;
+        }
+        if (!tx->u.tx.rate)
+                return TXRX_DROP;
+        if (tx->u.tx.mode->mode == MODE_IEEE80211G &&
+            tx->local->cts_protect_erp_frames && tx->fragmented &&
+            extra.nonerp) {
+                tx->u.tx.last_frag_rate = tx->u.tx.rate;
+                tx->u.tx.probe_last_frag = extra.probe ? 1 : 0;
+
+                tx->u.tx.rate = extra.nonerp;
+                tx->u.tx.control->rate = extra.nonerp;
+                tx->u.tx.control->flags &= ~IEEE80211_TXCTL_RATE_CTRL_PROBE;
+        } else {
+                tx->u.tx.last_frag_rate = tx->u.tx.rate;
+                tx->u.tx.control->rate = tx->u.tx.rate;
+        }
+        tx->u.tx.control->tx_rate = tx->u.tx.rate->val;
+        if ((tx->u.tx.rate->flags & IEEE80211_RATE_PREAMBLE2) &&
+            tx->local->short_preamble &&
+            (!tx->sta || (tx->sta->flags & WLAN_STA_SHORT_PREAMBLE))) {
+                tx->u.tx.short_preamble = 1;
+                tx->u.tx.control->tx_rate = tx->u.tx.rate->val2;
+        }
+
+        return TXRX_CONTINUE;
+}
+
+
+static ieee80211_txrx_result
+ieee80211_tx_h_select_key(struct ieee80211_txrx_data *tx)
+{
+        if (tx->sta)
+                tx->u.tx.control->key_idx = tx->sta->key_idx_compression;
+        else
+                tx->u.tx.control->key_idx = HW_KEY_IDX_INVALID;
+
+        if (unlikely(tx->u.tx.control->flags & IEEE80211_TXCTL_DO_NOT_ENCRYPT))
+                tx->key = NULL;
+        else if (tx->sta && tx->sta->key)
+                tx->key = tx->sta->key;
+        else if (tx->sdata->default_key)
+                tx->key = tx->sdata->default_key;
+        else if (tx->sdata->drop_unencrypted &&
+                 !(tx->sdata->eapol && ieee80211_is_eapol(tx->skb))) {
+                I802_DEBUG_INC(tx->local->tx_handlers_drop_unencrypted);
+                return TXRX_DROP;
+        } else
+                tx->key = NULL;
+
+        if (tx->key) {
+                tx->key->tx_rx_count++;
+                if (unlikely(tx->local->key_tx_rx_threshold &&
+                             tx->key->tx_rx_count >
+                             tx->local->key_tx_rx_threshold)) {
+                        ieee80211_key_threshold_notify(tx->dev, tx->key,
+                                                       tx->sta);
+                }
+        }
+
+        return TXRX_CONTINUE;
+}
+
+
+static ieee80211_txrx_result
+ieee80211_tx_h_fragment(struct ieee80211_txrx_data *tx)
+{
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) tx->skb->data;
+        size_t hdrlen, per_fragm, num_fragm, payload_len, left;
+        struct sk_buff **frags, *first, *frag;
+        int i;
+        u16 seq;
+        u8 *pos;
+        int frag_threshold = tx->local->fragmentation_threshold;
+
+        if (!tx->fragmented)
+                return TXRX_CONTINUE;
+
+        first = tx->skb;
+
+        hdrlen = ieee80211_get_hdrlen(tx->fc);
+        payload_len = first->len - hdrlen;
+        per_fragm = frag_threshold - hdrlen - FCS_LEN;
+        num_fragm = (payload_len + per_fragm - 1) / per_fragm;
+
+        frags = kzalloc(num_fragm * sizeof(struct sk_buff *), GFP_ATOMIC);
+        if (!frags)
+                goto fail;
+
+        hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_MOREFRAGS);
+        seq = le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_SEQ;
+        pos = first->data + hdrlen + per_fragm;
+        left = payload_len - per_fragm;
+        for (i = 0; i < num_fragm - 1; i++) {
+                struct ieee80211_hdr *fhdr;
+                size_t copylen;
+
+                if (left <= 0)
+                        goto fail;
+
+                /* reserve enough extra head and tail room for possible
+                 * encryption */
+                frag = frags[i] =
+                        dev_alloc_skb(tx->local->hw.extra_tx_headroom +
+                                      frag_threshold +
+                                      IEEE80211_ENCRYPT_HEADROOM +
+                                      IEEE80211_ENCRYPT_TAILROOM);
+                if (!frag)
+                        goto fail;
+                /* Make sure that all fragments use the same priority so
+                 * that they end up using the same TX queue */
+                frag->priority = first->priority;
+                skb_reserve(frag, tx->local->hw.extra_tx_headroom +
+                        IEEE80211_ENCRYPT_HEADROOM);
+                fhdr = (struct ieee80211_hdr *) skb_put(frag, hdrlen);
+                memcpy(fhdr, first->data, hdrlen);
+                if (i == num_fragm - 2)
+                        fhdr->frame_control &= cpu_to_le16(~IEEE80211_FCTL_MOREFRAGS);
+                fhdr->seq_ctrl = cpu_to_le16(seq | ((i + 1) & IEEE80211_SCTL_FRAG));
+                copylen = left > per_fragm ? per_fragm : left;
+                memcpy(skb_put(frag, copylen), pos, copylen);
+
+                pos += copylen;
+                left -= copylen;
+        }
+        skb_trim(first, hdrlen + per_fragm);
+
+        tx->u.tx.num_extra_frag = num_fragm - 1;
+        tx->u.tx.extra_frag = frags;
+
+        return TXRX_CONTINUE;
+
+ fail:
+        printk(KERN_DEBUG "%s: failed to fragment frame\n", tx->dev->name);
+        if (frags) {
+                for (i = 0; i < num_fragm - 1; i++)
+                        if (frags[i])
+                                dev_kfree_skb(frags[i]);
+                kfree(frags);
+        }
+        I802_DEBUG_INC(tx->local->tx_handlers_drop_fragment);
+        return TXRX_DROP;
+}
+
+
+static int wep_encrypt_skb(struct ieee80211_txrx_data *tx, struct sk_buff *skb)
+{
+        if (tx->key->force_sw_encrypt) {
+                if (ieee80211_wep_encrypt(tx->local, skb, tx->key))
+                        return -1;
+        } else {
+                tx->u.tx.control->key_idx = tx->key->hw_key_idx;
+                if (tx->local->hw.flags & IEEE80211_HW_WEP_INCLUDE_IV) {
+                        if (ieee80211_wep_add_iv(tx->local, skb, tx->key) ==
+                            NULL)
+                                return -1;
+                }
+        }
+        return 0;
+}
+
+
+void ieee80211_tx_set_iswep(struct ieee80211_txrx_data *tx)
+{
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) tx->skb->data;
+
+        hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_PROTECTED);
+        if (tx->u.tx.extra_frag) {
+                struct ieee80211_hdr *fhdr;
+                int i;
+                for (i = 0; i < tx->u.tx.num_extra_frag; i++) {
+                        fhdr = (struct ieee80211_hdr *)
+                                tx->u.tx.extra_frag[i]->data;
+                        fhdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_PROTECTED);
+                }
+        }
+}
+
+
+static ieee80211_txrx_result
+ieee80211_tx_h_wep_encrypt(struct ieee80211_txrx_data *tx)
+{
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) tx->skb->data;
+        u16 fc;
+
+        fc = le16_to_cpu(hdr->frame_control);
+
+        if (!tx->key || tx->key->alg != ALG_WEP ||
+            ((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA &&
+             ((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_MGMT ||
+              (fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_AUTH)))
+                return TXRX_CONTINUE;
+
+        tx->u.tx.control->iv_len = WEP_IV_LEN;
+        tx->u.tx.control->icv_len = WEP_ICV_LEN;
+        ieee80211_tx_set_iswep(tx);
+
+        if (wep_encrypt_skb(tx, tx->skb) < 0) {
+                I802_DEBUG_INC(tx->local->tx_handlers_drop_wep);
+                return TXRX_DROP;
+        }
+
+        if (tx->u.tx.extra_frag) {
+                int i;
+                for (i = 0; i < tx->u.tx.num_extra_frag; i++) {
+                        if (wep_encrypt_skb(tx, tx->u.tx.extra_frag[i]) < 0) {
+                                I802_DEBUG_INC(tx->local->
+                                               tx_handlers_drop_wep);
+                                return TXRX_DROP;
+                        }
+                }
+        }
+
+        return TXRX_CONTINUE;
+}
+
+
+static int ieee80211_frame_duration(struct ieee80211_local *local, size_t len,
+                                    int rate, int erp, int short_preamble)
+{
+        int dur;
+
+        /* calculate duration (in microseconds, rounded up to next higher
+         * integer if it includes a fractional microsecond) to send frame of
+         * len bytes (does not include FCS) at the given rate. Duration will
+         * also include SIFS.
+         *
+         * rate is in 100 kbps, so divident is multiplied by 10 in the
+         * DIV_ROUND_UP() operations.
+         */
+
+        if (local->hw.conf.phymode == MODE_IEEE80211A || erp ||
+            local->hw.conf.phymode == MODE_ATHEROS_TURBO) {
+                /*
+                 * OFDM:
+                 *
+                 * N_DBPS = DATARATE x 4
+                 * N_SYM = Ceiling((16+8xLENGTH+6) / N_DBPS)
+                 *      (16 = SIGNAL time, 6 = tail bits)
+                 * TXTIME = T_PREAMBLE + T_SIGNAL + T_SYM x N_SYM + Signal Ext
+                 *
+                 * T_SYM = 4 usec
+                 * 802.11a - 17.5.2: aSIFSTime = 16 usec
+                 * 802.11g - 19.8.4: aSIFSTime = 10 usec +
+                 *      signal ext = 6 usec
+                 */
+                /* FIX: Atheros Turbo may have different (shorter) duration? */
+                dur = 16; /* SIFS + signal ext */
+                dur += 16; /* 17.3.2.3: T_PREAMBLE = 16 usec */
+                dur += 4; /* 17.3.2.3: T_SIGNAL = 4 usec */
+                dur += 4 * DIV_ROUND_UP((16 + 8 * (len + 4) + 6) * 10,
+                                        4 * rate); /* T_SYM x N_SYM */
+        } else {
+                /*
+                 * 802.11b or 802.11g with 802.11b compatibility:
+                 * 18.3.4: TXTIME = PreambleLength + PLCPHeaderTime +
+                 * Ceiling(((LENGTH+PBCC)x8)/DATARATE). PBCC=0.
+                 *
+                 * 802.11 (DS): 15.3.3, 802.11b: 18.3.4
+                 * aSIFSTime = 10 usec
+                 * aPreambleLength = 144 usec or 72 usec with short preamble
+                 * aPLCPHeaderLength = 48 usec or 24 usec with short preamble
+                 */
+                dur = 10; /* aSIFSTime = 10 usec */
+                dur += short_preamble ? (72 + 24) : (144 + 48);
+
+                dur += DIV_ROUND_UP(8 * (len + 4) * 10, rate);
+        }
+
+        return dur;
+}
+
+
+/* Exported duration function for driver use */
+__le16 ieee80211_generic_frame_duration(struct ieee80211_hw *hw,
+                                        size_t frame_len, int rate)
+{
+        struct ieee80211_local *local = hw_to_local(hw);
+        u16 dur;
+        int erp;
+
+        erp = ieee80211_is_erp_rate(hw->conf.phymode, rate);
+        dur = ieee80211_frame_duration(local, frame_len, rate,
+                                       erp, local->short_preamble);
+
+        return cpu_to_le16(dur);
+}
+EXPORT_SYMBOL(ieee80211_generic_frame_duration);
+
+
+static u16 ieee80211_duration(struct ieee80211_txrx_data *tx, int group_addr,
+                              int next_frag_len)
+{
+        int rate, mrate, erp, dur, i;
+        struct ieee80211_rate *txrate = tx->u.tx.rate;
+        struct ieee80211_local *local = tx->local;
+        struct ieee80211_hw_mode *mode = tx->u.tx.mode;
+
+        erp = txrate->flags & IEEE80211_RATE_ERP;
+
+        /*
+         * data and mgmt (except PS Poll):
+         * - during CFP: 32768
+         * - during contention period:
+         *   if addr1 is group address: 0
+         *   if more fragments = 0 and addr1 is individual address: time to
+         *      transmit one ACK plus SIFS
+         *   if more fragments = 1 and addr1 is individual address: time to
+         *      transmit next fragment plus 2 x ACK plus 3 x SIFS
+         *
+         * IEEE 802.11, 9.6:
+         * - control response frame (CTS or ACK) shall be transmitted using the
+         *   same rate as the immediately previous frame in the frame exchange
+         *   sequence, if this rate belongs to the PHY mandatory rates, or else
+         *   at the highest possible rate belonging to the PHY rates in the
+         *   BSSBasicRateSet
+         */
+
+        if ((tx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_CTL) {
+                /* TODO: These control frames are not currently sent by
+                 * 80211.o, but should they be implemented, this function
+                 * needs to be updated to support duration field calculation.
+                 *
+                 * RTS: time needed to transmit pending data/mgmt frame plus
+                 *    one CTS frame plus one ACK frame plus 3 x SIFS
+                 * CTS: duration of immediately previous RTS minus time
+                 *    required to transmit CTS and its SIFS
+                 * ACK: 0 if immediately previous directed data/mgmt had
+                 *    more=0, with more=1 duration in ACK frame is duration
+                 *    from previous frame minus time needed to transmit ACK
+                 *    and its SIFS
+                 * PS Poll: BIT(15) | BIT(14) | aid
+                 */
+                return 0;
+        }
+
+        /* data/mgmt */
+        if (0 /* FIX: data/mgmt during CFP */)
+                return 32768;
+
+        if (group_addr) /* Group address as the destination - no ACK */
+                return 0;
+
+        /* Individual destination address:
+         * IEEE 802.11, Ch. 9.6 (after IEEE 802.11g changes)
+         * CTS and ACK frames shall be transmitted using the highest rate in
+         * basic rate set that is less than or equal to the rate of the
+         * immediately previous frame and that is using the same modulation
+         * (CCK or OFDM). If no basic rate set matches with these requirements,
+         * the highest mandatory rate of the PHY that is less than or equal to
+         * the rate of the previous frame is used.
+         * Mandatory rates for IEEE 802.11g PHY: 1, 2, 5.5, 11, 6, 12, 24 Mbps
+         */
+        rate = -1;
+        mrate = 10; /* use 1 Mbps if everything fails */
+        for (i = 0; i < mode->num_rates; i++) {
+                struct ieee80211_rate *r = &mode->rates[i];
+                if (r->rate > txrate->rate)
+                        break;
+
+                if (IEEE80211_RATE_MODULATION(txrate->flags) !=
+                    IEEE80211_RATE_MODULATION(r->flags))
+                        continue;
+
+                if (r->flags & IEEE80211_RATE_BASIC)
+                        rate = r->rate;
+                else if (r->flags & IEEE80211_RATE_MANDATORY)
+                        mrate = r->rate;
+        }
+        if (rate == -1) {
+                /* No matching basic rate found; use highest suitable mandatory
+                 * PHY rate */
+                rate = mrate;
+        }
+
+        /* Time needed to transmit ACK
+         * (10 bytes + 4-byte FCS = 112 bits) plus SIFS; rounded up
+         * to closest integer */
+
+        dur = ieee80211_frame_duration(local, 10, rate, erp,
+                                       local->short_preamble);
+
+        if (next_frag_len) {
+                /* Frame is fragmented: duration increases with time needed to
+                 * transmit next fragment plus ACK and 2 x SIFS. */
+                dur *= 2; /* ACK + SIFS */
+                /* next fragment */
+                dur += ieee80211_frame_duration(local, next_frag_len,
+                                                txrate->rate, erp,
+                                                local->short_preamble);
+        }
+
+        return dur;
+}
+
+
+static ieee80211_txrx_result
+ieee80211_tx_h_misc(struct ieee80211_txrx_data *tx)
+{
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) tx->skb->data;
+        u16 dur;
+        struct ieee80211_tx_control *control = tx->u.tx.control;
+        struct ieee80211_hw_mode *mode = tx->u.tx.mode;
+
+        if (!is_multicast_ether_addr(hdr->addr1)) {
+                if (tx->skb->len + FCS_LEN > tx->local->rts_threshold &&
+                    tx->local->rts_threshold < IEEE80211_MAX_RTS_THRESHOLD) {
+                        control->flags |= IEEE80211_TXCTL_USE_RTS_CTS;
+                        control->retry_limit =
+                                tx->local->long_retry_limit;
+                } else {
+                        control->retry_limit =
+                                tx->local->short_retry_limit;
+                }
+        } else {
+                control->retry_limit = 1;
+        }
+
+        if (tx->fragmented) {
+                /* Do not use multiple retry rates when sending fragmented
+                 * frames.
+                 * TODO: The last fragment could still use multiple retry
+                 * rates. */
+                control->alt_retry_rate = -1;
+        }
+
+        /* Use CTS protection for unicast frames sent using extended rates if
+         * there are associated non-ERP stations and RTS/CTS is not configured
+         * for the frame. */
+        if (mode->mode == MODE_IEEE80211G &&
+            (tx->u.tx.rate->flags & IEEE80211_RATE_ERP) &&
+            tx->u.tx.unicast &&
+            tx->local->cts_protect_erp_frames &&
+            !(control->flags & IEEE80211_TXCTL_USE_RTS_CTS))
+                control->flags |= IEEE80211_TXCTL_USE_CTS_PROTECT;
+
+        /* Setup duration field for the first fragment of the frame. Duration
+         * for remaining fragments will be updated when they are being sent
+         * to low-level driver in ieee80211_tx(). */
+        dur = ieee80211_duration(tx, is_multicast_ether_addr(hdr->addr1),
+                                 tx->fragmented ? tx->u.tx.extra_frag[0]->len :
+                                 0);
+        hdr->duration_id = cpu_to_le16(dur);
+
+        if ((control->flags & IEEE80211_TXCTL_USE_RTS_CTS) ||
+            (control->flags & IEEE80211_TXCTL_USE_CTS_PROTECT)) {
+                struct ieee80211_rate *rate;
+
+                /* Do not use multiple retry rates when using RTS/CTS */
+                control->alt_retry_rate = -1;
+
+                /* Use min(data rate, max base rate) as CTS/RTS rate */
+                rate = tx->u.tx.rate;
+                while (rate > mode->rates &&
+                       !(rate->flags & IEEE80211_RATE_BASIC))
+                        rate--;
+
+                control->rts_cts_rate = rate->val;
+                control->rts_rate = rate;
+        }
+
+        if (tx->sta) {
+                tx->sta->tx_packets++;
+                tx->sta->tx_fragments++;
+                tx->sta->tx_bytes += tx->skb->len;
+                if (tx->u.tx.extra_frag) {
+                        int i;
+                        tx->sta->tx_fragments += tx->u.tx.num_extra_frag;
+                        for (i = 0; i < tx->u.tx.num_extra_frag; i++) {
+                                tx->sta->tx_bytes +=
+                                        tx->u.tx.extra_frag[i]->len;
+                        }
+                }
+        }
+
+        return TXRX_CONTINUE;
+}
+
+
+static ieee80211_txrx_result
+ieee80211_tx_h_check_assoc(struct ieee80211_txrx_data *tx)
+{
+#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
+        struct sk_buff *skb = tx->skb;
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
+        u32 sta_flags;
+
+        if (unlikely(tx->local->sta_scanning != 0) &&
+            ((tx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_MGMT ||
+             (tx->fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_PROBE_REQ))
+                return TXRX_DROP;
+
+        if (tx->u.tx.ps_buffered)
+                return TXRX_CONTINUE;
+
+        sta_flags = tx->sta ? tx->sta->flags : 0;
+
+        if (likely(tx->u.tx.unicast)) {
+                if (unlikely(!(sta_flags & WLAN_STA_ASSOC) &&
+                             tx->sdata->type != IEEE80211_IF_TYPE_IBSS &&
+                             (tx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA)) {
+#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
+                        printk(KERN_DEBUG "%s: dropped data frame to not "
+                               "associated station " MAC_FMT "\n",
+                               tx->dev->name, MAC_ARG(hdr->addr1));
+#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
+                        I802_DEBUG_INC(tx->local->tx_handlers_drop_not_assoc);
+                        return TXRX_DROP;
+                }
+        } else {
+                if (unlikely((tx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA &&
+                             tx->local->num_sta == 0 &&
+                             !tx->local->allow_broadcast_always &&
+                             tx->sdata->type != IEEE80211_IF_TYPE_IBSS)) {
+                        /*
+                         * No associated STAs - no need to send multicast
+                         * frames.
+                         */
+                        return TXRX_DROP;
+                }
+                return TXRX_CONTINUE;
+        }
+
+        if (unlikely(!tx->u.tx.mgmt_interface && tx->sdata->ieee802_1x &&
+                     !(sta_flags & WLAN_STA_AUTHORIZED))) {
+#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
+                printk(KERN_DEBUG "%s: dropped frame to " MAC_FMT
+                       " (unauthorized port)\n", tx->dev->name,
+                       MAC_ARG(hdr->addr1));
+#endif
+                I802_DEBUG_INC(tx->local->tx_handlers_drop_unauth_port);
+                return TXRX_DROP;
+        }
+
+        return TXRX_CONTINUE;
+}
+
+static ieee80211_txrx_result
+ieee80211_tx_h_sequence(struct ieee80211_txrx_data *tx)
+{
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx->skb->data;
+
+        if (ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_control)) >= 24)
+                ieee80211_include_sequence(tx->sdata, hdr);
+
+        return TXRX_CONTINUE;
+}
+
+/* This function is called whenever the AP is about to exceed the maximum limit
+ * of buffered frames for power saving STAs. This situation should not really
+ * happen often during normal operation, so dropping the oldest buffered packet
+ * from each queue should be OK to make some room for new frames. */
+static void purge_old_ps_buffers(struct ieee80211_local *local)
+{
+        int total = 0, purged = 0;
+        struct sk_buff *skb;
+        struct ieee80211_sub_if_data *sdata;
+        struct sta_info *sta;
+
+        read_lock(&local->sub_if_lock);
+        list_for_each_entry(sdata, &local->sub_if_list, list) {
+                struct ieee80211_if_ap *ap;
+                if (sdata->dev == local->mdev ||
+                    sdata->type != IEEE80211_IF_TYPE_AP)
+                        continue;
+                ap = &sdata->u.ap;
+                skb = skb_dequeue(&ap->ps_bc_buf);
+                if (skb) {
+                        purged++;
+                        dev_kfree_skb(skb);
+                }
+                total += skb_queue_len(&ap->ps_bc_buf);
+        }
+        read_unlock(&local->sub_if_lock);
+
+        spin_lock_bh(&local->sta_lock);
+        list_for_each_entry(sta, &local->sta_list, list) {
+                skb = skb_dequeue(&sta->ps_tx_buf);
+                if (skb) {
+                        purged++;
+                        dev_kfree_skb(skb);
+                }
+                total += skb_queue_len(&sta->ps_tx_buf);
+        }
+        spin_unlock_bh(&local->sta_lock);
+
+        local->total_ps_buffered = total;
+        printk(KERN_DEBUG "%s: PS buffers full - purged %d frames\n",
+               local->mdev->name, purged);
+}
+
+
+static inline ieee80211_txrx_result
+ieee80211_tx_h_multicast_ps_buf(struct ieee80211_txrx_data *tx)
+{
+        /* broadcast/multicast frame */
+        /* If any of the associated stations is in power save mode,
+         * the frame is buffered to be sent after DTIM beacon frame */
+        if ((tx->local->hw.flags & IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING) &&
+            tx->sdata->type != IEEE80211_IF_TYPE_WDS &&
+            tx->sdata->bss && atomic_read(&tx->sdata->bss->num_sta_ps) &&
+            !(tx->fc & IEEE80211_FCTL_ORDER)) {
+                if (tx->local->total_ps_buffered >= TOTAL_MAX_TX_BUFFER)
+                        purge_old_ps_buffers(tx->local);
+                if (skb_queue_len(&tx->sdata->bss->ps_bc_buf) >=
+                    AP_MAX_BC_BUFFER) {
+                        if (net_ratelimit()) {
+                                printk(KERN_DEBUG "%s: BC TX buffer full - "
+                                       "dropping the oldest frame\n",
+                                       tx->dev->name);
+                        }
+                        dev_kfree_skb(skb_dequeue(&tx->sdata->bss->ps_bc_buf));
+                } else
+                        tx->local->total_ps_buffered++;
+                skb_queue_tail(&tx->sdata->bss->ps_bc_buf, tx->skb);
+                return TXRX_QUEUED;
+        }
+
+        return TXRX_CONTINUE;
+}
+
+
+static inline ieee80211_txrx_result
+ieee80211_tx_h_unicast_ps_buf(struct ieee80211_txrx_data *tx)
+{
+        struct sta_info *sta = tx->sta;
+
+        if (unlikely(!sta ||
+                     ((tx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT &&
+                      (tx->fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PROBE_RESP)))
+                return TXRX_CONTINUE;
+
+        if (unlikely((sta->flags & WLAN_STA_PS) && !sta->pspoll)) {
+                struct ieee80211_tx_packet_data *pkt_data;
+#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
+                printk(KERN_DEBUG "STA " MAC_FMT " aid %d: PS buffer (entries "
+                       "before %d)\n",
+                       MAC_ARG(sta->addr), sta->aid,
+                       skb_queue_len(&sta->ps_tx_buf));
+#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
+                sta->flags |= WLAN_STA_TIM;
+                if (tx->local->total_ps_buffered >= TOTAL_MAX_TX_BUFFER)
+                        purge_old_ps_buffers(tx->local);
+                if (skb_queue_len(&sta->ps_tx_buf) >= STA_MAX_TX_BUFFER) {
+                        struct sk_buff *old = skb_dequeue(&sta->ps_tx_buf);
+                        if (net_ratelimit()) {
+                                printk(KERN_DEBUG "%s: STA " MAC_FMT " TX "
+                                       "buffer full - dropping oldest frame\n",
+                                       tx->dev->name, MAC_ARG(sta->addr));
+                        }
+                        dev_kfree_skb(old);
+                } else
+                        tx->local->total_ps_buffered++;
+                /* Queue frame to be sent after STA sends an PS Poll frame */
+                if (skb_queue_empty(&sta->ps_tx_buf)) {
+                        if (tx->local->ops->set_tim)
+                                tx->local->ops->set_tim(local_to_hw(tx->local),
+                                                       sta->aid, 1);
+                        if (tx->sdata->bss)
+                                bss_tim_set(tx->local, tx->sdata->bss, sta->aid);
+                }
+                pkt_data = (struct ieee80211_tx_packet_data *)tx->skb->cb;
+                pkt_data->jiffies = jiffies;
+                skb_queue_tail(&sta->ps_tx_buf, tx->skb);
+                return TXRX_QUEUED;
+        }
+#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
+        else if (unlikely(sta->flags & WLAN_STA_PS)) {
+                printk(KERN_DEBUG "%s: STA " MAC_FMT " in PS mode, but pspoll "
+                       "set -> send frame\n", tx->dev->name,
+                       MAC_ARG(sta->addr));
+        }
+#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
+        sta->pspoll = 0;
+
+        return TXRX_CONTINUE;
+}
+
+
+static ieee80211_txrx_result
+ieee80211_tx_h_ps_buf(struct ieee80211_txrx_data *tx)
+{
+        if (unlikely(tx->u.tx.ps_buffered))
+                return TXRX_CONTINUE;
+
+        if (tx->u.tx.unicast)
+                return ieee80211_tx_h_unicast_ps_buf(tx);
+        else
+                return ieee80211_tx_h_multicast_ps_buf(tx);
+}
+
+
+static void inline
+__ieee80211_tx_prepare(struct ieee80211_txrx_data *tx,
+                       struct sk_buff *skb,
+                       struct net_device *dev,
+                       struct ieee80211_tx_control *control)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+        int hdrlen;
+
+        memset(tx, 0, sizeof(*tx));
+        tx->skb = skb;
+        tx->dev = dev; /* use original interface */
+        tx->local = local;
+        tx->sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        tx->sta = sta_info_get(local, hdr->addr1);
+        tx->fc = le16_to_cpu(hdr->frame_control);
+        control->power_level = local->hw.conf.power_level;
+        tx->u.tx.control = control;
+        tx->u.tx.unicast = !is_multicast_ether_addr(hdr->addr1);
+        if (is_multicast_ether_addr(hdr->addr1))
+                control->flags |= IEEE80211_TXCTL_NO_ACK;
+        else
+                control->flags &= ~IEEE80211_TXCTL_NO_ACK;
+        tx->fragmented = local->fragmentation_threshold <
+                IEEE80211_MAX_FRAG_THRESHOLD && tx->u.tx.unicast &&
+                skb->len + FCS_LEN > local->fragmentation_threshold &&
+                (!local->ops->set_frag_threshold);
+        if (!tx->sta)
+                control->flags |= IEEE80211_TXCTL_CLEAR_DST_MASK;
+        else if (tx->sta->clear_dst_mask) {
+                control->flags |= IEEE80211_TXCTL_CLEAR_DST_MASK;
+                tx->sta->clear_dst_mask = 0;
+        }
+        control->antenna_sel_tx = local->hw.conf.antenna_sel_tx;
+        if (local->sta_antenna_sel != STA_ANTENNA_SEL_AUTO && tx->sta)
+                control->antenna_sel_tx = tx->sta->antenna_sel_tx;
+        hdrlen = ieee80211_get_hdrlen(tx->fc);
+        if (skb->len > hdrlen + sizeof(rfc1042_header) + 2) {
+                u8 *pos = &skb->data[hdrlen + sizeof(rfc1042_header)];
+                tx->ethertype = (pos[0] << 8) | pos[1];
+        }
+        control->flags |= IEEE80211_TXCTL_FIRST_FRAGMENT;
+
+}
+
+static int inline is_ieee80211_device(struct net_device *dev,
+                                      struct net_device *master)
+{
+        return (wdev_priv(dev->ieee80211_ptr) ==
+                wdev_priv(master->ieee80211_ptr));
+}
+
+/* Device in tx->dev has a reference added; use dev_put(tx->dev) when
+ * finished with it. */
+static int inline ieee80211_tx_prepare(struct ieee80211_txrx_data *tx,
+                                       struct sk_buff *skb,
+                                       struct net_device *mdev,
+                                       struct ieee80211_tx_control *control)
+{
+        struct ieee80211_tx_packet_data *pkt_data;
+        struct net_device *dev;
+
+        pkt_data = (struct ieee80211_tx_packet_data *)skb->cb;
+        dev = dev_get_by_index(pkt_data->ifindex);
+        if (unlikely(dev && !is_ieee80211_device(dev, mdev))) {
+                dev_put(dev);
+                dev = NULL;
+        }
+        if (unlikely(!dev))
+                return -ENODEV;
+        __ieee80211_tx_prepare(tx, skb, dev, control);
+        return 0;
+}
+
+static inline int __ieee80211_queue_stopped(const struct ieee80211_local *local,
+                                            int queue)
+{
+        return test_bit(IEEE80211_LINK_STATE_XOFF, &local->state[queue]);
+}
+
+static inline int __ieee80211_queue_pending(const struct ieee80211_local *local,
+                                            int queue)
+{
+        return test_bit(IEEE80211_LINK_STATE_PENDING, &local->state[queue]);
+}
+
+#define IEEE80211_TX_OK         0
+#define IEEE80211_TX_AGAIN      1
+#define IEEE80211_TX_FRAG_AGAIN 2
+
+static int __ieee80211_tx(struct ieee80211_local *local, struct sk_buff *skb,
+                          struct ieee80211_txrx_data *tx)
+{
+        struct ieee80211_tx_control *control = tx->u.tx.control;
+        int ret, i;
+
+        if (!ieee80211_qdisc_installed(local->mdev) &&
+            __ieee80211_queue_stopped(local, 0)) {
+                netif_stop_queue(local->mdev);
+                return IEEE80211_TX_AGAIN;
+        }
+        if (skb) {
+                ieee80211_dump_frame(local->mdev->name, "TX to low-level driver", skb);
+                ret = local->ops->tx(local_to_hw(local), skb, control);
+                if (ret)
+                        return IEEE80211_TX_AGAIN;
+                local->mdev->trans_start = jiffies;
+                ieee80211_led_tx(local, 1);
+        }
+        if (tx->u.tx.extra_frag) {
+                control->flags &= ~(IEEE80211_TXCTL_USE_RTS_CTS |
+                                    IEEE80211_TXCTL_USE_CTS_PROTECT |
+                                    IEEE80211_TXCTL_CLEAR_DST_MASK |
+                                    IEEE80211_TXCTL_FIRST_FRAGMENT);
+                for (i = 0; i < tx->u.tx.num_extra_frag; i++) {
+                        if (!tx->u.tx.extra_frag[i])
+                                continue;
+                        if (__ieee80211_queue_stopped(local, control->queue))
+                                return IEEE80211_TX_FRAG_AGAIN;
+                        if (i == tx->u.tx.num_extra_frag) {
+                                control->tx_rate = tx->u.tx.last_frag_hwrate;
+                                control->rate = tx->u.tx.last_frag_rate;
+                                if (tx->u.tx.probe_last_frag)
+                                        control->flags |=
+                                                IEEE80211_TXCTL_RATE_CTRL_PROBE;
+                                else
+                                        control->flags &=
+                                                ~IEEE80211_TXCTL_RATE_CTRL_PROBE;
+                        }
+
+                        ieee80211_dump_frame(local->mdev->name,
+                                             "TX to low-level driver",
+                                             tx->u.tx.extra_frag[i]);
+                        ret = local->ops->tx(local_to_hw(local),
+                                            tx->u.tx.extra_frag[i],
+                                            control);
+                        if (ret)
+                                return IEEE80211_TX_FRAG_AGAIN;
+                        local->mdev->trans_start = jiffies;
+                        ieee80211_led_tx(local, 1);
+                        tx->u.tx.extra_frag[i] = NULL;
+                }
+                kfree(tx->u.tx.extra_frag);
+                tx->u.tx.extra_frag = NULL;
+        }
+        return IEEE80211_TX_OK;
+}
+
+static int ieee80211_tx(struct net_device *dev, struct sk_buff *skb,
+                        struct ieee80211_tx_control *control, int mgmt)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct sta_info *sta;
+        ieee80211_tx_handler *handler;
+        struct ieee80211_txrx_data tx;
+        ieee80211_txrx_result res = TXRX_DROP;
+        int ret, i;
+
+        WARN_ON(__ieee80211_queue_pending(local, control->queue));
+
+        if (unlikely(skb->len < 10)) {
+                dev_kfree_skb(skb);
+                return 0;
+        }
+
+        __ieee80211_tx_prepare(&tx, skb, dev, control);
+        sta = tx.sta;
+        tx.u.tx.mgmt_interface = mgmt;
+        tx.u.tx.mode = local->hw.conf.mode;
+
+        for (handler = local->tx_handlers; *handler != NULL; handler++) {
+                res = (*handler)(&tx);
+                if (res != TXRX_CONTINUE)
+                        break;
+        }
+
+        skb = tx.skb; /* handlers are allowed to change skb */
+
+        if (sta)
+                sta_info_put(sta);
+
+        if (unlikely(res == TXRX_DROP)) {
+                I802_DEBUG_INC(local->tx_handlers_drop);
+                goto drop;
+        }
+
+        if (unlikely(res == TXRX_QUEUED)) {
+                I802_DEBUG_INC(local->tx_handlers_queued);
+                return 0;
+        }
+
+        if (tx.u.tx.extra_frag) {
+                for (i = 0; i < tx.u.tx.num_extra_frag; i++) {
+                        int next_len, dur;
+                        struct ieee80211_hdr *hdr =
+                                (struct ieee80211_hdr *)
+                                tx.u.tx.extra_frag[i]->data;
+
+                        if (i + 1 < tx.u.tx.num_extra_frag) {
+                                next_len = tx.u.tx.extra_frag[i + 1]->len;
+                        } else {
+                                next_len = 0;
+                                tx.u.tx.rate = tx.u.tx.last_frag_rate;
+                                tx.u.tx.last_frag_hwrate = tx.u.tx.rate->val;
+                        }
+                        dur = ieee80211_duration(&tx, 0, next_len);
+                        hdr->duration_id = cpu_to_le16(dur);
+                }
+        }
+
+retry:
+        ret = __ieee80211_tx(local, skb, &tx);
+        if (ret) {
+                struct ieee80211_tx_stored_packet *store =
+                        &local->pending_packet[control->queue];
+
+                if (ret == IEEE80211_TX_FRAG_AGAIN)
+                        skb = NULL;
+                set_bit(IEEE80211_LINK_STATE_PENDING,
+                        &local->state[control->queue]);
+                smp_mb();
+                /* When the driver gets out of buffers during sending of
+                 * fragments and calls ieee80211_stop_queue, there is
+                 * a small window between IEEE80211_LINK_STATE_XOFF and
+                 * IEEE80211_LINK_STATE_PENDING flags are set. If a buffer
+                 * gets available in that window (i.e. driver calls
+                 * ieee80211_wake_queue), we would end up with ieee80211_tx
+                 * called with IEEE80211_LINK_STATE_PENDING. Prevent this by
+                 * continuing transmitting here when that situation is
+                 * possible to have happened. */
+                if (!__ieee80211_queue_stopped(local, control->queue)) {
+                        clear_bit(IEEE80211_LINK_STATE_PENDING,
+                                  &local->state[control->queue]);
+                        goto retry;
+                }
+                memcpy(&store->control, control,
+                       sizeof(struct ieee80211_tx_control));
+                store->skb = skb;
+                store->extra_frag = tx.u.tx.extra_frag;
+                store->num_extra_frag = tx.u.tx.num_extra_frag;
+                store->last_frag_hwrate = tx.u.tx.last_frag_hwrate;
+                store->last_frag_rate = tx.u.tx.last_frag_rate;
+                store->last_frag_rate_ctrl_probe = tx.u.tx.probe_last_frag;
+        }
+        return 0;
+
+ drop:
+        if (skb)
+                dev_kfree_skb(skb);
+        for (i = 0; i < tx.u.tx.num_extra_frag; i++)
+                if (tx.u.tx.extra_frag[i])
+                        dev_kfree_skb(tx.u.tx.extra_frag[i]);
+        kfree(tx.u.tx.extra_frag);
+        return 0;
+}
+
+static void ieee80211_tx_pending(unsigned long data)
+{
+        struct ieee80211_local *local = (struct ieee80211_local *)data;
+        struct net_device *dev = local->mdev;
+        struct ieee80211_tx_stored_packet *store;
+        struct ieee80211_txrx_data tx;
+        int i, ret, reschedule = 0;
+
+        netif_tx_lock_bh(dev);
+        for (i = 0; i < local->hw.queues; i++) {
+                if (__ieee80211_queue_stopped(local, i))
+                        continue;
+                if (!__ieee80211_queue_pending(local, i)) {
+                        reschedule = 1;
+                        continue;
+                }
+                store = &local->pending_packet[i];
+                tx.u.tx.control = &store->control;
+                tx.u.tx.extra_frag = store->extra_frag;
+                tx.u.tx.num_extra_frag = store->num_extra_frag;
+                tx.u.tx.last_frag_hwrate = store->last_frag_hwrate;
+                tx.u.tx.last_frag_rate = store->last_frag_rate;
+                tx.u.tx.probe_last_frag = store->last_frag_rate_ctrl_probe;
+                ret = __ieee80211_tx(local, store->skb, &tx);
+                if (ret) {
+                        if (ret == IEEE80211_TX_FRAG_AGAIN)
+                                store->skb = NULL;
+                } else {
+                        clear_bit(IEEE80211_LINK_STATE_PENDING,
+                                  &local->state[i]);
+                        reschedule = 1;
+                }
+        }
+        netif_tx_unlock_bh(dev);
+        if (reschedule) {
+                if (!ieee80211_qdisc_installed(dev)) {
+                        if (!__ieee80211_queue_stopped(local, 0))
+                                netif_wake_queue(dev);
+                } else
+                        netif_schedule(dev);
+        }
+}
+
+static void ieee80211_clear_tx_pending(struct ieee80211_local *local)
+{
+        int i, j;
+        struct ieee80211_tx_stored_packet *store;
+
+        for (i = 0; i < local->hw.queues; i++) {
+                if (!__ieee80211_queue_pending(local, i))
+                        continue;
+                store = &local->pending_packet[i];
+                kfree_skb(store->skb);
+                for (j = 0; j < store->num_extra_frag; j++)
+                        kfree_skb(store->extra_frag[j]);
+                kfree(store->extra_frag);
+                clear_bit(IEEE80211_LINK_STATE_PENDING, &local->state[i]);
+        }
+}
+
+static int ieee80211_master_start_xmit(struct sk_buff *skb,
+                                       struct net_device *dev)
+{
+        struct ieee80211_tx_control control;
+        struct ieee80211_tx_packet_data *pkt_data;
+        struct net_device *odev = NULL;
+        struct ieee80211_sub_if_data *osdata;
+        int headroom;
+        int ret;
+
+        /*
+         * copy control out of the skb so other people can use skb->cb
+         */
+        pkt_data = (struct ieee80211_tx_packet_data *)skb->cb;
+        memset(&control, 0, sizeof(struct ieee80211_tx_control));
+
+        if (pkt_data->ifindex)
+                odev = dev_get_by_index(pkt_data->ifindex);
+        if (unlikely(odev && !is_ieee80211_device(odev, dev))) {
+                dev_put(odev);
+                odev = NULL;
+        }
+        if (unlikely(!odev)) {
+#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
+                printk(KERN_DEBUG "%s: Discarded packet with nonexistent "
+                       "originating device\n", dev->name);
+#endif
+                dev_kfree_skb(skb);
+                return 0;
+        }
+        osdata = IEEE80211_DEV_TO_SUB_IF(odev);
+
+        headroom = osdata->local->hw.extra_tx_headroom +
+                IEEE80211_ENCRYPT_HEADROOM;
+        if (skb_headroom(skb) < headroom) {
+                if (pskb_expand_head(skb, headroom, 0, GFP_ATOMIC)) {
+                        dev_kfree_skb(skb);
+                        return 0;
+                }
+        }
+
+        control.ifindex = odev->ifindex;
+        control.type = osdata->type;
+        if (pkt_data->req_tx_status)
+                control.flags |= IEEE80211_TXCTL_REQ_TX_STATUS;
+        if (pkt_data->do_not_encrypt)
+                control.flags |= IEEE80211_TXCTL_DO_NOT_ENCRYPT;
+        if (pkt_data->requeue)
+                control.flags |= IEEE80211_TXCTL_REQUEUE;
+        control.queue = pkt_data->queue;
+
+        ret = ieee80211_tx(odev, skb, &control,
+                           control.type == IEEE80211_IF_TYPE_MGMT);
+        dev_put(odev);
+
+        return ret;
+}
+
+
+/**
+ * ieee80211_subif_start_xmit - netif start_xmit function for Ethernet-type
+ * subinterfaces (wlan#, WDS, and VLAN interfaces)
+ * @skb: packet to be sent
+ * @dev: incoming interface
+ *
+ * Returns: 0 on success (and frees skb in this case) or 1 on failure (skb will
+ * not be freed, and caller is responsible for either retrying later or freeing
+ * skb).
+ *
+ * This function takes in an Ethernet header and encapsulates it with suitable
+ * IEEE 802.11 header based on which interface the packet is coming in. The
+ * encapsulated packet will then be passed to master interface, wlan#.11, for
+ * transmission (through low-level driver).
+ */
+static int ieee80211_subif_start_xmit(struct sk_buff *skb,
+                                      struct net_device *dev)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_tx_packet_data *pkt_data;
+        struct ieee80211_sub_if_data *sdata;
+        int ret = 1, head_need;
+        u16 ethertype, hdrlen, fc;
+        struct ieee80211_hdr hdr;
+        const u8 *encaps_data;
+        int encaps_len, skip_header_bytes;
+        int nh_pos, h_pos, no_encrypt = 0;
+        struct sta_info *sta;
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        if (unlikely(skb->len < ETH_HLEN)) {
+                printk(KERN_DEBUG "%s: short skb (len=%d)\n",
+                       dev->name, skb->len);
+                ret = 0;
+                goto fail;
+        }
+
+        nh_pos = skb_network_header(skb) - skb->data;
+        h_pos = skb_transport_header(skb) - skb->data;
+
+        /* convert Ethernet header to proper 802.11 header (based on
+         * operation mode) */
+        ethertype = (skb->data[12] << 8) | skb->data[13];
+        /* TODO: handling for 802.1x authorized/unauthorized port */
+        fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA;
+
+        if (likely(sdata->type == IEEE80211_IF_TYPE_AP ||
+                   sdata->type == IEEE80211_IF_TYPE_VLAN)) {
+                fc |= IEEE80211_FCTL_FROMDS;
+                /* DA BSSID SA */
+                memcpy(hdr.addr1, skb->data, ETH_ALEN);
+                memcpy(hdr.addr2, dev->dev_addr, ETH_ALEN);
+                memcpy(hdr.addr3, skb->data + ETH_ALEN, ETH_ALEN);
+                hdrlen = 24;
+        } else if (sdata->type == IEEE80211_IF_TYPE_WDS) {
+                fc |= IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS;
+                /* RA TA DA SA */
+                memcpy(hdr.addr1, sdata->u.wds.remote_addr, ETH_ALEN);
+                memcpy(hdr.addr2, dev->dev_addr, ETH_ALEN);
+                memcpy(hdr.addr3, skb->data, ETH_ALEN);
+                memcpy(hdr.addr4, skb->data + ETH_ALEN, ETH_ALEN);
+                hdrlen = 30;
+        } else if (sdata->type == IEEE80211_IF_TYPE_STA) {
+                fc |= IEEE80211_FCTL_TODS;
+                /* BSSID SA DA */
+                memcpy(hdr.addr1, sdata->u.sta.bssid, ETH_ALEN);
+                memcpy(hdr.addr2, skb->data + ETH_ALEN, ETH_ALEN);
+                memcpy(hdr.addr3, skb->data, ETH_ALEN);
+                hdrlen = 24;
+        } else if (sdata->type == IEEE80211_IF_TYPE_IBSS) {
+                /* DA SA BSSID */
+                memcpy(hdr.addr1, skb->data, ETH_ALEN);
+                memcpy(hdr.addr2, skb->data + ETH_ALEN, ETH_ALEN);
+                memcpy(hdr.addr3, sdata->u.sta.bssid, ETH_ALEN);
+                hdrlen = 24;
+        } else {
+                ret = 0;
+                goto fail;
+        }
+
+        /* receiver is QoS enabled, use a QoS type frame */
+        sta = sta_info_get(local, hdr.addr1);
+        if (sta) {
+                if (sta->flags & WLAN_STA_WME) {
+                        fc |= IEEE80211_STYPE_QOS_DATA;
+                        hdrlen += 2;
+                }
+                sta_info_put(sta);
+        }
+
+        hdr.frame_control = cpu_to_le16(fc);
+        hdr.duration_id = 0;
+        hdr.seq_ctrl = 0;
+
+        skip_header_bytes = ETH_HLEN;
+        if (ethertype == ETH_P_AARP || ethertype == ETH_P_IPX) {
+                encaps_data = bridge_tunnel_header;
+                encaps_len = sizeof(bridge_tunnel_header);
+                skip_header_bytes -= 2;
+        } else if (ethertype >= 0x600) {
+                encaps_data = rfc1042_header;
+                encaps_len = sizeof(rfc1042_header);
+                skip_header_bytes -= 2;
+        } else {
+                encaps_data = NULL;
+                encaps_len = 0;
+        }
+
+        skb_pull(skb, skip_header_bytes);
+        nh_pos -= skip_header_bytes;
+        h_pos -= skip_header_bytes;
+
+        /* TODO: implement support for fragments so that there is no need to
+         * reallocate and copy payload; it might be enough to support one
+         * extra fragment that would be copied in the beginning of the frame
+         * data.. anyway, it would be nice to include this into skb structure
+         * somehow
+         *
+         * There are few options for this:
+         * use skb->cb as an extra space for 802.11 header
+         * allocate new buffer if not enough headroom
+         * make sure that there is enough headroom in every skb by increasing
+         * build in headroom in __dev_alloc_skb() (linux/skbuff.h) and
+         * alloc_skb() (net/core/skbuff.c)
+         */
+        head_need = hdrlen + encaps_len + local->hw.extra_tx_headroom;
+        head_need -= skb_headroom(skb);
+
+        /* We are going to modify skb data, so make a copy of it if happens to
+         * be cloned. This could happen, e.g., with Linux bridge code passing
+         * us broadcast frames. */
+
+        if (head_need > 0 || skb_cloned(skb)) {
+#if 0
+                printk(KERN_DEBUG "%s: need to reallocate buffer for %d bytes "
+                       "of headroom\n", dev->name, head_need);
+#endif
+
+                if (skb_cloned(skb))
+                        I802_DEBUG_INC(local->tx_expand_skb_head_cloned);
+                else
+                        I802_DEBUG_INC(local->tx_expand_skb_head);
+                /* Since we have to reallocate the buffer, make sure that there
+                 * is enough room for possible WEP IV/ICV and TKIP (8 bytes
+                 * before payload and 12 after). */
+                if (pskb_expand_head(skb, (head_need > 0 ? head_need + 8 : 8),
+                                     12, GFP_ATOMIC)) {
+                        printk(KERN_DEBUG "%s: failed to reallocate TX buffer"
+                               "\n", dev->name);
+                        goto fail;
+                }
+        }
+
+        if (encaps_data) {
+                memcpy(skb_push(skb, encaps_len), encaps_data, encaps_len);
+                nh_pos += encaps_len;
+                h_pos += encaps_len;
+        }
+        memcpy(skb_push(skb, hdrlen), &hdr, hdrlen);
+        nh_pos += hdrlen;
+        h_pos += hdrlen;
+
+        pkt_data = (struct ieee80211_tx_packet_data *)skb->cb;
+        memset(pkt_data, 0, sizeof(struct ieee80211_tx_packet_data));
+        pkt_data->ifindex = sdata->dev->ifindex;
+        pkt_data->mgmt_iface = (sdata->type == IEEE80211_IF_TYPE_MGMT);
+        pkt_data->do_not_encrypt = no_encrypt;
+
+        skb->dev = local->mdev;
+        sdata->stats.tx_packets++;
+        sdata->stats.tx_bytes += skb->len;
+
+        /* Update skb pointers to various headers since this modified frame
+         * is going to go through Linux networking code that may potentially
+         * need things like pointer to IP header. */
+        skb_set_mac_header(skb, 0);
+        skb_set_network_header(skb, nh_pos);
+        skb_set_transport_header(skb, h_pos);
+
+        dev->trans_start = jiffies;
+        dev_queue_xmit(skb);
+
+        return 0;
+
+ fail:
+        if (!ret)
+                dev_kfree_skb(skb);
+
+        return ret;
+}
+
+
+/*
+ * This is the transmit routine for the 802.11 type interfaces
+ * called by upper layers of the linux networking
+ * stack when it has a frame to transmit
+ */
+static int
+ieee80211_mgmt_start_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+        struct ieee80211_sub_if_data *sdata;
+        struct ieee80211_tx_packet_data *pkt_data;
+        struct ieee80211_hdr *hdr;
+        u16 fc;
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+
+        if (skb->len < 10) {
+                dev_kfree_skb(skb);
+                return 0;
+        }
+
+        if (skb_headroom(skb) < sdata->local->hw.extra_tx_headroom) {
+                if (pskb_expand_head(skb,
+                    sdata->local->hw.extra_tx_headroom, 0, GFP_ATOMIC)) {
+                        dev_kfree_skb(skb);
+                        return 0;
+                }
+        }
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+        fc = le16_to_cpu(hdr->frame_control);
+
+        pkt_data = (struct ieee80211_tx_packet_data *) skb->cb;
+        memset(pkt_data, 0, sizeof(struct ieee80211_tx_packet_data));
+        pkt_data->ifindex = sdata->dev->ifindex;
+        pkt_data->mgmt_iface = (sdata->type == IEEE80211_IF_TYPE_MGMT);
+
+        skb->priority = 20; /* use hardcoded priority for mgmt TX queue */
+        skb->dev = sdata->local->mdev;
+
+        /*
+         * We're using the protocol field of the the frame control header
+         * to request TX callback for hostapd. BIT(1) is checked.
+         */
+        if ((fc & BIT(1)) == BIT(1)) {
+                pkt_data->req_tx_status = 1;
+                fc &= ~BIT(1);
+                hdr->frame_control = cpu_to_le16(fc);
+        }
+
+        pkt_data->do_not_encrypt = !(fc & IEEE80211_FCTL_PROTECTED);
+
+        sdata->stats.tx_packets++;
+        sdata->stats.tx_bytes += skb->len;
+
+        dev_queue_xmit(skb);
+
+        return 0;
+}
+
+
+static void ieee80211_beacon_add_tim(struct ieee80211_local *local,
+                                     struct ieee80211_if_ap *bss,
+                                     struct sk_buff *skb)
+{
+        u8 *pos, *tim;
+        int aid0 = 0;
+        int i, have_bits = 0, n1, n2;
+
+        /* Generate bitmap for TIM only if there are any STAs in power save
+         * mode. */
+        spin_lock_bh(&local->sta_lock);
+        if (atomic_read(&bss->num_sta_ps) > 0)
+                /* in the hope that this is faster than
+                 * checking byte-for-byte */
+                have_bits = !bitmap_empty((unsigned long*)bss->tim,
+                                          IEEE80211_MAX_AID+1);
+
+        if (bss->dtim_count == 0)
+                bss->dtim_count = bss->dtim_period - 1;
+        else
+                bss->dtim_count--;
+
+        tim = pos = (u8 *) skb_put(skb, 6);
+        *pos++ = WLAN_EID_TIM;
+        *pos++ = 4;
+        *pos++ = bss->dtim_count;
+        *pos++ = bss->dtim_period;
+
+        if (bss->dtim_count == 0 && !skb_queue_empty(&bss->ps_bc_buf))
+                aid0 = 1;
+
+        if (have_bits) {
+                /* Find largest even number N1 so that bits numbered 1 through
+                 * (N1 x 8) - 1 in the bitmap are 0 and number N2 so that bits
+                 * (N2 + 1) x 8 through 2007 are 0. */
+                n1 = 0;
+                for (i = 0; i < IEEE80211_MAX_TIM_LEN; i++) {
+                        if (bss->tim[i]) {
+                                n1 = i & 0xfe;
+                                break;
+                        }
+                }
+                n2 = n1;
+                for (i = IEEE80211_MAX_TIM_LEN - 1; i >= n1; i--) {
+                        if (bss->tim[i]) {
+                                n2 = i;
+                                break;
+                        }
+                }
+
+                /* Bitmap control */
+                *pos++ = n1 | aid0;
+                /* Part Virt Bitmap */
+                memcpy(pos, bss->tim + n1, n2 - n1 + 1);
+
+                tim[1] = n2 - n1 + 4;
+                skb_put(skb, n2 - n1);
+        } else {
+                *pos++ = aid0; /* Bitmap control */
+                *pos++ = 0; /* Part Virt Bitmap */
+        }
+        spin_unlock_bh(&local->sta_lock);
+}
+
+
+struct sk_buff * ieee80211_beacon_get(struct ieee80211_hw *hw, int if_id,
+                                      struct ieee80211_tx_control *control)
+{
+        struct ieee80211_local *local = hw_to_local(hw);
+        struct sk_buff *skb;
+        struct net_device *bdev;
+        struct ieee80211_sub_if_data *sdata = NULL;
+        struct ieee80211_if_ap *ap = NULL;
+        struct ieee80211_rate *rate;
+        struct rate_control_extra extra;
+        u8 *b_head, *b_tail;
+        int bh_len, bt_len;
+
+        bdev = dev_get_by_index(if_id);
+        if (bdev) {
+                sdata = IEEE80211_DEV_TO_SUB_IF(bdev);
+                ap = &sdata->u.ap;
+                dev_put(bdev);
+        }
+
+        if (!ap || sdata->type != IEEE80211_IF_TYPE_AP ||
+            !ap->beacon_head) {
+#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
+                if (net_ratelimit())
+                        printk(KERN_DEBUG "no beacon data avail for idx=%d "
+                               "(%s)\n", if_id, bdev ? bdev->name : "N/A");
+#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
+                return NULL;
+        }
+
+        /* Assume we are generating the normal beacon locally */
+        b_head = ap->beacon_head;
+        b_tail = ap->beacon_tail;
+        bh_len = ap->beacon_head_len;
+        bt_len = ap->beacon_tail_len;
+
+        skb = dev_alloc_skb(local->hw.extra_tx_headroom +
+                bh_len + bt_len + 256 /* maximum TIM len */);
+        if (!skb)
+                return NULL;
+
+        skb_reserve(skb, local->hw.extra_tx_headroom);
+        memcpy(skb_put(skb, bh_len), b_head, bh_len);
+
+        ieee80211_include_sequence(sdata, (struct ieee80211_hdr *)skb->data);
+
+        ieee80211_beacon_add_tim(local, ap, skb);
+
+        if (b_tail) {
+                memcpy(skb_put(skb, bt_len), b_tail, bt_len);
+        }
+
+        if (control) {
+                memset(&extra, 0, sizeof(extra));
+                extra.mode = local->oper_hw_mode;
+
+                rate = rate_control_get_rate(local, local->mdev, skb, &extra);
+                if (!rate) {
+                        if (net_ratelimit()) {
+                                printk(KERN_DEBUG "%s: ieee80211_beacon_get: no rate "
+                                       "found\n", local->mdev->name);
+                        }
+                        dev_kfree_skb(skb);
+                        return NULL;
+                }
+
+                control->tx_rate = (local->short_preamble &&
+                                    (rate->flags & IEEE80211_RATE_PREAMBLE2)) ?
+                        rate->val2 : rate->val;
+                control->antenna_sel_tx = local->hw.conf.antenna_sel_tx;
+                control->power_level = local->hw.conf.power_level;
+                control->flags |= IEEE80211_TXCTL_NO_ACK;
+                control->retry_limit = 1;
+                control->flags |= IEEE80211_TXCTL_CLEAR_DST_MASK;
+        }
+
+        ap->num_beacons++;
+        return skb;
+}
+EXPORT_SYMBOL(ieee80211_beacon_get);
+
+__le16 ieee80211_rts_duration(struct ieee80211_hw *hw,
+                              size_t frame_len,
+                              const struct ieee80211_tx_control *frame_txctl)
+{
+        struct ieee80211_local *local = hw_to_local(hw);
+        struct ieee80211_rate *rate;
+        int short_preamble = local->short_preamble;
+        int erp;
+        u16 dur;
+
+        rate = frame_txctl->rts_rate;
+        erp = !!(rate->flags & IEEE80211_RATE_ERP);
+
+        /* CTS duration */
+        dur = ieee80211_frame_duration(local, 10, rate->rate,
+                                       erp, short_preamble);
+        /* Data frame duration */
+        dur += ieee80211_frame_duration(local, frame_len, rate->rate,
+                                        erp, short_preamble);
+        /* ACK duration */
+        dur += ieee80211_frame_duration(local, 10, rate->rate,
+                                        erp, short_preamble);
+
+        return cpu_to_le16(dur);
+}
+EXPORT_SYMBOL(ieee80211_rts_duration);
+
+
+__le16 ieee80211_ctstoself_duration(struct ieee80211_hw *hw,
+                                    size_t frame_len,
+                                    const struct ieee80211_tx_control *frame_txctl)
+{
+        struct ieee80211_local *local = hw_to_local(hw);
+        struct ieee80211_rate *rate;
+        int short_preamble = local->short_preamble;
+        int erp;
+        u16 dur;
+
+        rate = frame_txctl->rts_rate;
+        erp = !!(rate->flags & IEEE80211_RATE_ERP);
+
+        /* Data frame duration */
+        dur = ieee80211_frame_duration(local, frame_len, rate->rate,
+                                       erp, short_preamble);
+        if (!(frame_txctl->flags & IEEE80211_TXCTL_NO_ACK)) {
+                /* ACK duration */
+                dur += ieee80211_frame_duration(local, 10, rate->rate,
+                                                erp, short_preamble);
+        }
+
+        return cpu_to_le16(dur);
+}
+EXPORT_SYMBOL(ieee80211_ctstoself_duration);
+
+void ieee80211_rts_get(struct ieee80211_hw *hw,
+                       const void *frame, size_t frame_len,
+                       const struct ieee80211_tx_control *frame_txctl,
+                       struct ieee80211_rts *rts)
+{
+        const struct ieee80211_hdr *hdr = frame;
+        u16 fctl;
+
+        fctl = IEEE80211_FTYPE_CTL | IEEE80211_STYPE_RTS;
+        rts->frame_control = cpu_to_le16(fctl);
+        rts->duration = ieee80211_rts_duration(hw, frame_len, frame_txctl);
+        memcpy(rts->ra, hdr->addr1, sizeof(rts->ra));
+        memcpy(rts->ta, hdr->addr2, sizeof(rts->ta));
+}
+EXPORT_SYMBOL(ieee80211_rts_get);
+
+void ieee80211_ctstoself_get(struct ieee80211_hw *hw,
+                             const void *frame, size_t frame_len,
+                             const struct ieee80211_tx_control *frame_txctl,
+                             struct ieee80211_cts *cts)
+{
+        const struct ieee80211_hdr *hdr = frame;
+        u16 fctl;
+
+        fctl = IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTS;
+        cts->frame_control = cpu_to_le16(fctl);
+        cts->duration = ieee80211_ctstoself_duration(hw, frame_len, frame_txctl);
+        memcpy(cts->ra, hdr->addr1, sizeof(cts->ra));
+}
+EXPORT_SYMBOL(ieee80211_ctstoself_get);
+
+struct sk_buff *
+ieee80211_get_buffered_bc(struct ieee80211_hw *hw, int if_id,
+                          struct ieee80211_tx_control *control)
+{
+        struct ieee80211_local *local = hw_to_local(hw);
+        struct sk_buff *skb;
+        struct sta_info *sta;
+        ieee80211_tx_handler *handler;
+        struct ieee80211_txrx_data tx;
+        ieee80211_txrx_result res = TXRX_DROP;
+        struct net_device *bdev;
+        struct ieee80211_sub_if_data *sdata;
+        struct ieee80211_if_ap *bss = NULL;
+
+        bdev = dev_get_by_index(if_id);
+        if (bdev) {
+                sdata = IEEE80211_DEV_TO_SUB_IF(bdev);
+                bss = &sdata->u.ap;
+                dev_put(bdev);
+        }
+        if (!bss || sdata->type != IEEE80211_IF_TYPE_AP || !bss->beacon_head)
+                return NULL;
+
+        if (bss->dtim_count != 0)
+                return NULL; /* send buffered bc/mc only after DTIM beacon */
+        memset(control, 0, sizeof(*control));
+        while (1) {
+                skb = skb_dequeue(&bss->ps_bc_buf);
+                if (!skb)
+                        return NULL;
+                local->total_ps_buffered--;
+
+                if (!skb_queue_empty(&bss->ps_bc_buf) && skb->len >= 2) {
+                        struct ieee80211_hdr *hdr =
+                                (struct ieee80211_hdr *) skb->data;
+                        /* more buffered multicast/broadcast frames ==> set
+                         * MoreData flag in IEEE 802.11 header to inform PS
+                         * STAs */
+                        hdr->frame_control |=
+                                cpu_to_le16(IEEE80211_FCTL_MOREDATA);
+                }
+
+                if (ieee80211_tx_prepare(&tx, skb, local->mdev, control) == 0)
+                        break;
+                dev_kfree_skb_any(skb);
+        }
+        sta = tx.sta;
+        tx.u.tx.ps_buffered = 1;
+
+        for (handler = local->tx_handlers; *handler != NULL; handler++) {
+                res = (*handler)(&tx);
+                if (res == TXRX_DROP || res == TXRX_QUEUED)
+                        break;
+        }
+        dev_put(tx.dev);
+        skb = tx.skb; /* handlers are allowed to change skb */
+
+        if (res == TXRX_DROP) {
+                I802_DEBUG_INC(local->tx_handlers_drop);
+                dev_kfree_skb(skb);
+                skb = NULL;
+        } else if (res == TXRX_QUEUED) {
+                I802_DEBUG_INC(local->tx_handlers_queued);
+                skb = NULL;
+        }
+
+        if (sta)
+                sta_info_put(sta);
+
+        return skb;
+}
+EXPORT_SYMBOL(ieee80211_get_buffered_bc);
+
+static int __ieee80211_if_config(struct net_device *dev,
+                                 struct sk_buff *beacon,
+                                 struct ieee80211_tx_control *control)
+{
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_if_conf conf;
+        static u8 scan_bssid[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+
+        if (!local->ops->config_interface || !netif_running(dev))
+                return 0;
+
+        memset(&conf, 0, sizeof(conf));
+        conf.type = sdata->type;
+        if (sdata->type == IEEE80211_IF_TYPE_STA ||
+            sdata->type == IEEE80211_IF_TYPE_IBSS) {
+                if (local->sta_scanning &&
+                    local->scan_dev == dev)
+                        conf.bssid = scan_bssid;
+                else
+                        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;
+        }
+        return local->ops->config_interface(local_to_hw(local),
+                                           dev->ifindex, &conf);
+}
+
+int ieee80211_if_config(struct net_device *dev)
+{
+        return __ieee80211_if_config(dev, NULL, NULL);
+}
+
+int ieee80211_if_config_beacon(struct net_device *dev)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_tx_control control;
+        struct sk_buff *skb;
+
+        if (!(local->hw.flags & IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE))
+                return 0;
+        skb = ieee80211_beacon_get(local_to_hw(local), dev->ifindex, &control);
+        if (!skb)
+                return -ENOMEM;
+        return __ieee80211_if_config(dev, skb, &control);
+}
+
+int ieee80211_hw_config(struct ieee80211_local *local)
+{
+        struct ieee80211_hw_mode *mode;
+        struct ieee80211_channel *chan;
+        int ret = 0;
+
+        if (local->sta_scanning) {
+                chan = local->scan_channel;
+                mode = local->scan_hw_mode;
+        } else {
+                chan = local->oper_channel;
+                mode = local->oper_hw_mode;
+        }
+
+        local->hw.conf.channel = chan->chan;
+        local->hw.conf.channel_val = chan->val;
+        local->hw.conf.power_level = chan->power_level;
+        local->hw.conf.freq = chan->freq;
+        local->hw.conf.phymode = mode->mode;
+        local->hw.conf.antenna_max = chan->antenna_max;
+        local->hw.conf.chan = chan;
+        local->hw.conf.mode = mode;
+
+#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
+        printk(KERN_DEBUG "HW CONFIG: channel=%d freq=%d "
+               "phymode=%d\n", local->hw.conf.channel, local->hw.conf.freq,
+               local->hw.conf.phymode);
+#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
+
+        if (local->ops->config)
+                ret = local->ops->config(local_to_hw(local), &local->hw.conf);
+
+        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)
+{
+        struct ieee80211_local *local = hw_to_local(hw);
+        struct ieee80211_sub_if_data *sdata = *ptr;
+        struct dev_mc_list *mc;
+
+        if (!prev) {
+                WARN_ON(sdata);
+                sdata = NULL;
+        }
+        if (!prev || !prev->next) {
+                if (sdata)
+                        sdata = list_entry(sdata->list.next,
+                                           struct ieee80211_sub_if_data, list);
+                else
+                        sdata = list_entry(local->sub_if_list.next,
+                                           struct ieee80211_sub_if_data, list);
+                if (&sdata->list != &local->sub_if_list)
+                        mc = sdata->dev->mc_list;
+                else
+                        mc = NULL;
+        } else
+                mc = prev->next;
+
+        *ptr = sdata;
+        return mc;
+}
+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) &&
+            local->ops->add_interface) {
+                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);
+
+        if (local->ops->add_interface) {
+                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;
+                }
+        } else {
+                if (sdata->type != IEEE80211_IF_TYPE_STA)
+                        return -EOPNOTSUPP;
+                if (local->open_count > 0)
+                        return -ENOBUFS;
+        }
+
+        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);
+
+        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;
+}
+
+static inline int ieee80211_bssid_match(const u8 *raddr, const u8 *addr)
+{
+        return compare_ether_addr(raddr, addr) == 0 ||
+               is_broadcast_ether_addr(raddr);
+}
+
+
+static ieee80211_txrx_result
+ieee80211_rx_h_data(struct ieee80211_txrx_data *rx)
+{
+        struct net_device *dev = rx->dev;
+        struct ieee80211_local *local = rx->local;
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) rx->skb->data;
+        u16 fc, hdrlen, ethertype;
+        u8 *payload;
+        u8 dst[ETH_ALEN];
+        u8 src[ETH_ALEN];
+        struct sk_buff *skb = rx->skb, *skb2;
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+
+        fc = rx->fc;
+        if (unlikely((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA))
+                return TXRX_CONTINUE;
+
+        if (unlikely(!WLAN_FC_DATA_PRESENT(fc)))
+                return TXRX_DROP;
+
+        hdrlen = ieee80211_get_hdrlen(fc);
+
+        /* convert IEEE 802.11 header + possible LLC headers into Ethernet
+         * header
+         * IEEE 802.11 address fields:
+         * ToDS FromDS Addr1 Addr2 Addr3 Addr4
+         *   0     0   DA    SA    BSSID n/a
+         *   0     1   DA    BSSID SA    n/a
+         *   1     0   BSSID SA    DA    n/a
+         *   1     1   RA    TA    DA    SA
+         */
+
+        switch (fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) {
+        case IEEE80211_FCTL_TODS:
+                /* BSSID SA DA */
+                memcpy(dst, hdr->addr3, ETH_ALEN);
+                memcpy(src, hdr->addr2, ETH_ALEN);
+
+                if (unlikely(sdata->type != IEEE80211_IF_TYPE_AP &&
+                             sdata->type != IEEE80211_IF_TYPE_VLAN)) {
+                        printk(KERN_DEBUG "%s: dropped ToDS frame (BSSID="
+                               MAC_FMT " SA=" MAC_FMT " DA=" MAC_FMT ")\n",
+                               dev->name, MAC_ARG(hdr->addr1),
+                               MAC_ARG(hdr->addr2), MAC_ARG(hdr->addr3));
+                        return TXRX_DROP;
+                }
+                break;
+        case (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS):
+                /* RA TA DA SA */
+                memcpy(dst, hdr->addr3, ETH_ALEN);
+                memcpy(src, hdr->addr4, ETH_ALEN);
+
+                if (unlikely(sdata->type != IEEE80211_IF_TYPE_WDS)) {
+                        printk(KERN_DEBUG "%s: dropped FromDS&ToDS frame (RA="
+                               MAC_FMT " TA=" MAC_FMT " DA=" MAC_FMT " SA="
+                               MAC_FMT ")\n",
+                               rx->dev->name, MAC_ARG(hdr->addr1),
+                               MAC_ARG(hdr->addr2), MAC_ARG(hdr->addr3),
+                               MAC_ARG(hdr->addr4));
+                        return TXRX_DROP;
+                }
+                break;
+        case IEEE80211_FCTL_FROMDS:
+                /* DA BSSID SA */
+                memcpy(dst, hdr->addr1, ETH_ALEN);
+                memcpy(src, hdr->addr3, ETH_ALEN);
+
+                if (sdata->type != IEEE80211_IF_TYPE_STA) {
+                        return TXRX_DROP;
+                }
+                break;
+        case 0:
+                /* DA SA BSSID */
+                memcpy(dst, hdr->addr1, ETH_ALEN);
+                memcpy(src, hdr->addr2, ETH_ALEN);
+
+                if (sdata->type != IEEE80211_IF_TYPE_IBSS) {
+                        if (net_ratelimit()) {
+                                printk(KERN_DEBUG "%s: dropped IBSS frame (DA="
+                                       MAC_FMT " SA=" MAC_FMT " BSSID=" MAC_FMT
+                                       ")\n",
+                                       dev->name, MAC_ARG(hdr->addr1),
+                                       MAC_ARG(hdr->addr2),
+                                       MAC_ARG(hdr->addr3));
+                        }
+                        return TXRX_DROP;
+                }
+                break;
+        }
+
+        payload = skb->data + hdrlen;
+
+        if (unlikely(skb->len - hdrlen < 8)) {
+                if (net_ratelimit()) {
+                        printk(KERN_DEBUG "%s: RX too short data frame "
+                               "payload\n", dev->name);
+                }
+                return TXRX_DROP;
+        }
+
+        ethertype = (payload[6] << 8) | payload[7];
+
+        if (likely((compare_ether_addr(payload, rfc1042_header) == 0 &&
+                    ethertype != ETH_P_AARP && ethertype != ETH_P_IPX) ||
+                   compare_ether_addr(payload, bridge_tunnel_header) == 0)) {
+                /* remove RFC1042 or Bridge-Tunnel encapsulation and
+                 * replace EtherType */
+                skb_pull(skb, hdrlen + 6);
+                memcpy(skb_push(skb, ETH_ALEN), src, ETH_ALEN);
+                memcpy(skb_push(skb, ETH_ALEN), dst, ETH_ALEN);
+        } else {
+                struct ethhdr *ehdr;
+                __be16 len;
+                skb_pull(skb, hdrlen);
+                len = htons(skb->len);
+                ehdr = (struct ethhdr *) skb_push(skb, sizeof(struct ethhdr));
+                memcpy(ehdr->h_dest, dst, ETH_ALEN);
+                memcpy(ehdr->h_source, src, ETH_ALEN);
+                ehdr->h_proto = len;
+        }
+        skb->dev = dev;
+
+        skb2 = NULL;
+
+        sdata->stats.rx_packets++;
+        sdata->stats.rx_bytes += skb->len;
+
+        if (local->bridge_packets && (sdata->type == IEEE80211_IF_TYPE_AP
+            || sdata->type == IEEE80211_IF_TYPE_VLAN) && rx->u.rx.ra_match) {
+                if (is_multicast_ether_addr(skb->data)) {
+                        /* send multicast frames both to higher layers in
+                         * local net stack and back to the wireless media */
+                        skb2 = skb_copy(skb, GFP_ATOMIC);
+                        if (!skb2)
+                                printk(KERN_DEBUG "%s: failed to clone "
+                                       "multicast frame\n", dev->name);
+                } else {
+                        struct sta_info *dsta;
+                        dsta = sta_info_get(local, skb->data);
+                        if (dsta && !dsta->dev) {
+                                printk(KERN_DEBUG "Station with null dev "
+                                       "structure!\n");
+                        } else if (dsta && dsta->dev == dev) {
+                                /* Destination station is associated to this
+                                 * AP, so send the frame directly to it and
+                                 * do not pass the frame to local net stack.
+                                 */
+                                skb2 = skb;
+                                skb = NULL;
+                        }
+                        if (dsta)
+                                sta_info_put(dsta);
+                }
+        }
+
+        if (skb) {
+                /* deliver to local stack */
+                skb->protocol = eth_type_trans(skb, dev);
+                memset(skb->cb, 0, sizeof(skb->cb));
+                netif_rx(skb);
+        }
+
+        if (skb2) {
+                /* send to wireless media */
+                skb2->protocol = __constant_htons(ETH_P_802_3);
+                skb_set_network_header(skb2, 0);
+                skb_set_mac_header(skb2, 0);
+                dev_queue_xmit(skb2);
+        }
+
+        return TXRX_QUEUED;
+}
+
+
+static struct ieee80211_rate *
+ieee80211_get_rate(struct ieee80211_local *local, int phymode, int hw_rate)
+{
+        struct ieee80211_hw_mode *mode;
+        int r;
+
+        list_for_each_entry(mode, &local->modes_list, list) {
+                if (mode->mode != phymode)
+                        continue;
+                for (r = 0; r < mode->num_rates; r++) {
+                        struct ieee80211_rate *rate = &mode->rates[r];
+                        if (rate->val == hw_rate ||
+                            (rate->flags & IEEE80211_RATE_PREAMBLE2 &&
+                             rate->val2 == hw_rate))
+                                return 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);
+}
+
+static void
+ieee80211_rx_monitor(struct net_device *dev, struct sk_buff *skb,
+                     struct ieee80211_rx_status *status)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sub_if_data *sdata;
+        struct ieee80211_rate *rate;
+        struct ieee80211_rtap_hdr {
+                struct ieee80211_radiotap_header hdr;
+                u8 flags;
+                u8 rate;
+                __le16 chan_freq;
+                __le16 chan_flags;
+                u8 antsignal;
+        } __attribute__ ((packed)) *rthdr;
+
+        skb->dev = dev;
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+
+        if (status->flag & RX_FLAG_RADIOTAP)
+                goto out;
+
+        if (skb_headroom(skb) < sizeof(*rthdr)) {
+                I802_DEBUG_INC(local->rx_expand_skb_head);
+                if (pskb_expand_head(skb, sizeof(*rthdr), 0, GFP_ATOMIC)) {
+                        dev_kfree_skb(skb);
+                        return;
+                }
+        }
+
+        rthdr = (struct ieee80211_rtap_hdr *) skb_push(skb, sizeof(*rthdr));
+        memset(rthdr, 0, sizeof(*rthdr));
+        rthdr->hdr.it_len = cpu_to_le16(sizeof(*rthdr));
+        rthdr->hdr.it_present =
+                cpu_to_le32((1 << IEEE80211_RADIOTAP_FLAGS) |
+                            (1 << IEEE80211_RADIOTAP_RATE) |
+                            (1 << IEEE80211_RADIOTAP_CHANNEL) |
+                            (1 << IEEE80211_RADIOTAP_DB_ANTSIGNAL));
+        rthdr->flags = local->hw.flags & IEEE80211_HW_RX_INCLUDES_FCS ?
+                       IEEE80211_RADIOTAP_F_FCS : 0;
+        rate = ieee80211_get_rate(local, status->phymode, status->rate);
+        if (rate)
+                rthdr->rate = rate->rate / 5;
+        rthdr->chan_freq = cpu_to_le16(status->freq);
+        rthdr->chan_flags =
+                status->phymode == MODE_IEEE80211A ?
+                cpu_to_le16(IEEE80211_CHAN_OFDM | IEEE80211_CHAN_5GHZ) :
+                cpu_to_le16(IEEE80211_CHAN_DYN | IEEE80211_CHAN_2GHZ);
+        rthdr->antsignal = status->ssi;
+
+ out:
+        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);
+
+int ieee80211_set_aid_for_sta(struct ieee80211_hw *hw, u8 *peer_address,
+                              u16 aid)
+{
+        struct sk_buff *skb;
+        struct ieee80211_msg_set_aid_for_sta *msg;
+        struct ieee80211_local *local = hw_to_local(hw);
+
+        /* unlikely because if this event only happens for APs,
+         * which require an open ap device. */
+        if (unlikely(!local->apdev))
+                return 0;
+
+        skb = dev_alloc_skb(sizeof(struct ieee80211_frame_info) +
+                            sizeof(struct ieee80211_msg_set_aid_for_sta));
+
+        if (!skb)
+                return -ENOMEM;
+        skb_reserve(skb, sizeof(struct ieee80211_frame_info));
+
+        msg = (struct ieee80211_msg_set_aid_for_sta *)
+                skb_put(skb, sizeof(struct ieee80211_msg_set_aid_for_sta));
+        memcpy(msg->sta_address, peer_address, ETH_ALEN);
+        msg->aid = aid;
+
+        ieee80211_rx_mgmt(local, skb, NULL, ieee80211_msg_set_aid_for_sta);
+        return 0;
+}
+EXPORT_SYMBOL(ieee80211_set_aid_for_sta);
+
+static void ap_sta_ps_start(struct net_device *dev, struct sta_info *sta)
+{
+        struct ieee80211_sub_if_data *sdata;
+        sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev);
+
+        if (sdata->bss)
+                atomic_inc(&sdata->bss->num_sta_ps);
+        sta->flags |= WLAN_STA_PS;
+        sta->pspoll = 0;
+#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
+        printk(KERN_DEBUG "%s: STA " MAC_FMT " aid %d enters power "
+               "save mode\n", dev->name, MAC_ARG(sta->addr), sta->aid);
+#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
+}
+
+
+static int ap_sta_ps_end(struct net_device *dev, struct sta_info *sta)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct sk_buff *skb;
+        int sent = 0;
+        struct ieee80211_sub_if_data *sdata;
+        struct ieee80211_tx_packet_data *pkt_data;
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev);
+        if (sdata->bss)
+                atomic_dec(&sdata->bss->num_sta_ps);
+        sta->flags &= ~(WLAN_STA_PS | WLAN_STA_TIM);
+        sta->pspoll = 0;
+        if (!skb_queue_empty(&sta->ps_tx_buf)) {
+                if (local->ops->set_tim)
+                        local->ops->set_tim(local_to_hw(local), sta->aid, 0);
+                if (sdata->bss)
+                        bss_tim_clear(local, sdata->bss, sta->aid);
+        }
+#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
+        printk(KERN_DEBUG "%s: STA " MAC_FMT " aid %d exits power "
+               "save mode\n", dev->name, MAC_ARG(sta->addr), sta->aid);
+#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
+        /* Send all buffered frames to the station */
+        while ((skb = skb_dequeue(&sta->tx_filtered)) != NULL) {
+                pkt_data = (struct ieee80211_tx_packet_data *) skb->cb;
+                sent++;
+                pkt_data->requeue = 1;
+                dev_queue_xmit(skb);
+        }
+        while ((skb = skb_dequeue(&sta->ps_tx_buf)) != NULL) {
+                pkt_data = (struct ieee80211_tx_packet_data *) skb->cb;
+                local->total_ps_buffered--;
+                sent++;
+#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
+                printk(KERN_DEBUG "%s: STA " MAC_FMT " aid %d send PS frame "
+                       "since STA not sleeping anymore\n", dev->name,
+                       MAC_ARG(sta->addr), sta->aid);
+#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
+                pkt_data->requeue = 1;
+                dev_queue_xmit(skb);
+        }
+
+        return sent;
+}
+
+
+static ieee80211_txrx_result
+ieee80211_rx_h_ps_poll(struct ieee80211_txrx_data *rx)
+{
+        struct sk_buff *skb;
+        int no_pending_pkts;
+
+        if (likely(!rx->sta ||
+                   (rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_CTL ||
+                   (rx->fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_PSPOLL ||
+                   !rx->u.rx.ra_match))
+                return TXRX_CONTINUE;
+
+        skb = skb_dequeue(&rx->sta->tx_filtered);
+        if (!skb) {
+                skb = skb_dequeue(&rx->sta->ps_tx_buf);
+                if (skb)
+                        rx->local->total_ps_buffered--;
+        }
+        no_pending_pkts = skb_queue_empty(&rx->sta->tx_filtered) &&
+                skb_queue_empty(&rx->sta->ps_tx_buf);
+
+        if (skb) {
+                struct ieee80211_hdr *hdr =
+                        (struct ieee80211_hdr *) skb->data;
+
+                /* tell TX path to send one frame even though the STA may
+                 * still remain is PS mode after this frame exchange */
+                rx->sta->pspoll = 1;
+
+#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
+                printk(KERN_DEBUG "STA " MAC_FMT " aid %d: PS Poll (entries "
+                       "after %d)\n",
+                       MAC_ARG(rx->sta->addr), rx->sta->aid,
+                       skb_queue_len(&rx->sta->ps_tx_buf));
+#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
+
+                /* Use MoreData flag to indicate whether there are more
+                 * buffered frames for this STA */
+                if (no_pending_pkts) {
+                        hdr->frame_control &= cpu_to_le16(~IEEE80211_FCTL_MOREDATA);
+                        rx->sta->flags &= ~WLAN_STA_TIM;
+                } else
+                        hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_MOREDATA);
+
+                dev_queue_xmit(skb);
+
+                if (no_pending_pkts) {
+                        if (rx->local->ops->set_tim)
+                                rx->local->ops->set_tim(local_to_hw(rx->local),
+                                                       rx->sta->aid, 0);
+                        if (rx->sdata->bss)
+                                bss_tim_clear(rx->local, rx->sdata->bss, rx->sta->aid);
+                }
+#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
+        } else if (!rx->u.rx.sent_ps_buffered) {
+                printk(KERN_DEBUG "%s: STA " MAC_FMT " sent PS Poll even "
+                       "though there is no buffered frames for it\n",
+                       rx->dev->name, MAC_ARG(rx->sta->addr));
+#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
+
+        }
+
+        /* Free PS Poll skb here instead of returning TXRX_DROP that would
+         * count as an dropped frame. */
+        dev_kfree_skb(rx->skb);
+
+        return TXRX_QUEUED;
+}
+
+
+static inline struct ieee80211_fragment_entry *
+ieee80211_reassemble_add(struct ieee80211_sub_if_data *sdata,
+                         unsigned int frag, unsigned int seq, int rx_queue,
+                         struct sk_buff **skb)
+{
+        struct ieee80211_fragment_entry *entry;
+        int idx;
+
+        idx = sdata->fragment_next;
+        entry = &sdata->fragments[sdata->fragment_next++];
+        if (sdata->fragment_next >= IEEE80211_FRAGMENT_MAX)
+                sdata->fragment_next = 0;
+
+        if (!skb_queue_empty(&entry->skb_list)) {
+#ifdef CONFIG_MAC80211_DEBUG
+                struct ieee80211_hdr *hdr =
+                        (struct ieee80211_hdr *) entry->skb_list.next->data;
+                printk(KERN_DEBUG "%s: RX reassembly removed oldest "
+                       "fragment entry (idx=%d age=%lu seq=%d last_frag=%d "
+                       "addr1=" MAC_FMT " addr2=" MAC_FMT "\n",
+                       sdata->dev->name, idx,
+                       jiffies - entry->first_frag_time, entry->seq,
+                       entry->last_frag, MAC_ARG(hdr->addr1),
+                       MAC_ARG(hdr->addr2));
+#endif /* CONFIG_MAC80211_DEBUG */
+                __skb_queue_purge(&entry->skb_list);
+        }
+
+        __skb_queue_tail(&entry->skb_list, *skb); /* no need for locking */
+        *skb = NULL;
+        entry->first_frag_time = jiffies;
+        entry->seq = seq;
+        entry->rx_queue = rx_queue;
+        entry->last_frag = frag;
+        entry->ccmp = 0;
+        entry->extra_len = 0;
+
+        return entry;
+}
+
+
+static inline struct ieee80211_fragment_entry *
+ieee80211_reassemble_find(struct ieee80211_sub_if_data *sdata,
+                          u16 fc, unsigned int frag, unsigned int seq,
+                          int rx_queue, struct ieee80211_hdr *hdr)
+{
+        struct ieee80211_fragment_entry *entry;
+        int i, idx;
+
+        idx = sdata->fragment_next;
+        for (i = 0; i < IEEE80211_FRAGMENT_MAX; i++) {
+                struct ieee80211_hdr *f_hdr;
+                u16 f_fc;
+
+                idx--;
+                if (idx < 0)
+                        idx = IEEE80211_FRAGMENT_MAX - 1;
+
+                entry = &sdata->fragments[idx];
+                if (skb_queue_empty(&entry->skb_list) || entry->seq != seq ||
+                    entry->rx_queue != rx_queue ||
+                    entry->last_frag + 1 != frag)
+                        continue;
+
+                f_hdr = (struct ieee80211_hdr *) entry->skb_list.next->data;
+                f_fc = le16_to_cpu(f_hdr->frame_control);
+
+                if ((fc & IEEE80211_FCTL_FTYPE) != (f_fc & IEEE80211_FCTL_FTYPE) ||
+                    compare_ether_addr(hdr->addr1, f_hdr->addr1) != 0 ||
+                    compare_ether_addr(hdr->addr2, f_hdr->addr2) != 0)
+                        continue;
+
+                if (entry->first_frag_time + 2 * HZ < jiffies) {
+                        __skb_queue_purge(&entry->skb_list);
+                        continue;
+                }
+                return entry;
+        }
+
+        return NULL;
+}
+
+
+static ieee80211_txrx_result
+ieee80211_rx_h_defragment(struct ieee80211_txrx_data *rx)
+{
+        struct ieee80211_hdr *hdr;
+        u16 sc;
+        unsigned int frag, seq;
+        struct ieee80211_fragment_entry *entry;
+        struct sk_buff *skb;
+
+        hdr = (struct ieee80211_hdr *) rx->skb->data;
+        sc = le16_to_cpu(hdr->seq_ctrl);
+        frag = sc & IEEE80211_SCTL_FRAG;
+
+        if (likely((!(rx->fc & IEEE80211_FCTL_MOREFRAGS) && frag == 0) ||
+                   (rx->skb)->len < 24 ||
+                   is_multicast_ether_addr(hdr->addr1))) {
+                /* not fragmented */
+                goto out;
+        }
+        I802_DEBUG_INC(rx->local->rx_handlers_fragments);
+
+        seq = (sc & IEEE80211_SCTL_SEQ) >> 4;
+
+        if (frag == 0) {
+                /* This is the first fragment of a new frame. */
+                entry = ieee80211_reassemble_add(rx->sdata, frag, seq,
+                                                 rx->u.rx.queue, &(rx->skb));
+                if (rx->key && rx->key->alg == ALG_CCMP &&
+                    (rx->fc & IEEE80211_FCTL_PROTECTED)) {
+                        /* Store CCMP PN so that we can verify that the next
+                         * fragment has a sequential PN value. */
+                        entry->ccmp = 1;
+                        memcpy(entry->last_pn,
+                               rx->key->u.ccmp.rx_pn[rx->u.rx.queue],
+                               CCMP_PN_LEN);
+                }
+                return TXRX_QUEUED;
+        }
+
+        /* This is a fragment for a frame that should already be pending in
+         * fragment cache. Add this fragment to the end of the pending entry.
+         */
+        entry = ieee80211_reassemble_find(rx->sdata, rx->fc, frag, seq,
+                                          rx->u.rx.queue, hdr);
+        if (!entry) {
+                I802_DEBUG_INC(rx->local->rx_handlers_drop_defrag);
+                return TXRX_DROP;
+        }
+
+        /* Verify that MPDUs within one MSDU have sequential PN values.
+         * (IEEE 802.11i, 8.3.3.4.5) */
+        if (entry->ccmp) {
+                int i;
+                u8 pn[CCMP_PN_LEN], *rpn;
+                if (!rx->key || rx->key->alg != ALG_CCMP)
+                        return TXRX_DROP;
+                memcpy(pn, entry->last_pn, CCMP_PN_LEN);
+                for (i = CCMP_PN_LEN - 1; i >= 0; i--) {
+                        pn[i]++;
+                        if (pn[i])
+                                break;
+                }
+                rpn = rx->key->u.ccmp.rx_pn[rx->u.rx.queue];
+                if (memcmp(pn, rpn, CCMP_PN_LEN) != 0) {
+                        printk(KERN_DEBUG "%s: defrag: CCMP PN not sequential"
+                               " A2=" MAC_FMT " PN=%02x%02x%02x%02x%02x%02x "
+                               "(expected %02x%02x%02x%02x%02x%02x)\n",
+                               rx->dev->name, MAC_ARG(hdr->addr2),
+                               rpn[0], rpn[1], rpn[2], rpn[3], rpn[4], rpn[5],
+                               pn[0], pn[1], pn[2], pn[3], pn[4], pn[5]);
+                        return TXRX_DROP;
+                }
+                memcpy(entry->last_pn, pn, CCMP_PN_LEN);
+        }
+
+        skb_pull(rx->skb, ieee80211_get_hdrlen(rx->fc));
+        __skb_queue_tail(&entry->skb_list, rx->skb);
+        entry->last_frag = frag;
+        entry->extra_len += rx->skb->len;
+        if (rx->fc & IEEE80211_FCTL_MOREFRAGS) {
+                rx->skb = NULL;
+                return TXRX_QUEUED;
+        }
+
+        rx->skb = __skb_dequeue(&entry->skb_list);
+        if (skb_tailroom(rx->skb) < entry->extra_len) {
+                I802_DEBUG_INC(rx->local->rx_expand_skb_head2);
+                if (unlikely(pskb_expand_head(rx->skb, 0, entry->extra_len,
+                                              GFP_ATOMIC))) {
+                        I802_DEBUG_INC(rx->local->rx_handlers_drop_defrag);
+                        __skb_queue_purge(&entry->skb_list);
+                        return TXRX_DROP;
+                }
+        }
+        while ((skb = __skb_dequeue(&entry->skb_list)))
+                memcpy(skb_put(rx->skb, skb->len), skb->data, skb->len);
+
+        /* Complete frame has been reassembled - process it now */
+        rx->fragmented = 1;
+
+ out:
+        if (rx->sta)
+                rx->sta->rx_packets++;
+        if (is_multicast_ether_addr(hdr->addr1))
+                rx->local->dot11MulticastReceivedFrameCount++;
+        else
+                ieee80211_led_rx(rx->local);
+        return TXRX_CONTINUE;
+}
+
+
+static ieee80211_txrx_result
+ieee80211_rx_h_monitor(struct ieee80211_txrx_data *rx)
+{
+        if (rx->sdata->type == IEEE80211_IF_TYPE_MNTR) {
+                ieee80211_rx_monitor(rx->dev, rx->skb, rx->u.rx.status);
+                return TXRX_QUEUED;
+        }
+
+        if (rx->u.rx.status->flag & RX_FLAG_RADIOTAP)
+                skb_pull(rx->skb, ieee80211_get_radiotap_len(rx->skb));
+
+        return TXRX_CONTINUE;
+}
+
+
+static ieee80211_txrx_result
+ieee80211_rx_h_check(struct ieee80211_txrx_data *rx)
+{
+        struct ieee80211_hdr *hdr;
+        int always_sta_key;
+        hdr = (struct ieee80211_hdr *) rx->skb->data;
+
+        /* Drop duplicate 802.11 retransmissions (IEEE 802.11 Chap. 9.2.9) */
+        if (rx->sta && !is_multicast_ether_addr(hdr->addr1)) {
+                if (unlikely(rx->fc & IEEE80211_FCTL_RETRY &&
+                             rx->sta->last_seq_ctrl[rx->u.rx.queue] ==
+                             hdr->seq_ctrl)) {
+                        if (rx->u.rx.ra_match) {
+                                rx->local->dot11FrameDuplicateCount++;
+                                rx->sta->num_duplicates++;
+                        }
+                        return TXRX_DROP;
+                } else
+                        rx->sta->last_seq_ctrl[rx->u.rx.queue] = hdr->seq_ctrl;
+        }
+
+        if ((rx->local->hw.flags & IEEE80211_HW_RX_INCLUDES_FCS) &&
+            rx->skb->len > FCS_LEN)
+                skb_trim(rx->skb, rx->skb->len - FCS_LEN);
+
+        if (unlikely(rx->skb->len < 16)) {
+                I802_DEBUG_INC(rx->local->rx_handlers_drop_short);
+                return TXRX_DROP;
+        }
+
+        if (!rx->u.rx.ra_match)
+                rx->skb->pkt_type = PACKET_OTHERHOST;
+        else if (compare_ether_addr(rx->dev->dev_addr, hdr->addr1) == 0)
+                rx->skb->pkt_type = PACKET_HOST;
+        else if (is_multicast_ether_addr(hdr->addr1)) {
+                if (is_broadcast_ether_addr(hdr->addr1))
+                        rx->skb->pkt_type = PACKET_BROADCAST;
+                else
+                        rx->skb->pkt_type = PACKET_MULTICAST;
+        } else
+                rx->skb->pkt_type = PACKET_OTHERHOST;
+
+        /* Drop disallowed frame classes based on STA auth/assoc state;
+         * IEEE 802.11, Chap 5.5.
+         *
+         * 80211.o does filtering only based on association state, i.e., it
+         * drops Class 3 frames from not associated stations. hostapd sends
+         * deauth/disassoc frames when needed. In addition, hostapd is
+         * responsible for filtering on both auth and assoc states.
+         */
+        if (unlikely(((rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA ||
+                      ((rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_CTL &&
+                       (rx->fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PSPOLL)) &&
+                     rx->sdata->type != IEEE80211_IF_TYPE_IBSS &&
+                     (!rx->sta || !(rx->sta->flags & WLAN_STA_ASSOC)))) {
+                if ((!(rx->fc & IEEE80211_FCTL_FROMDS) &&
+                     !(rx->fc & IEEE80211_FCTL_TODS) &&
+                     (rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA)
+                    || !rx->u.rx.ra_match) {
+                        /* Drop IBSS frames and frames for other hosts
+                         * silently. */
+                        return TXRX_DROP;
+                }
+
+                if (!rx->local->apdev)
+                        return TXRX_DROP;
+
+                ieee80211_rx_mgmt(rx->local, rx->skb, rx->u.rx.status,
+                                  ieee80211_msg_sta_not_assoc);
+                return TXRX_QUEUED;
+        }
+
+        if (rx->sdata->type == IEEE80211_IF_TYPE_STA)
+                always_sta_key = 0;
+        else
+                always_sta_key = 1;
+
+        if (rx->sta && rx->sta->key && always_sta_key) {
+                rx->key = rx->sta->key;
+        } else {
+                if (rx->sta && rx->sta->key)
+                        rx->key = rx->sta->key;
+                else
+                        rx->key = rx->sdata->default_key;
+
+                if ((rx->local->hw.flags & IEEE80211_HW_WEP_INCLUDE_IV) &&
+                    rx->fc & IEEE80211_FCTL_PROTECTED) {
+                        int keyidx = ieee80211_wep_get_keyidx(rx->skb);
+
+                        if (keyidx >= 0 && keyidx < NUM_DEFAULT_KEYS &&
+                            (!rx->sta || !rx->sta->key || keyidx > 0))
+                                rx->key = rx->sdata->keys[keyidx];
+
+                        if (!rx->key) {
+                                if (!rx->u.rx.ra_match)
+                                        return TXRX_DROP;
+                                printk(KERN_DEBUG "%s: RX WEP frame with "
+                                       "unknown keyidx %d (A1=" MAC_FMT " A2="
+                                       MAC_FMT " A3=" MAC_FMT ")\n",
+                                       rx->dev->name, keyidx,
+                                       MAC_ARG(hdr->addr1),
+                                       MAC_ARG(hdr->addr2),
+                                       MAC_ARG(hdr->addr3));
+                                if (!rx->local->apdev)
+                                        return TXRX_DROP;
+                                ieee80211_rx_mgmt(
+                                        rx->local, rx->skb, rx->u.rx.status,
+                                        ieee80211_msg_wep_frame_unknown_key);
+                                return TXRX_QUEUED;
+                        }
+                }
+        }
+
+        if (rx->fc & IEEE80211_FCTL_PROTECTED && rx->key && rx->u.rx.ra_match) {
+                rx->key->tx_rx_count++;
+                if (unlikely(rx->local->key_tx_rx_threshold &&
+                             rx->key->tx_rx_count >
+                             rx->local->key_tx_rx_threshold)) {
+                        ieee80211_key_threshold_notify(rx->dev, rx->key,
+                                                       rx->sta);
+                }
+        }
+
+        return TXRX_CONTINUE;
+}
+
+
+static ieee80211_txrx_result
+ieee80211_rx_h_sta_process(struct ieee80211_txrx_data *rx)
+{
+        struct sta_info *sta = rx->sta;
+        struct net_device *dev = rx->dev;
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) rx->skb->data;
+
+        if (!sta)
+                return TXRX_CONTINUE;
+
+        /* Update last_rx only for IBSS packets which are for the current
+         * BSSID to avoid keeping the current IBSS network alive in cases where
+         * other STAs are using different BSSID. */
+        if (rx->sdata->type == IEEE80211_IF_TYPE_IBSS) {
+                u8 *bssid = ieee80211_get_bssid(hdr, rx->skb->len);
+                if (compare_ether_addr(bssid, rx->sdata->u.sta.bssid) == 0)
+                        sta->last_rx = jiffies;
+        } else
+        if (!is_multicast_ether_addr(hdr->addr1) ||
+            rx->sdata->type == IEEE80211_IF_TYPE_STA) {
+                /* Update last_rx only for unicast frames in order to prevent
+                 * the Probe Request frames (the only broadcast frames from a
+                 * STA in infrastructure mode) from keeping a connection alive.
+                 */
+                sta->last_rx = jiffies;
+        }
+
+        if (!rx->u.rx.ra_match)
+                return TXRX_CONTINUE;
+
+        sta->rx_fragments++;
+        sta->rx_bytes += rx->skb->len;
+        sta->last_rssi = (sta->last_rssi * 15 +
+                          rx->u.rx.status->ssi) / 16;
+        sta->last_signal = (sta->last_signal * 15 +
+                            rx->u.rx.status->signal) / 16;
+        sta->last_noise = (sta->last_noise * 15 +
+                           rx->u.rx.status->noise) / 16;
+
+        if (!(rx->fc & IEEE80211_FCTL_MOREFRAGS)) {
+                /* Change STA power saving mode only in the end of a frame
+                 * exchange sequence */
+                if ((sta->flags & WLAN_STA_PS) && !(rx->fc & IEEE80211_FCTL_PM))
+                        rx->u.rx.sent_ps_buffered += ap_sta_ps_end(dev, sta);
+                else if (!(sta->flags & WLAN_STA_PS) &&
+                         (rx->fc & IEEE80211_FCTL_PM))
+                        ap_sta_ps_start(dev, sta);
+        }
+
+        /* Drop data::nullfunc frames silently, since they are used only to
+         * control station power saving mode. */
+        if ((rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA &&
+            (rx->fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_NULLFUNC) {
+                I802_DEBUG_INC(rx->local->rx_handlers_drop_nullfunc);
+                /* Update counter and free packet here to avoid counting this
+                 * as a dropped packed. */
+                sta->rx_packets++;
+                dev_kfree_skb(rx->skb);
+                return TXRX_QUEUED;
+        }
+
+        return TXRX_CONTINUE;
+} /* ieee80211_rx_h_sta_process */
+
+
+static ieee80211_txrx_result
+ieee80211_rx_h_wep_weak_iv_detection(struct ieee80211_txrx_data *rx)
+{
+        if (!rx->sta || !(rx->fc & IEEE80211_FCTL_PROTECTED) ||
+            (rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA ||
+            !rx->key || rx->key->alg != ALG_WEP || !rx->u.rx.ra_match)
+                return TXRX_CONTINUE;
+
+        /* Check for weak IVs, if hwaccel did not remove IV from the frame */
+        if ((rx->local->hw.flags & IEEE80211_HW_WEP_INCLUDE_IV) ||
+            rx->key->force_sw_encrypt) {
+                u8 *iv = ieee80211_wep_is_weak_iv(rx->skb, rx->key);
+                if (iv) {
+                        rx->sta->wep_weak_iv_count++;
+                }
+        }
+
+        return TXRX_CONTINUE;
+}
+
+
+static ieee80211_txrx_result
+ieee80211_rx_h_wep_decrypt(struct ieee80211_txrx_data *rx)
+{
+        /* If the device handles decryption totally, skip this test */
+        if (rx->local->hw.flags & IEEE80211_HW_DEVICE_HIDES_WEP)
+                return TXRX_CONTINUE;
+
+        if ((rx->key && rx->key->alg != ALG_WEP) ||
+            !(rx->fc & IEEE80211_FCTL_PROTECTED) ||
+            ((rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA &&
+             ((rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_MGMT ||
+              (rx->fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_AUTH)))
+                return TXRX_CONTINUE;
+
+        if (!rx->key) {
+                printk(KERN_DEBUG "%s: RX WEP frame, but no key set\n",
+                       rx->dev->name);
+                return TXRX_DROP;
+        }
+
+        if (!(rx->u.rx.status->flag & RX_FLAG_DECRYPTED) ||
+            rx->key->force_sw_encrypt) {
+                if (ieee80211_wep_decrypt(rx->local, rx->skb, rx->key)) {
+                        printk(KERN_DEBUG "%s: RX WEP frame, decrypt "
+                               "failed\n", rx->dev->name);
+                        return TXRX_DROP;
+                }
+        } else if (rx->local->hw.flags & IEEE80211_HW_WEP_INCLUDE_IV) {
+                ieee80211_wep_remove_iv(rx->local, rx->skb, rx->key);
+                /* remove ICV */
+                skb_trim(rx->skb, rx->skb->len - 4);
+        }
+
+        return TXRX_CONTINUE;
+}
+
+
+static ieee80211_txrx_result
+ieee80211_rx_h_802_1x_pae(struct ieee80211_txrx_data *rx)
+{
+        if (rx->sdata->eapol && ieee80211_is_eapol(rx->skb) &&
+            rx->sdata->type != IEEE80211_IF_TYPE_STA && rx->u.rx.ra_match) {
+                /* Pass both encrypted and unencrypted EAPOL frames to user
+                 * space for processing. */
+                if (!rx->local->apdev)
+                        return TXRX_DROP;
+                ieee80211_rx_mgmt(rx->local, rx->skb, rx->u.rx.status,
+                                  ieee80211_msg_normal);
+                return TXRX_QUEUED;
+        }
+
+        if (unlikely(rx->sdata->ieee802_1x &&
+                     (rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA &&
+                     (rx->fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_NULLFUNC &&
+                     (!rx->sta || !(rx->sta->flags & WLAN_STA_AUTHORIZED)) &&
+                     !ieee80211_is_eapol(rx->skb))) {
+#ifdef CONFIG_MAC80211_DEBUG
+                struct ieee80211_hdr *hdr =
+                        (struct ieee80211_hdr *) rx->skb->data;
+                printk(KERN_DEBUG "%s: dropped frame from " MAC_FMT
+                       " (unauthorized port)\n", rx->dev->name,
+                       MAC_ARG(hdr->addr2));
+#endif /* CONFIG_MAC80211_DEBUG */
+                return TXRX_DROP;
+        }
+
+        return TXRX_CONTINUE;
+}
+
+
+static ieee80211_txrx_result
+ieee80211_rx_h_drop_unencrypted(struct ieee80211_txrx_data *rx)
+{
+        /*  If the device handles decryption totally, skip this test */
+        if (rx->local->hw.flags & IEEE80211_HW_DEVICE_HIDES_WEP)
+                return TXRX_CONTINUE;
+
+        /* Drop unencrypted frames if key is set. */
+        if (unlikely(!(rx->fc & IEEE80211_FCTL_PROTECTED) &&
+                     (rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA &&
+                     (rx->fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_NULLFUNC &&
+                     (rx->key || rx->sdata->drop_unencrypted) &&
+                     (rx->sdata->eapol == 0 ||
+                      !ieee80211_is_eapol(rx->skb)))) {
+                printk(KERN_DEBUG "%s: RX non-WEP frame, but expected "
+                       "encryption\n", rx->dev->name);
+                return TXRX_DROP;
+        }
+        return TXRX_CONTINUE;
+}
+
+
+static ieee80211_txrx_result
+ieee80211_rx_h_mgmt(struct ieee80211_txrx_data *rx)
+{
+        struct ieee80211_sub_if_data *sdata;
+
+        if (!rx->u.rx.ra_match)
+                return TXRX_DROP;
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(rx->dev);
+        if ((sdata->type == IEEE80211_IF_TYPE_STA ||
+             sdata->type == IEEE80211_IF_TYPE_IBSS) &&
+            !rx->local->user_space_mlme) {
+                ieee80211_sta_rx_mgmt(rx->dev, rx->skb, rx->u.rx.status);
+        } else {
+                /* Management frames are sent to hostapd for processing */
+                if (!rx->local->apdev)
+                        return TXRX_DROP;
+                ieee80211_rx_mgmt(rx->local, rx->skb, rx->u.rx.status,
+                                  ieee80211_msg_normal);
+        }
+        return TXRX_QUEUED;
+}
+
+
+static ieee80211_txrx_result
+ieee80211_rx_h_passive_scan(struct ieee80211_txrx_data *rx)
+{
+        struct ieee80211_local *local = rx->local;
+        struct sk_buff *skb = rx->skb;
+
+        if (unlikely(local->sta_scanning != 0)) {
+                ieee80211_sta_rx_scan(rx->dev, skb, rx->u.rx.status);
+                return TXRX_QUEUED;
+        }
+
+        if (unlikely(rx->u.rx.in_scan)) {
+                /* scanning finished during invoking of handlers */
+                I802_DEBUG_INC(local->rx_handlers_drop_passive_scan);
+                return TXRX_DROP;
+        }
+
+        return TXRX_CONTINUE;
+}
+
+
+static void ieee80211_rx_michael_mic_report(struct net_device *dev,
+                                            struct ieee80211_hdr *hdr,
+                                            struct sta_info *sta,
+                                            struct ieee80211_txrx_data *rx)
+{
+        int keyidx, hdrlen;
+
+        hdrlen = ieee80211_get_hdrlen_from_skb(rx->skb);
+        if (rx->skb->len >= hdrlen + 4)
+                keyidx = rx->skb->data[hdrlen + 3] >> 6;
+        else
+                keyidx = -1;
+
+        /* TODO: verify that this is not triggered by fragmented
+         * frames (hw does not verify MIC for them). */
+        printk(KERN_DEBUG "%s: TKIP hwaccel reported Michael MIC "
+               "failure from " MAC_FMT " to " MAC_FMT " keyidx=%d\n",
+               dev->name, MAC_ARG(hdr->addr2), MAC_ARG(hdr->addr1), keyidx);
+
+        if (!sta) {
+                /* Some hardware versions seem to generate incorrect
+                 * Michael MIC reports; ignore them to avoid triggering
+                 * countermeasures. */
+                printk(KERN_DEBUG "%s: ignored spurious Michael MIC "
+                       "error for unknown address " MAC_FMT "\n",
+                       dev->name, MAC_ARG(hdr->addr2));
+                goto ignore;
+        }
+
+        if (!(rx->fc & IEEE80211_FCTL_PROTECTED)) {
+                printk(KERN_DEBUG "%s: ignored spurious Michael MIC "
+                       "error for a frame with no ISWEP flag (src "
+                       MAC_FMT ")\n", dev->name, MAC_ARG(hdr->addr2));
+                goto ignore;
+        }
+
+        if ((rx->local->hw.flags & IEEE80211_HW_WEP_INCLUDE_IV) &&
+            rx->sdata->type == IEEE80211_IF_TYPE_AP) {
+                keyidx = ieee80211_wep_get_keyidx(rx->skb);
+                /* AP with Pairwise keys support should never receive Michael
+                 * MIC errors for non-zero keyidx because these are reserved
+                 * for group keys and only the AP is sending real multicast
+                 * frames in BSS. */
+                if (keyidx) {
+                        printk(KERN_DEBUG "%s: ignored Michael MIC error for "
+                               "a frame with non-zero keyidx (%d) (src " MAC_FMT
+                               ")\n", dev->name, keyidx, MAC_ARG(hdr->addr2));
+                        goto ignore;
+                }
+        }
+
+        if ((rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA &&
+            ((rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_MGMT ||
+             (rx->fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_AUTH)) {
+                printk(KERN_DEBUG "%s: ignored spurious Michael MIC "
+                       "error for a frame that cannot be encrypted "
+                       "(fc=0x%04x) (src " MAC_FMT ")\n",
+                       dev->name, rx->fc, MAC_ARG(hdr->addr2));
+                goto ignore;
+        }
+
+        do {
+                union iwreq_data wrqu;
+                char *buf = kmalloc(128, GFP_ATOMIC);
+                if (!buf)
+                        break;
+
+                /* TODO: needed parameters: count, key type, TSC */
+                sprintf(buf, "MLME-MICHAELMICFAILURE.indication("
+                        "keyid=%d %scast addr=" MAC_FMT ")",
+                        keyidx, hdr->addr1[0] & 0x01 ? "broad" : "uni",
+                        MAC_ARG(hdr->addr2));
+                memset(&wrqu, 0, sizeof(wrqu));
+                wrqu.data.length = strlen(buf);
+                wireless_send_event(rx->dev, IWEVCUSTOM, &wrqu, buf);
+                kfree(buf);
+        } while (0);
+
+        /* TODO: consider verifying the MIC error report with software
+         * implementation if we get too many spurious reports from the
+         * hardware. */
+        if (!rx->local->apdev)
+                goto ignore;
+        ieee80211_rx_mgmt(rx->local, rx->skb, rx->u.rx.status,
+                          ieee80211_msg_michael_mic_failure);
+        return;
+
+ ignore:
+        dev_kfree_skb(rx->skb);
+        rx->skb = NULL;
+}
+
+static inline ieee80211_txrx_result __ieee80211_invoke_rx_handlers(
+                                struct ieee80211_local *local,
+                                ieee80211_rx_handler *handlers,
+                                struct ieee80211_txrx_data *rx,
+                                struct sta_info *sta)
+{
+        ieee80211_rx_handler *handler;
+        ieee80211_txrx_result res = TXRX_DROP;
+
+        for (handler = handlers; *handler != NULL; handler++) {
+                res = (*handler)(rx);
+                if (res != TXRX_CONTINUE) {
+                        if (res == TXRX_DROP) {
+                                I802_DEBUG_INC(local->rx_handlers_drop);
+                                if (sta)
+                                        sta->rx_dropped++;
+                        }
+                        if (res == TXRX_QUEUED)
+                                I802_DEBUG_INC(local->rx_handlers_queued);
+                        break;
+                }
+        }
+
+        if (res == TXRX_DROP) {
+                dev_kfree_skb(rx->skb);
+        }
+        return res;
+}
+
+static inline void ieee80211_invoke_rx_handlers(struct ieee80211_local *local,
+                                                ieee80211_rx_handler *handlers,
+                                                struct ieee80211_txrx_data *rx,
+                                                struct sta_info *sta)
+{
+        if (__ieee80211_invoke_rx_handlers(local, handlers, rx, sta) ==
+            TXRX_CONTINUE)
+                dev_kfree_skb(rx->skb);
+}
+
+/*
+ * This is the receive path handler. It is called by a low level driver when an
+ * 802.11 MPDU is received from the hardware.
+ */
+void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb,
+                    struct ieee80211_rx_status *status)
+{
+        struct ieee80211_local *local = hw_to_local(hw);
+        struct ieee80211_sub_if_data *sdata;
+        struct sta_info *sta;
+        struct ieee80211_hdr *hdr;
+        struct ieee80211_txrx_data rx;
+        u16 type;
+        int multicast;
+        int radiotap_len = 0;
+
+        if (status->flag & RX_FLAG_RADIOTAP) {
+                radiotap_len = ieee80211_get_radiotap_len(skb);
+                skb_pull(skb, radiotap_len);
+        }
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+        memset(&rx, 0, sizeof(rx));
+        rx.skb = skb;
+        rx.local = local;
+
+        rx.u.rx.status = status;
+        rx.fc = skb->len >= 2 ? le16_to_cpu(hdr->frame_control) : 0;
+        type = rx.fc & IEEE80211_FCTL_FTYPE;
+        if (type == IEEE80211_FTYPE_DATA || type == IEEE80211_FTYPE_MGMT)
+                local->dot11ReceivedFragmentCount++;
+        multicast = is_multicast_ether_addr(hdr->addr1);
+
+        if (skb->len >= 16)
+                sta = rx.sta = sta_info_get(local, hdr->addr2);
+        else
+                sta = rx.sta = NULL;
+
+        if (sta) {
+                rx.dev = sta->dev;
+                rx.sdata = IEEE80211_DEV_TO_SUB_IF(rx.dev);
+        }
+
+        if ((status->flag & RX_FLAG_MMIC_ERROR)) {
+                ieee80211_rx_michael_mic_report(local->mdev, hdr, sta, &rx);
+                goto end;
+        }
+
+        if (unlikely(local->sta_scanning))
+                rx.u.rx.in_scan = 1;
+
+        if (__ieee80211_invoke_rx_handlers(local, local->rx_pre_handlers, &rx,
+                                           sta) != TXRX_CONTINUE)
+                goto end;
+        skb = rx.skb;
+
+        skb_push(skb, radiotap_len);
+        if (sta && !sta->assoc_ap && !(sta->flags & WLAN_STA_WDS) &&
+            !local->iff_promiscs && !multicast) {
+                rx.u.rx.ra_match = 1;
+                ieee80211_invoke_rx_handlers(local, local->rx_handlers, &rx,
+                                             sta);
+        } else {
+                struct ieee80211_sub_if_data *prev = NULL;
+                struct sk_buff *skb_new;
+                u8 *bssid = ieee80211_get_bssid(hdr, skb->len - radiotap_len);
+
+                read_lock(&local->sub_if_lock);
+                list_for_each_entry(sdata, &local->sub_if_list, list) {
+                        rx.u.rx.ra_match = 1;
+                        switch (sdata->type) {
+                        case IEEE80211_IF_TYPE_STA:
+                                if (!bssid)
+                                        continue;
+                                if (!ieee80211_bssid_match(bssid,
+                                                        sdata->u.sta.bssid)) {
+                                        if (!rx.u.rx.in_scan)
+                                                continue;
+                                        rx.u.rx.ra_match = 0;
+                                } else if (!multicast &&
+                                           compare_ether_addr(sdata->dev->dev_addr,
+                                                              hdr->addr1) != 0) {
+                                        if (!sdata->promisc)
+                                                continue;
+                                        rx.u.rx.ra_match = 0;
+                                }
+                                break;
+                        case IEEE80211_IF_TYPE_IBSS:
+                                if (!bssid)
+                                        continue;
+                                if (!ieee80211_bssid_match(bssid,
+                                                        sdata->u.sta.bssid)) {
+                                        if (!rx.u.rx.in_scan)
+                                                continue;
+                                        rx.u.rx.ra_match = 0;
+                                } else if (!multicast &&
+                                           compare_ether_addr(sdata->dev->dev_addr,
+                                                              hdr->addr1) != 0) {
+                                        if (!sdata->promisc)
+                                                continue;
+                                        rx.u.rx.ra_match = 0;
+                                } else if (!sta)
+                                        sta = rx.sta =
+                                                ieee80211_ibss_add_sta(sdata->dev,
+                                                                       skb, bssid,
+                                                                       hdr->addr2);
+                                break;
+                        case IEEE80211_IF_TYPE_AP:
+                                if (!bssid) {
+                                        if (compare_ether_addr(sdata->dev->dev_addr,
+                                                               hdr->addr1) != 0)
+                                                continue;
+                                } else if (!ieee80211_bssid_match(bssid,
+                                                        sdata->dev->dev_addr)) {
+                                        if (!rx.u.rx.in_scan)
+                                                continue;
+                                        rx.u.rx.ra_match = 0;
+                                }
+                                if (sdata->dev == local->mdev &&
+                                    !rx.u.rx.in_scan)
+                                        /* do not receive anything via
+                                         * master device when not scanning */
+                                        continue;
+                                break;
+                        case IEEE80211_IF_TYPE_WDS:
+                                if (bssid ||
+                                    (rx.fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA)
+                                        continue;
+                                if (compare_ether_addr(sdata->u.wds.remote_addr,
+                                                       hdr->addr2) != 0)
+                                        continue;
+                                break;
+                        }
+
+                        if (prev) {
+                                skb_new = skb_copy(skb, GFP_ATOMIC);
+                                if (!skb_new) {
+                                        if (net_ratelimit())
+                                                printk(KERN_DEBUG "%s: failed to copy "
+                                                       "multicast frame for %s",
+                                                       local->mdev->name, prev->dev->name);
+                                        continue;
+                                }
+                                rx.skb = skb_new;
+                                rx.dev = prev->dev;
+                                rx.sdata = prev;
+                                ieee80211_invoke_rx_handlers(local,
+                                                             local->rx_handlers,
+                                                             &rx, sta);
+                        }
+                        prev = sdata;
+                }
+                if (prev) {
+                        rx.skb = skb;
+                        rx.dev = prev->dev;
+                        rx.sdata = prev;
+                        ieee80211_invoke_rx_handlers(local, local->rx_handlers,
+                                                     &rx, sta);
+                } else
+                        dev_kfree_skb(skb);
+                read_unlock(&local->sub_if_lock);
+        }
+
+  end:
+        if (sta)
+                sta_info_put(sta);
+}
+EXPORT_SYMBOL(__ieee80211_rx);
+
+static ieee80211_txrx_result
+ieee80211_tx_h_load_stats(struct ieee80211_txrx_data *tx)
+{
+        struct ieee80211_local *local = tx->local;
+        struct ieee80211_hw_mode *mode = tx->u.tx.mode;
+        struct sk_buff *skb = tx->skb;
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+        u32 load = 0, hdrtime;
+
+        /* TODO: this could be part of tx_status handling, so that the number
+         * of retries would be known; TX rate should in that case be stored
+         * somewhere with the packet */
+
+        /* Estimate total channel use caused by this frame */
+
+        /* 1 bit at 1 Mbit/s takes 1 usec; in channel_use values,
+         * 1 usec = 1/8 * (1080 / 10) = 13.5 */
+
+        if (mode->mode == MODE_IEEE80211A ||
+            mode->mode == MODE_ATHEROS_TURBO ||
+            mode->mode == MODE_ATHEROS_TURBOG ||
+            (mode->mode == MODE_IEEE80211G &&
+             tx->u.tx.rate->flags & IEEE80211_RATE_ERP))
+                hdrtime = CHAN_UTIL_HDR_SHORT;
+        else
+                hdrtime = CHAN_UTIL_HDR_LONG;
+
+        load = hdrtime;
+        if (!is_multicast_ether_addr(hdr->addr1))
+                load += hdrtime;
+
+        if (tx->u.tx.control->flags & IEEE80211_TXCTL_USE_RTS_CTS)
+                load += 2 * hdrtime;
+        else if (tx->u.tx.control->flags & IEEE80211_TXCTL_USE_CTS_PROTECT)
+                load += hdrtime;
+
+        load += skb->len * tx->u.tx.rate->rate_inv;
+
+        if (tx->u.tx.extra_frag) {
+                int i;
+                for (i = 0; i < tx->u.tx.num_extra_frag; i++) {
+                        load += 2 * hdrtime;
+                        load += tx->u.tx.extra_frag[i]->len *
+                                tx->u.tx.rate->rate;
+                }
+        }
+
+        /* Divide channel_use by 8 to avoid wrapping around the counter */
+        load >>= CHAN_UTIL_SHIFT;
+        local->channel_use_raw += load;
+        if (tx->sta)
+                tx->sta->channel_use_raw += load;
+        tx->sdata->channel_use_raw += load;
+
+        return TXRX_CONTINUE;
+}
+
+
+static ieee80211_txrx_result
+ieee80211_rx_h_load_stats(struct ieee80211_txrx_data *rx)
+{
+        struct ieee80211_local *local = rx->local;
+        struct sk_buff *skb = rx->skb;
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+        u32 load = 0, hdrtime;
+        struct ieee80211_rate *rate;
+        struct ieee80211_hw_mode *mode = local->hw.conf.mode;
+        int i;
+
+        /* Estimate total channel use caused by this frame */
+
+        if (unlikely(mode->num_rates < 0))
+                return TXRX_CONTINUE;
+
+        rate = &mode->rates[0];
+        for (i = 0; i < mode->num_rates; i++) {
+                if (mode->rates[i].val == rx->u.rx.status->rate) {
+                        rate = &mode->rates[i];
+                        break;
+                }
+        }
+
+        /* 1 bit at 1 Mbit/s takes 1 usec; in channel_use values,
+         * 1 usec = 1/8 * (1080 / 10) = 13.5 */
+
+        if (mode->mode == MODE_IEEE80211A ||
+            mode->mode == MODE_ATHEROS_TURBO ||
+            mode->mode == MODE_ATHEROS_TURBOG ||
+            (mode->mode == MODE_IEEE80211G &&
+             rate->flags & IEEE80211_RATE_ERP))
+                hdrtime = CHAN_UTIL_HDR_SHORT;
+        else
+                hdrtime = CHAN_UTIL_HDR_LONG;
+
+        load = hdrtime;
+        if (!is_multicast_ether_addr(hdr->addr1))
+                load += hdrtime;
+
+        load += skb->len * rate->rate_inv;
+
+        /* Divide channel_use by 8 to avoid wrapping around the counter */
+        load >>= CHAN_UTIL_SHIFT;
+        local->channel_use_raw += load;
+        if (rx->sta)
+                rx->sta->channel_use_raw += load;
+        rx->u.rx.load = load;
+
+        return TXRX_CONTINUE;
+}
+
+static ieee80211_txrx_result
+ieee80211_rx_h_if_stats(struct ieee80211_txrx_data *rx)
+{
+        rx->sdata->channel_use_raw += rx->u.rx.load;
+        return TXRX_CONTINUE;
+}
+
+static void ieee80211_stat_refresh(unsigned long data)
+{
+        struct ieee80211_local *local = (struct ieee80211_local *) data;
+        struct sta_info *sta;
+        struct ieee80211_sub_if_data *sdata;
+
+        if (!local->stat_time)
+                return;
+
+        /* go through all stations */
+        spin_lock_bh(&local->sta_lock);
+        list_for_each_entry(sta, &local->sta_list, list) {
+                sta->channel_use = (sta->channel_use_raw / local->stat_time) /
+                        CHAN_UTIL_PER_10MS;
+                sta->channel_use_raw = 0;
+        }
+        spin_unlock_bh(&local->sta_lock);
+
+        /* go through all subinterfaces */
+        read_lock(&local->sub_if_lock);
+        list_for_each_entry(sdata, &local->sub_if_list, list) {
+                sdata->channel_use = (sdata->channel_use_raw /
+                                      local->stat_time) / CHAN_UTIL_PER_10MS;
+                sdata->channel_use_raw = 0;
+        }
+        read_unlock(&local->sub_if_lock);
+
+        /* hardware interface */
+        local->channel_use = (local->channel_use_raw /
+                              local->stat_time) / CHAN_UTIL_PER_10MS;
+        local->channel_use_raw = 0;
+
+        local->stat_timer.expires = jiffies + HZ * local->stat_time / 100;
+        add_timer(&local->stat_timer);
+}
+
+
+/* This is a version of the rx handler that can be called from hard irq
+ * context. Post the skb on the queue and schedule the tasklet */
+void ieee80211_rx_irqsafe(struct ieee80211_hw *hw, struct sk_buff *skb,
+                          struct ieee80211_rx_status *status)
+{
+        struct ieee80211_local *local = hw_to_local(hw);
+
+        BUILD_BUG_ON(sizeof(struct ieee80211_rx_status) > sizeof(skb->cb));
+
+        skb->dev = local->mdev;
+        /* copy status into skb->cb for use by tasklet */
+        memcpy(skb->cb, status, sizeof(*status));
+        skb->pkt_type = IEEE80211_RX_MSG;
+        skb_queue_tail(&local->skb_queue, skb);
+        tasklet_schedule(&local->tasklet);
+}
+EXPORT_SYMBOL(ieee80211_rx_irqsafe);
+
+void ieee80211_tx_status_irqsafe(struct ieee80211_hw *hw,
+                                 struct sk_buff *skb,
+                                 struct ieee80211_tx_status *status)
+{
+        struct ieee80211_local *local = hw_to_local(hw);
+        struct ieee80211_tx_status *saved;
+        int tmp;
+
+        skb->dev = local->mdev;
+        saved = kmalloc(sizeof(struct ieee80211_tx_status), GFP_ATOMIC);
+        if (unlikely(!saved)) {
+                if (net_ratelimit())
+                        printk(KERN_WARNING "%s: Not enough memory, "
+                               "dropping tx status", skb->dev->name);
+                /* should be dev_kfree_skb_irq, but due to this function being
+                 * named _irqsafe instead of just _irq we can't be sure that
+                 * people won't call it from non-irq contexts */
+                dev_kfree_skb_any(skb);
+                return;
+        }
+        memcpy(saved, status, sizeof(struct ieee80211_tx_status));
+        /* copy pointer to saved status into skb->cb for use by tasklet */
+        memcpy(skb->cb, &saved, sizeof(saved));
+
+        skb->pkt_type = IEEE80211_TX_STATUS_MSG;
+        skb_queue_tail(status->control.flags & IEEE80211_TXCTL_REQ_TX_STATUS ?
+                       &local->skb_queue : &local->skb_queue_unreliable, skb);
+        tmp = skb_queue_len(&local->skb_queue) +
+                skb_queue_len(&local->skb_queue_unreliable);
+        while (tmp > IEEE80211_IRQSAFE_QUEUE_LIMIT &&
+               (skb = skb_dequeue(&local->skb_queue_unreliable))) {
+                memcpy(&saved, skb->cb, sizeof(saved));
+                kfree(saved);
+                dev_kfree_skb_irq(skb);
+                tmp--;
+                I802_DEBUG_INC(local->tx_status_drop);
+        }
+        tasklet_schedule(&local->tasklet);
+}
+EXPORT_SYMBOL(ieee80211_tx_status_irqsafe);
+
+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_tx_status *tx_status;
+
+        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->type in order to not confuse kernel
+                         * netstack. */
+                        skb->pkt_type = 0;
+                        __ieee80211_rx(local_to_hw(local), skb, &rx_status);
+                        break;
+                case IEEE80211_TX_STATUS_MSG:
+                        /* get pointer to saved status out of skb->cb */
+                        memcpy(&tx_status, skb->cb, sizeof(tx_status));
+                        skb->pkt_type = 0;
+                        ieee80211_tx_status(local_to_hw(local),
+                                            skb, tx_status);
+                        kfree(tx_status);
+                        break;
+                default: /* should never get here! */
+                        printk(KERN_ERR "%s: Unknown message type (%d)\n",
+                               local->mdev->name, skb->pkt_type);
+                        dev_kfree_skb(skb);
+                        break;
+                }
+        }
+}
+
+
+/* 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.
+ * Also, tx_packet_data in cb is restored from tx_control. */
+static void ieee80211_remove_tx_extra(struct ieee80211_local *local,
+                                      struct ieee80211_key *key,
+                                      struct sk_buff *skb,
+                                      struct ieee80211_tx_control *control)
+{
+        int hdrlen, iv_len, mic_len;
+        struct ieee80211_tx_packet_data *pkt_data;
+
+        pkt_data = (struct ieee80211_tx_packet_data *)skb->cb;
+        pkt_data->ifindex = control->ifindex;
+        pkt_data->mgmt_iface = (control->type == IEEE80211_IF_TYPE_MGMT);
+        pkt_data->req_tx_status = !!(control->flags & IEEE80211_TXCTL_REQ_TX_STATUS);
+        pkt_data->do_not_encrypt = !!(control->flags & IEEE80211_TXCTL_DO_NOT_ENCRYPT);
+        pkt_data->requeue = !!(control->flags & IEEE80211_TXCTL_REQUEUE);
+        pkt_data->queue = control->queue;
+
+        hdrlen = ieee80211_get_hdrlen_from_skb(skb);
+
+        if (!key)
+                goto no_key;
+
+        switch (key->alg) {
+        case ALG_WEP:
+                iv_len = WEP_IV_LEN;
+                mic_len = WEP_ICV_LEN;
+                break;
+        case ALG_TKIP:
+                iv_len = TKIP_IV_LEN;
+                mic_len = TKIP_ICV_LEN;
+                break;
+        case ALG_CCMP:
+                iv_len = CCMP_HDR_LEN;
+                mic_len = CCMP_MIC_LEN;
+                break;
+        default:
+                goto no_key;
+        }
+
+        if (skb->len >= mic_len && key->force_sw_encrypt)
+                skb_trim(skb, skb->len - mic_len);
+        if (skb->len >= iv_len && skb->len > hdrlen) {
+                memmove(skb->data + iv_len, skb->data, hdrlen);
+                skb_pull(skb, iv_len);
+        }
+
+no_key:
+        {
+                struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+                u16 fc = le16_to_cpu(hdr->frame_control);
+                if ((fc & 0x8C) == 0x88) /* QoS Control Field */ {
+                        fc &= ~IEEE80211_STYPE_QOS_DATA;
+                        hdr->frame_control = cpu_to_le16(fc);
+                        memmove(skb->data + 2, skb->data, hdrlen - 2);
+                        skb_pull(skb, 2);
+                }
+        }
+}
+
+
+void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb,
+                         struct ieee80211_tx_status *status)
+{
+        struct sk_buff *skb2;
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+        struct ieee80211_local *local = hw_to_local(hw);
+        u16 frag, type;
+        u32 msg_type;
+
+        if (!status) {
+                printk(KERN_ERR
+                       "%s: ieee80211_tx_status called with NULL status\n",
+                       local->mdev->name);
+                dev_kfree_skb(skb);
+                return;
+        }
+
+        if (status->excessive_retries) {
+                struct sta_info *sta;
+                sta = sta_info_get(local, hdr->addr1);
+                if (sta) {
+                        if (sta->flags & WLAN_STA_PS) {
+                                /* The STA is in power save mode, so assume
+                                 * that this TX packet failed because of that.
+                                 */
+                                status->excessive_retries = 0;
+                                status->flags |= IEEE80211_TX_STATUS_TX_FILTERED;
+                        }
+                        sta_info_put(sta);
+                }
+        }
+
+        if (status->flags & IEEE80211_TX_STATUS_TX_FILTERED) {
+                struct sta_info *sta;
+                sta = sta_info_get(local, hdr->addr1);
+                if (sta) {
+                        sta->tx_filtered_count++;
+
+                        /* Clear the TX filter mask for this STA when sending
+                         * the next packet. If the STA went to power save mode,
+                         * this will happen when it is waking up for the next
+                         * time. */
+                        sta->clear_dst_mask = 1;
+
+                        /* TODO: Is the WLAN_STA_PS flag always set here or is
+                         * the race between RX and TX status causing some
+                         * packets to be filtered out before 80211.o gets an
+                         * update for PS status? This seems to be the case, so
+                         * no changes are likely to be needed. */
+                        if (sta->flags & WLAN_STA_PS &&
+                            skb_queue_len(&sta->tx_filtered) <
+                            STA_MAX_TX_BUFFER) {
+                                ieee80211_remove_tx_extra(local, sta->key,
+                                                          skb,
+                                                          &status->control);
+                                skb_queue_tail(&sta->tx_filtered, skb);
+                        } else if (!(sta->flags & WLAN_STA_PS) &&
+                                   !(status->control.flags & IEEE80211_TXCTL_REQUEUE)) {
+                                /* Software retry the packet once */
+                                status->control.flags |= IEEE80211_TXCTL_REQUEUE;
+                                ieee80211_remove_tx_extra(local, sta->key,
+                                                          skb,
+                                                          &status->control);
+                                dev_queue_xmit(skb);
+                        } else {
+                                if (net_ratelimit()) {
+                                        printk(KERN_DEBUG "%s: dropped TX "
+                                               "filtered frame queue_len=%d "
+                                               "PS=%d @%lu\n",
+                                               local->mdev->name,
+                                               skb_queue_len(
+                                                       &sta->tx_filtered),
+                                               !!(sta->flags & WLAN_STA_PS),
+                                               jiffies);
+                                }
+                                dev_kfree_skb(skb);
+                        }
+                        sta_info_put(sta);
+                        return;
+                }
+        } else {
+                /* FIXME: STUPID to call this with both local and local->mdev */
+                rate_control_tx_status(local, local->mdev, skb, status);
+        }
+
+        ieee80211_led_tx(local, 0);
+
+        /* SNMP counters
+         * Fragments are passed to low-level drivers as separate skbs, so these
+         * are actually fragments, not frames. Update frame counters only for
+         * the first fragment of the frame. */
+
+        frag = le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_FRAG;
+        type = le16_to_cpu(hdr->frame_control) & IEEE80211_FCTL_FTYPE;
+
+        if (status->flags & IEEE80211_TX_STATUS_ACK) {
+                if (frag == 0) {
+                        local->dot11TransmittedFrameCount++;
+                        if (is_multicast_ether_addr(hdr->addr1))
+                                local->dot11MulticastTransmittedFrameCount++;
+                        if (status->retry_count > 0)
+                                local->dot11RetryCount++;
+                        if (status->retry_count > 1)
+                                local->dot11MultipleRetryCount++;
+                }
+
+                /* This counter shall be incremented for an acknowledged MPDU
+                 * with an individual address in the address 1 field or an MPDU
+                 * with a multicast address in the address 1 field of type Data
+                 * or Management. */
+                if (!is_multicast_ether_addr(hdr->addr1) ||
+                    type == IEEE80211_FTYPE_DATA ||
+                    type == IEEE80211_FTYPE_MGMT)
+                        local->dot11TransmittedFragmentCount++;
+        } else {
+                if (frag == 0)
+                        local->dot11FailedCount++;
+        }
+
+        if (!(status->control.flags & IEEE80211_TXCTL_REQ_TX_STATUS)
+            || unlikely(!local->apdev)) {
+                dev_kfree_skb(skb);
+                return;
+        }
+
+        msg_type = (status->flags & IEEE80211_TX_STATUS_ACK) ?
+                ieee80211_msg_tx_callback_ack : ieee80211_msg_tx_callback_fail;
+
+        /* skb was the original skb used for TX. Clone it and give the clone
+         * to netif_rx(). Free original skb. */
+        skb2 = skb_copy(skb, GFP_ATOMIC);
+        if (!skb2) {
+                dev_kfree_skb(skb);
+                return;
+        }
+        dev_kfree_skb(skb);
+        skb = skb2;
+
+        /* Send frame to hostapd */
+        ieee80211_rx_mgmt(local, skb, NULL, msg_type);
+}
+EXPORT_SYMBOL(ieee80211_tx_status);
+
+/* TODO: implement register/unregister functions for adding TX/RX handlers
+ * into ordered list */
+
+/* rx_pre handlers don't have dev and sdata fields available in
+ * ieee80211_txrx_data */
+static ieee80211_rx_handler ieee80211_rx_pre_handlers[] =
+{
+        ieee80211_rx_h_parse_qos,
+        ieee80211_rx_h_load_stats,
+        NULL
+};
+
+static ieee80211_rx_handler ieee80211_rx_handlers[] =
+{
+        ieee80211_rx_h_if_stats,
+        ieee80211_rx_h_monitor,
+        ieee80211_rx_h_passive_scan,
+        ieee80211_rx_h_check,
+        ieee80211_rx_h_sta_process,
+        ieee80211_rx_h_ccmp_decrypt,
+        ieee80211_rx_h_tkip_decrypt,
+        ieee80211_rx_h_wep_weak_iv_detection,
+        ieee80211_rx_h_wep_decrypt,
+        ieee80211_rx_h_defragment,
+        ieee80211_rx_h_ps_poll,
+        ieee80211_rx_h_michael_mic_verify,
+        /* this must be after decryption - so header is counted in MPDU mic
+         * must be before pae and data, so QOS_DATA format frames
+         * are not passed to user space by these functions
+         */
+        ieee80211_rx_h_remove_qos_control,
+        ieee80211_rx_h_802_1x_pae,
+        ieee80211_rx_h_drop_unencrypted,
+        ieee80211_rx_h_data,
+        ieee80211_rx_h_mgmt,
+        NULL
+};
+
+static ieee80211_tx_handler ieee80211_tx_handlers[] =
+{
+        ieee80211_tx_h_check_assoc,
+        ieee80211_tx_h_sequence,
+        ieee80211_tx_h_ps_buf,
+        ieee80211_tx_h_select_key,
+        ieee80211_tx_h_michael_mic_add,
+        ieee80211_tx_h_fragment,
+        ieee80211_tx_h_tkip_encrypt,
+        ieee80211_tx_h_ccmp_encrypt,
+        ieee80211_tx_h_wep_encrypt,
+        ieee80211_tx_h_rate_ctrl,
+        ieee80211_tx_h_misc,
+        ieee80211_tx_h_load_stats,
+        NULL
+};
+
+
+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;
+}
+
+int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
+                                 const char *name)
+{
+        struct rate_control_ref *ref, *old;
+
+        ASSERT_RTNL();
+        if (local->open_count || netif_running(local->mdev) ||
+            (local->apdev && netif_running(local->apdev)))
+                return -EBUSY;
+
+        ref = rate_control_alloc(name, local);
+        if (!ref) {
+                printk(KERN_WARNING "%s: Failed to select rate control "
+                       "algorithm\n", local->mdev->name);
+                return -ENOENT;
+        }
+
+        old = local->rate_ctrl;
+        local->rate_ctrl = ref;
+        if (old) {
+                rate_control_put(old);
+                sta_info_flush(local, NULL);
+        }
+
+        printk(KERN_DEBUG "%s: Selected rate control "
+               "algorithm '%s'\n", local->mdev->name,
+               ref->ops->name);
+
+
+        return 0;
+}
+
+static void rate_control_deinitialize(struct ieee80211_local *local)
+{
+        struct rate_control_ref *ref;
+
+        ref = local->rate_ctrl;
+        local->rate_ctrl = NULL;
+        rate_control_put(ref);
+}
+
+struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
+                                        const struct ieee80211_ops *ops)
+{
+        struct net_device *mdev;
+        struct ieee80211_local *local;
+        struct ieee80211_sub_if_data *sdata;
+        int priv_size;
+        struct wiphy *wiphy;
+
+        /* Ensure 32-byte alignment of our private data and hw private data.
+         * We use the wiphy priv data for both our ieee80211_local and for
+         * the driver's private data
+         *
+         * In memory it'll be like this:
+         *
+         * +-------------------------+
+         * | struct wiphy           |
+         * +-------------------------+
+         * | struct ieee80211_local  |
+         * +-------------------------+
+         * | driver's private data   |
+         * +-------------------------+
+         *
+         */
+        priv_size = ((sizeof(struct ieee80211_local) +
+                      NETDEV_ALIGN_CONST) & ~NETDEV_ALIGN_CONST) +
+                    priv_data_len;
+
+        wiphy = wiphy_new(&mac80211_config_ops, priv_size);
+
+        if (!wiphy)
+                return NULL;
+
+        wiphy->privid = mac80211_wiphy_privid;
+
+        local = wiphy_priv(wiphy);
+        local->hw.wiphy = wiphy;
+
+        local->hw.priv = (char *)local +
+                         ((sizeof(struct ieee80211_local) +
+                           NETDEV_ALIGN_CONST) & ~NETDEV_ALIGN_CONST);
+
+        local->ops = ops;
+
+        /* for now, mdev needs sub_if_data :/ */
+        mdev = alloc_netdev(sizeof(struct ieee80211_sub_if_data),
+                            "wmaster%d", ether_setup);
+        if (!mdev) {
+                wiphy_free(wiphy);
+                return NULL;
+        }
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(mdev);
+        mdev->ieee80211_ptr = &sdata->wdev;
+        sdata->wdev.wiphy = wiphy;
+
+        local->hw.queues = 1; /* default */
+
+        local->mdev = mdev;
+        local->rx_pre_handlers = ieee80211_rx_pre_handlers;
+        local->rx_handlers = ieee80211_rx_handlers;
+        local->tx_handlers = ieee80211_tx_handlers;
+
+        local->bridge_packets = 1;
+
+        local->rts_threshold = IEEE80211_MAX_RTS_THRESHOLD;
+        local->fragmentation_threshold = IEEE80211_MAX_FRAG_THRESHOLD;
+        local->short_retry_limit = 7;
+        local->long_retry_limit = 4;
+        local->hw.conf.radio_enabled = 1;
+        local->rate_ctrl_num_up = RATE_CONTROL_NUM_UP;
+        local->rate_ctrl_num_down = RATE_CONTROL_NUM_DOWN;
+
+        local->enabled_modes = (unsigned int) -1;
+
+        INIT_LIST_HEAD(&local->modes_list);
+
+        rwlock_init(&local->sub_if_lock);
+        INIT_LIST_HEAD(&local->sub_if_list);
+
+        INIT_DELAYED_WORK(&local->scan_work, ieee80211_sta_scan_work);
+        init_timer(&local->stat_timer);
+        local->stat_timer.function = ieee80211_stat_refresh;
+        local->stat_timer.data = (unsigned long) local;
+        ieee80211_rx_bss_list_init(mdev);
+
+        sta_info_init(local);
+
+        mdev->hard_start_xmit = ieee80211_master_start_xmit;
+        mdev->open = ieee80211_master_open;
+        mdev->stop = ieee80211_master_stop;
+        mdev->type = ARPHRD_IEEE80211;
+        mdev->hard_header_parse = header_parse_80211;
+
+        sdata->type = IEEE80211_IF_TYPE_AP;
+        sdata->dev = mdev;
+        sdata->local = local;
+        sdata->u.ap.force_unicast_rateidx = -1;
+        sdata->u.ap.max_ratectrl_rateidx = -1;
+        ieee80211_if_sdata_init(sdata);
+        list_add_tail(&sdata->list, &local->sub_if_list);
+
+        tasklet_init(&local->tx_pending_tasklet, ieee80211_tx_pending,
+                     (unsigned long)local);
+        tasklet_disable(&local->tx_pending_tasklet);
+
+        tasklet_init(&local->tasklet,
+                     ieee80211_tasklet_handler,
+                     (unsigned long) local);
+        tasklet_disable(&local->tasklet);
+
+        skb_queue_head_init(&local->skb_queue);
+        skb_queue_head_init(&local->skb_queue_unreliable);
+
+        return local_to_hw(local);
+}
+EXPORT_SYMBOL(ieee80211_alloc_hw);
+
+int ieee80211_register_hw(struct ieee80211_hw *hw)
+{
+        struct ieee80211_local *local = hw_to_local(hw);
+        const char *name;
+        int result;
+
+        result = wiphy_register(local->hw.wiphy);
+        if (result < 0)
+                return result;
+
+        name = wiphy_dev(local->hw.wiphy)->driver->name;
+        local->hw.workqueue = create_singlethread_workqueue(name);
+        if (!local->hw.workqueue) {
+                result = -ENOMEM;
+                goto fail_workqueue;
+        }
+
+        debugfs_hw_add(local);
+
+        local->hw.conf.beacon_int = 1000;
+
+        local->wstats_flags |= local->hw.max_rssi ?
+                               IW_QUAL_LEVEL_UPDATED : IW_QUAL_LEVEL_INVALID;
+        local->wstats_flags |= local->hw.max_signal ?
+                               IW_QUAL_QUAL_UPDATED : IW_QUAL_QUAL_INVALID;
+        local->wstats_flags |= local->hw.max_noise ?
+                               IW_QUAL_NOISE_UPDATED : IW_QUAL_NOISE_INVALID;
+        if (local->hw.max_rssi < 0 || local->hw.max_noise < 0)
+                local->wstats_flags |= IW_QUAL_DBM;
+
+        result = sta_info_start(local);
+        if (result < 0)
+                goto fail_sta_info;
+
+        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));
+
+        result = register_netdevice(local->mdev);
+        if (result < 0)
+                goto fail_dev;
+
+        ieee80211_debugfs_add_netdev(IEEE80211_DEV_TO_SUB_IF(local->mdev));
+
+        result = ieee80211_init_rate_ctrl_alg(local, NULL);
+        if (result < 0) {
+                printk(KERN_DEBUG "%s: Failed to initialize rate control "
+                       "algorithm\n", local->mdev->name);
+                goto fail_rate;
+        }
+
+        result = ieee80211_wep_init(local);
+
+        if (result < 0) {
+                printk(KERN_DEBUG "%s: Failed to initialize wep\n",
+                       local->mdev->name);
+                goto fail_wep;
+        }
+
+        ieee80211_install_qdisc(local->mdev);
+
+        /* add one default STA interface */
+        result = ieee80211_if_add(local->mdev, "wlan%d", NULL,
+                                  IEEE80211_IF_TYPE_STA);
+        if (result)
+                printk(KERN_WARNING "%s: Failed to add default virtual iface\n",
+                       local->mdev->name);
+
+        local->reg_state = IEEE80211_DEV_REGISTERED;
+        rtnl_unlock();
+
+        ieee80211_led_init(local);
+
+        return 0;
+
+fail_wep:
+        rate_control_deinitialize(local);
+fail_rate:
+        ieee80211_debugfs_remove_netdev(IEEE80211_DEV_TO_SUB_IF(local->mdev));
+        unregister_netdevice(local->mdev);
+fail_dev:
+        rtnl_unlock();
+        sta_info_stop(local);
+fail_sta_info:
+        debugfs_hw_del(local);
+        destroy_workqueue(local->hw.workqueue);
+fail_workqueue:
+        wiphy_unregister(local->hw.wiphy);
+        return result;
+}
+EXPORT_SYMBOL(ieee80211_register_hw);
+
+int ieee80211_register_hwmode(struct ieee80211_hw *hw,
+                              struct ieee80211_hw_mode *mode)
+{
+        struct ieee80211_local *local = hw_to_local(hw);
+        struct ieee80211_rate *rate;
+        int i;
+
+        INIT_LIST_HEAD(&mode->list);
+        list_add_tail(&mode->list, &local->modes_list);
+
+        local->hw_modes |= (1 << mode->mode);
+        for (i = 0; i < mode->num_rates; i++) {
+                rate = &(mode->rates[i]);
+                rate->rate_inv = CHAN_UTIL_RATE_LCM / rate->rate;
+        }
+        ieee80211_prepare_rates(local, mode);
+
+        if (!local->oper_hw_mode) {
+                /* Default to this mode */
+                local->hw.conf.phymode = mode->mode;
+                local->oper_hw_mode = local->scan_hw_mode = mode;
+                local->oper_channel = local->scan_channel = &mode->channels[0];
+                local->hw.conf.mode = local->oper_hw_mode;
+                local->hw.conf.chan = local->oper_channel;
+        }
+
+        if (!(hw->flags & IEEE80211_HW_DEFAULT_REG_DOMAIN_CONFIGURED))
+                ieee80211_init_client(local->mdev);
+
+        return 0;
+}
+EXPORT_SYMBOL(ieee80211_register_hwmode);
+
+void ieee80211_unregister_hw(struct ieee80211_hw *hw)
+{
+        struct ieee80211_local *local = hw_to_local(hw);
+        struct ieee80211_sub_if_data *sdata, *tmp;
+        struct list_head tmp_list;
+        int i;
+
+        tasklet_kill(&local->tx_pending_tasklet);
+        tasklet_kill(&local->tasklet);
+
+        rtnl_lock();
+
+        BUG_ON(local->reg_state != IEEE80211_DEV_REGISTERED);
+
+        local->reg_state = IEEE80211_DEV_UNREGISTERED;
+        if (local->apdev)
+                ieee80211_if_del_mgmt(local);
+
+        write_lock_bh(&local->sub_if_lock);
+        list_replace_init(&local->sub_if_list, &tmp_list);
+        write_unlock_bh(&local->sub_if_lock);
+
+        list_for_each_entry_safe(sdata, tmp, &tmp_list, list)
+                __ieee80211_if_del(local, sdata);
+
+        rtnl_unlock();
+
+        if (local->stat_time)
+                del_timer_sync(&local->stat_timer);
+
+        ieee80211_rx_bss_list_deinit(local->mdev);
+        ieee80211_clear_tx_pending(local);
+        sta_info_stop(local);
+        rate_control_deinitialize(local);
+        debugfs_hw_del(local);
+
+        for (i = 0; i < NUM_IEEE80211_MODES; i++) {
+                kfree(local->supp_rates[i]);
+                kfree(local->basic_rates[i]);
+        }
+
+        if (skb_queue_len(&local->skb_queue)
+                        || skb_queue_len(&local->skb_queue_unreliable))
+                printk(KERN_WARNING "%s: skb_queue not empty\n",
+                       local->mdev->name);
+        skb_queue_purge(&local->skb_queue);
+        skb_queue_purge(&local->skb_queue_unreliable);
+
+        destroy_workqueue(local->hw.workqueue);
+        wiphy_unregister(local->hw.wiphy);
+        ieee80211_wep_free(local);
+        ieee80211_led_exit(local);
+}
+EXPORT_SYMBOL(ieee80211_unregister_hw);
+
+void ieee80211_free_hw(struct ieee80211_hw *hw)
+{
+        struct ieee80211_local *local = hw_to_local(hw);
+
+        ieee80211_if_free(local->mdev);
+        wiphy_free(local->hw.wiphy);
+}
+EXPORT_SYMBOL(ieee80211_free_hw);
+
+void ieee80211_wake_queue(struct ieee80211_hw *hw, int queue)
+{
+        struct ieee80211_local *local = hw_to_local(hw);
+
+        if (test_and_clear_bit(IEEE80211_LINK_STATE_XOFF,
+                               &local->state[queue])) {
+                if (test_bit(IEEE80211_LINK_STATE_PENDING,
+                             &local->state[queue]))
+                        tasklet_schedule(&local->tx_pending_tasklet);
+                else
+                        if (!ieee80211_qdisc_installed(local->mdev)) {
+                                if (queue == 0)
+                                        netif_wake_queue(local->mdev);
+                        } else
+                                __netif_schedule(local->mdev);
+        }
+}
+EXPORT_SYMBOL(ieee80211_wake_queue);
+
+void ieee80211_stop_queue(struct ieee80211_hw *hw, int queue)
+{
+        struct ieee80211_local *local = hw_to_local(hw);
+
+        if (!ieee80211_qdisc_installed(local->mdev) && queue == 0)
+                netif_stop_queue(local->mdev);
+        set_bit(IEEE80211_LINK_STATE_XOFF, &local->state[queue]);
+}
+EXPORT_SYMBOL(ieee80211_stop_queue);
+
+void ieee80211_start_queues(struct ieee80211_hw *hw)
+{
+        struct ieee80211_local *local = hw_to_local(hw);
+        int i;
+
+        for (i = 0; i < local->hw.queues; i++)
+                clear_bit(IEEE80211_LINK_STATE_XOFF, &local->state[i]);
+        if (!ieee80211_qdisc_installed(local->mdev))
+                netif_start_queue(local->mdev);
+}
+EXPORT_SYMBOL(ieee80211_start_queues);
+
+void ieee80211_stop_queues(struct ieee80211_hw *hw)
+{
+        int i;
+
+        for (i = 0; i < hw->queues; i++)
+                ieee80211_stop_queue(hw, i);
+}
+EXPORT_SYMBOL(ieee80211_stop_queues);
+
+void ieee80211_wake_queues(struct ieee80211_hw *hw)
+{
+        int i;
+
+        for (i = 0; i < hw->queues; i++)
+                ieee80211_wake_queue(hw, i);
+}
+EXPORT_SYMBOL(ieee80211_wake_queues);
+
+struct net_device_stats *ieee80211_dev_stats(struct net_device *dev)
+{
+        struct ieee80211_sub_if_data *sdata;
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        return &sdata->stats;
+}
+
+static int __init ieee80211_init(void)
+{
+        struct sk_buff *skb;
+        int ret;
+
+        BUILD_BUG_ON(sizeof(struct ieee80211_tx_packet_data) > sizeof(skb->cb));
+
+        ret = ieee80211_wme_register();
+        if (ret) {
+                printk(KERN_DEBUG "ieee80211_init: failed to "
+                       "initialize WME (err=%d)\n", ret);
+                return ret;
+        }
+
+        ieee80211_debugfs_netdev_init();
+
+        return 0;
+}
+
+
+static void __exit ieee80211_exit(void)
+{
+        ieee80211_wme_unregister();
+        ieee80211_debugfs_netdev_exit();
+}
+
+
+module_init(ieee80211_init);
+module_exit(ieee80211_exit);
+
+MODULE_DESCRIPTION("IEEE 802.11 subsystem");
+MODULE_LICENSE("GPL");
diff --git a/net/mac80211/ieee80211_cfg.c b/net/mac80211/ieee80211_cfg.c
new file mode 100644
index 000000000000..509096edb324
--- /dev/null
+++ b/net/mac80211/ieee80211_cfg.c
@@ -0,0 +1,66 @@
+/*
+ * mac80211 configuration hooks for cfg80211
+ *
+ * Copyright 2006       Johannes Berg <johannes@sipsolutions.net>
+ *
+ * This file is GPLv2 as found in COPYING.
+ */
+
+#include <linux/nl80211.h>
+#include <linux/rtnetlink.h>
+#include <net/cfg80211.h>
+#include "ieee80211_i.h"
+#include "ieee80211_cfg.h"
+
+static int ieee80211_add_iface(struct wiphy *wiphy, char *name,
+                               unsigned int type)
+{
+        struct ieee80211_local *local = wiphy_priv(wiphy);
+        int itype;
+
+        if (unlikely(local->reg_state != IEEE80211_DEV_REGISTERED))
+                return -ENODEV;
+
+        switch (type) {
+        case NL80211_IFTYPE_UNSPECIFIED:
+                itype = IEEE80211_IF_TYPE_STA;
+                break;
+        case NL80211_IFTYPE_ADHOC:
+                itype = IEEE80211_IF_TYPE_IBSS;
+                break;
+        case NL80211_IFTYPE_STATION:
+                itype = IEEE80211_IF_TYPE_STA;
+                break;
+        case NL80211_IFTYPE_MONITOR:
+                itype = IEEE80211_IF_TYPE_MNTR;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return ieee80211_if_add(local->mdev, name, NULL, itype);
+}
+
+static int ieee80211_del_iface(struct wiphy *wiphy, int ifindex)
+{
+        struct ieee80211_local *local = wiphy_priv(wiphy);
+        struct net_device *dev;
+        char *name;
+
+        if (unlikely(local->reg_state != IEEE80211_DEV_REGISTERED))
+                return -ENODEV;
+
+        dev = dev_get_by_index(ifindex);
+        if (!dev)
+                return 0;
+
+        name = dev->name;
+        dev_put(dev);
+
+        return ieee80211_if_remove(local->mdev, name, -1);
+}
+
+struct cfg80211_ops mac80211_config_ops = {
+        .add_virtual_intf = ieee80211_add_iface,
+        .del_virtual_intf = ieee80211_del_iface,
+};
diff --git a/net/mac80211/ieee80211_cfg.h b/net/mac80211/ieee80211_cfg.h
new file mode 100644
index 000000000000..85ed2c924878
--- /dev/null
+++ b/net/mac80211/ieee80211_cfg.h
@@ -0,0 +1,9 @@
+/*
+ * mac80211 configuration hooks for cfg80211
+ */
+#ifndef __IEEE80211_CFG_H
+#define __IEEE80211_CFG_H
+
+extern struct cfg80211_ops mac80211_config_ops;
+
+#endif /* __IEEE80211_CFG_H */
diff --git a/net/mac80211/ieee80211_common.h b/net/mac80211/ieee80211_common.h
new file mode 100644
index 000000000000..b9a73e7f5f75
--- /dev/null
+++ b/net/mac80211/ieee80211_common.h
@@ -0,0 +1,98 @@
+/*
+ * IEEE 802.11 driver (80211.o) -- hostapd interface
+ * Copyright 2002-2004, Instant802 Networks, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef IEEE80211_COMMON_H
+#define IEEE80211_COMMON_H
+
+#include <linux/types.h>
+
+/*
+ * This is common header information with user space. It is used on all
+ * frames sent to wlan#ap interface.
+ */
+
+#define IEEE80211_FI_VERSION 0x80211001
+
+struct ieee80211_frame_info {
+        __be32 version;
+        __be32 length;
+        __be64 mactime;
+        __be64 hosttime;
+        __be32 phytype;
+        __be32 channel;
+        __be32 datarate;
+        __be32 antenna;
+        __be32 priority;
+        __be32 ssi_type;
+        __be32 ssi_signal;
+        __be32 ssi_noise;
+        __be32 preamble;
+        __be32 encoding;
+
+        /* Note: this structure is otherwise identical to capture format used
+         * in linux-wlan-ng, but this additional field is used to provide meta
+         * data about the frame to hostapd. This was the easiest method for
+         * providing this information, but this might change in the future. */
+        __be32 msg_type;
+} __attribute__ ((packed));
+
+
+enum ieee80211_msg_type {
+        ieee80211_msg_normal = 0,
+        ieee80211_msg_tx_callback_ack = 1,
+        ieee80211_msg_tx_callback_fail = 2,
+        ieee80211_msg_passive_scan = 3,
+        ieee80211_msg_wep_frame_unknown_key = 4,
+        ieee80211_msg_michael_mic_failure = 5,
+        /* hole at 6, was monitor but never sent to userspace */
+        ieee80211_msg_sta_not_assoc = 7,
+        ieee80211_msg_set_aid_for_sta = 8 /* used by Intersil MVC driver */,
+        ieee80211_msg_key_threshold_notification = 9,
+        ieee80211_msg_radar = 11,
+};
+
+struct ieee80211_msg_set_aid_for_sta {
+        char    sta_address[ETH_ALEN];
+        u16     aid;
+};
+
+struct ieee80211_msg_key_notification {
+        int tx_rx_count;
+        char ifname[IFNAMSIZ];
+        u8 addr[ETH_ALEN]; /* ff:ff:ff:ff:ff:ff for broadcast keys */
+};
+
+
+enum ieee80211_phytype {
+        ieee80211_phytype_fhss_dot11_97  = 1,
+        ieee80211_phytype_dsss_dot11_97  = 2,
+        ieee80211_phytype_irbaseband     = 3,
+        ieee80211_phytype_dsss_dot11_b   = 4,
+        ieee80211_phytype_pbcc_dot11_b   = 5,
+        ieee80211_phytype_ofdm_dot11_g   = 6,
+        ieee80211_phytype_pbcc_dot11_g   = 7,
+        ieee80211_phytype_ofdm_dot11_a   = 8,
+        ieee80211_phytype_dsss_dot11_turbog = 255,
+        ieee80211_phytype_dsss_dot11_turbo = 256,
+};
+
+enum ieee80211_ssi_type {
+        ieee80211_ssi_none = 0,
+        ieee80211_ssi_norm = 1, /* normalized, 0-1000 */
+        ieee80211_ssi_dbm = 2,
+        ieee80211_ssi_raw = 3, /* raw SSI */
+};
+
+struct ieee80211_radar_info {
+                int channel;
+                int radar;
+                int radar_type;
+};
+
+#endif /* IEEE80211_COMMON_H */
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
new file mode 100644
index 000000000000..af4d14d0b969
--- /dev/null
+++ b/net/mac80211/ieee80211_i.h
@@ -0,0 +1,798 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
+ * Copyright 2005, Devicescape Software, Inc.
+ * Copyright 2006-2007  Jiri Benc <jbenc@suse.cz>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef IEEE80211_I_H
+#define IEEE80211_I_H
+
+#include <linux/kernel.h>
+#include <linux/device.h>
+#include <linux/if_ether.h>
+#include <linux/interrupt.h>
+#include <linux/list.h>
+#include <linux/netdevice.h>
+#include <linux/skbuff.h>
+#include <linux/workqueue.h>
+#include <linux/types.h>
+#include <linux/spinlock.h>
+#include <net/wireless.h>
+#include "ieee80211_key.h"
+#include "sta_info.h"
+
+/* ieee80211.o internal definitions, etc. These are not included into
+ * low-level drivers. */
+
+#ifndef ETH_P_PAE
+#define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */
+#endif /* ETH_P_PAE */
+
+#define WLAN_FC_DATA_PRESENT(fc) (((fc) & 0x4c) == 0x08)
+
+struct ieee80211_local;
+
+#define BIT(x) (1 << (x))
+
+#define IEEE80211_ALIGN32_PAD(a) ((4 - ((a) & 3)) & 3)
+
+/* Maximum number of broadcast/multicast frames to buffer when some of the
+ * associated stations are using power saving. */
+#define AP_MAX_BC_BUFFER 128
+
+/* Maximum number of frames buffered to all STAs, including multicast frames.
+ * Note: increasing this limit increases the potential memory requirement. Each
+ * frame can be up to about 2 kB long. */
+#define TOTAL_MAX_TX_BUFFER 512
+
+/* Required encryption head and tailroom */
+#define IEEE80211_ENCRYPT_HEADROOM 8
+#define IEEE80211_ENCRYPT_TAILROOM 12
+
+/* IEEE 802.11 (Ch. 9.5 Defragmentation) requires support for concurrent
+ * reception of at least three fragmented frames. This limit can be increased
+ * by changing this define, at the cost of slower frame reassembly and
+ * increased memory use (about 2 kB of RAM per entry). */
+#define IEEE80211_FRAGMENT_MAX 4
+
+struct ieee80211_fragment_entry {
+        unsigned long first_frag_time;
+        unsigned int seq;
+        unsigned int rx_queue;
+        unsigned int last_frag;
+        unsigned int extra_len;
+        struct sk_buff_head skb_list;
+        int ccmp; /* Whether fragments were encrypted with CCMP */
+        u8 last_pn[6]; /* PN of the last fragment if CCMP was used */
+};
+
+
+struct ieee80211_sta_bss {
+        struct list_head list;
+        struct ieee80211_sta_bss *hnext;
+        atomic_t users;
+
+        u8 bssid[ETH_ALEN];
+        u8 ssid[IEEE80211_MAX_SSID_LEN];
+        size_t ssid_len;
+        u16 capability; /* host byte order */
+        int hw_mode;
+        int channel;
+        int freq;
+        int rssi, signal, noise;
+        u8 *wpa_ie;
+        size_t wpa_ie_len;
+        u8 *rsn_ie;
+        size_t rsn_ie_len;
+        u8 *wmm_ie;
+        size_t wmm_ie_len;
+#define IEEE80211_MAX_SUPP_RATES 32
+        u8 supp_rates[IEEE80211_MAX_SUPP_RATES];
+        size_t supp_rates_len;
+        int beacon_int;
+        u64 timestamp;
+
+        int probe_resp;
+        unsigned long last_update;
+
+};
+
+
+typedef enum {
+        TXRX_CONTINUE, TXRX_DROP, TXRX_QUEUED
+} ieee80211_txrx_result;
+
+struct ieee80211_txrx_data {
+        struct sk_buff *skb;
+        struct net_device *dev;
+        struct ieee80211_local *local;
+        struct ieee80211_sub_if_data *sdata;
+        struct sta_info *sta;
+        u16 fc, ethertype;
+        struct ieee80211_key *key;
+        unsigned int fragmented:1; /* whether the MSDU was fragmented */
+        union {
+                struct {
+                        struct ieee80211_tx_control *control;
+                        unsigned int unicast:1;
+                        unsigned int ps_buffered:1;
+                        unsigned int short_preamble:1;
+                        unsigned int probe_last_frag:1;
+                        struct ieee80211_hw_mode *mode;
+                        struct ieee80211_rate *rate;
+                        /* use this rate (if set) for last fragment; rate can
+                         * be set to lower rate for the first fragments, e.g.,
+                         * when using CTS protection with IEEE 802.11g. */
+                        struct ieee80211_rate *last_frag_rate;
+                        int last_frag_hwrate;
+                        int mgmt_interface;
+
+                        /* Extra fragments (in addition to the first fragment
+                         * in skb) */
+                        int num_extra_frag;
+                        struct sk_buff **extra_frag;
+                } tx;
+                struct {
+                        struct ieee80211_rx_status *status;
+                        int sent_ps_buffered;
+                        int queue;
+                        int load;
+                        unsigned int in_scan:1;
+                        /* frame is destined to interface currently processed
+                         * (including multicast frames) */
+                        unsigned int ra_match:1;
+                } rx;
+        } u;
+};
+
+/* Stored in sk_buff->cb */
+struct ieee80211_tx_packet_data {
+        int ifindex;
+        unsigned long jiffies;
+        unsigned int req_tx_status:1;
+        unsigned int do_not_encrypt:1;
+        unsigned int requeue:1;
+        unsigned int mgmt_iface:1;
+        unsigned int queue:4;
+};
+
+struct ieee80211_tx_stored_packet {
+        struct ieee80211_tx_control control;
+        struct sk_buff *skb;
+        int num_extra_frag;
+        struct sk_buff **extra_frag;
+        int last_frag_rateidx;
+        int last_frag_hwrate;
+        struct ieee80211_rate *last_frag_rate;
+        unsigned int last_frag_rate_ctrl_probe:1;
+};
+
+typedef ieee80211_txrx_result (*ieee80211_tx_handler)
+(struct ieee80211_txrx_data *tx);
+
+typedef ieee80211_txrx_result (*ieee80211_rx_handler)
+(struct ieee80211_txrx_data *rx);
+
+struct ieee80211_if_ap {
+        u8 *beacon_head, *beacon_tail;
+        int beacon_head_len, beacon_tail_len;
+
+        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 :)
+         * NB: don't ever use set_bit, use bss_tim_set/bss_tim_clear! */
+        u8 tim[sizeof(unsigned long) * BITS_TO_LONGS(IEEE80211_MAX_AID + 1)];
+        atomic_t num_sta_ps; /* number of stations in PS mode */
+        struct sk_buff_head ps_bc_buf;
+        int dtim_period, dtim_count;
+        int force_unicast_rateidx; /* forced TX rateidx for unicast frames */
+        int max_ratectrl_rateidx; /* max TX rateidx for rate control */
+        int num_beacons; /* number of TXed beacon frames for this BSS */
+};
+
+struct ieee80211_if_wds {
+        u8 remote_addr[ETH_ALEN];
+        struct sta_info *sta;
+};
+
+struct ieee80211_if_vlan {
+        u8 id;
+};
+
+struct ieee80211_if_sta {
+        enum {
+                IEEE80211_DISABLED, IEEE80211_AUTHENTICATE,
+                IEEE80211_ASSOCIATE, IEEE80211_ASSOCIATED,
+                IEEE80211_IBSS_SEARCH, IEEE80211_IBSS_JOINED
+        } state;
+        struct timer_list timer;
+        struct work_struct work;
+        u8 bssid[ETH_ALEN], prev_bssid[ETH_ALEN];
+        u8 ssid[IEEE80211_MAX_SSID_LEN];
+        size_t ssid_len;
+        u16 aid;
+        u16 ap_capab, capab;
+        u8 *extra_ie; /* to be added to the end of AssocReq */
+        size_t extra_ie_len;
+
+        /* The last AssocReq/Resp IEs */
+        u8 *assocreq_ies, *assocresp_ies;
+        size_t assocreq_ies_len, assocresp_ies_len;
+
+        int auth_tries, assoc_tries;
+
+        unsigned int ssid_set:1;
+        unsigned int bssid_set:1;
+        unsigned int prev_bssid_set:1;
+        unsigned int authenticated:1;
+        unsigned int associated:1;
+        unsigned int probereq_poll:1;
+        unsigned int use_protection:1;
+        unsigned int create_ibss:1;
+        unsigned int mixed_cell:1;
+        unsigned int wmm_enabled:1;
+        unsigned int auto_ssid_sel:1;
+        unsigned int auto_bssid_sel:1;
+        unsigned int auto_channel_sel:1;
+#define IEEE80211_STA_REQ_SCAN 0
+#define IEEE80211_STA_REQ_AUTH 1
+#define IEEE80211_STA_REQ_RUN  2
+        unsigned long request;
+        struct sk_buff_head skb_queue;
+
+        int key_mgmt;
+        unsigned long last_probe;
+
+#define IEEE80211_AUTH_ALG_OPEN BIT(0)
+#define IEEE80211_AUTH_ALG_SHARED_KEY BIT(1)
+#define IEEE80211_AUTH_ALG_LEAP BIT(2)
+        unsigned int auth_algs; /* bitfield of allowed auth algs */
+        int auth_alg; /* currently used IEEE 802.11 authentication algorithm */
+        int auth_transaction;
+
+        unsigned long ibss_join_req;
+        struct sk_buff *probe_resp; /* ProbeResp template for IBSS */
+        u32 supp_rates_bits;
+
+        int wmm_last_param_set;
+};
+
+
+struct ieee80211_sub_if_data {
+        struct list_head list;
+        unsigned int type;
+
+        struct wireless_dev wdev;
+
+        struct net_device *dev;
+        struct ieee80211_local *local;
+
+        int mc_count;
+        unsigned int allmulti:1;
+        unsigned int promisc:1;
+
+        struct net_device_stats stats;
+        int drop_unencrypted;
+        int eapol; /* 0 = process EAPOL frames as normal data frames,
+                    * 1 = send EAPOL frames through wlan#ap to hostapd
+                    *     (default) */
+        int ieee802_1x; /* IEEE 802.1X PAE - drop packet to/from unauthorized
+                         * port */
+
+        u16 sequence;
+
+        /* Fragment table for host-based reassembly */
+        struct ieee80211_fragment_entry fragments[IEEE80211_FRAGMENT_MAX];
+        unsigned int fragment_next;
+
+#define NUM_DEFAULT_KEYS 4
+        struct ieee80211_key *keys[NUM_DEFAULT_KEYS];
+        struct ieee80211_key *default_key;
+
+        struct ieee80211_if_ap *bss; /* BSS that this device belongs to */
+
+        union {
+                struct ieee80211_if_ap ap;
+                struct ieee80211_if_wds wds;
+                struct ieee80211_if_vlan vlan;
+                struct ieee80211_if_sta sta;
+        } u;
+        int channel_use;
+        int channel_use_raw;
+
+#ifdef CONFIG_MAC80211_DEBUGFS
+        struct dentry *debugfsdir;
+        union {
+                struct {
+                        struct dentry *channel_use;
+                        struct dentry *drop_unencrypted;
+                        struct dentry *eapol;
+                        struct dentry *ieee8021_x;
+                        struct dentry *state;
+                        struct dentry *bssid;
+                        struct dentry *prev_bssid;
+                        struct dentry *ssid_len;
+                        struct dentry *aid;
+                        struct dentry *ap_capab;
+                        struct dentry *capab;
+                        struct dentry *extra_ie_len;
+                        struct dentry *auth_tries;
+                        struct dentry *assoc_tries;
+                        struct dentry *auth_algs;
+                        struct dentry *auth_alg;
+                        struct dentry *auth_transaction;
+                        struct dentry *flags;
+                } sta;
+                struct {
+                        struct dentry *channel_use;
+                        struct dentry *drop_unencrypted;
+                        struct dentry *eapol;
+                        struct dentry *ieee8021_x;
+                        struct dentry *num_sta_ps;
+                        struct dentry *dtim_period;
+                        struct dentry *dtim_count;
+                        struct dentry *num_beacons;
+                        struct dentry *force_unicast_rateidx;
+                        struct dentry *max_ratectrl_rateidx;
+                        struct dentry *num_buffered_multicast;
+                        struct dentry *beacon_head_len;
+                        struct dentry *beacon_tail_len;
+                } ap;
+                struct {
+                        struct dentry *channel_use;
+                        struct dentry *drop_unencrypted;
+                        struct dentry *eapol;
+                        struct dentry *ieee8021_x;
+                        struct dentry *peer;
+                } wds;
+                struct {
+                        struct dentry *channel_use;
+                        struct dentry *drop_unencrypted;
+                        struct dentry *eapol;
+                        struct dentry *ieee8021_x;
+                        struct dentry *vlan_id;
+                } vlan;
+                struct {
+                        struct dentry *mode;
+                } monitor;
+                struct dentry *default_key;
+        } debugfs;
+#endif
+};
+
+#define IEEE80211_DEV_TO_SUB_IF(dev) netdev_priv(dev)
+
+enum {
+        IEEE80211_RX_MSG        = 1,
+        IEEE80211_TX_STATUS_MSG = 2,
+};
+
+struct ieee80211_local {
+        /* embed the driver visible part.
+         * don't cast (use the static inlines below), but we keep
+         * it first anyway so they become a no-op */
+        struct ieee80211_hw hw;
+
+        const struct ieee80211_ops *ops;
+
+        /* List of registered struct ieee80211_hw_mode */
+        struct list_head modes_list;
+
+        struct net_device *mdev; /* wmaster# - "master" 802.11 device */
+        struct net_device *apdev; /* wlan#ap - management frames (hostapd) */
+        int open_count;
+        int monitors;
+        struct iw_statistics wstats;
+        u8 wstats_flags;
+
+        enum {
+                IEEE80211_DEV_UNINITIALIZED = 0,
+                IEEE80211_DEV_REGISTERED,
+                IEEE80211_DEV_UNREGISTERED,
+        } reg_state;
+
+        /* Tasklet and skb queue to process calls from IRQ mode. All frames
+         * added to skb_queue will be processed, but frames in
+         * skb_queue_unreliable may be dropped if the total length of these
+         * queues increases over the limit. */
+#define IEEE80211_IRQSAFE_QUEUE_LIMIT 128
+        struct tasklet_struct tasklet;
+        struct sk_buff_head skb_queue;
+        struct sk_buff_head skb_queue_unreliable;
+
+        /* Station data structures */
+        spinlock_t sta_lock; /* mutex for STA data structures */
+        int num_sta; /* number of stations in sta_list */
+        struct list_head sta_list;
+        struct list_head deleted_sta_list;
+        struct sta_info *sta_hash[STA_HASH_SIZE];
+        struct timer_list sta_cleanup;
+
+        unsigned long state[NUM_TX_DATA_QUEUES];
+        struct ieee80211_tx_stored_packet pending_packet[NUM_TX_DATA_QUEUES];
+        struct tasklet_struct tx_pending_tasklet;
+
+        int mc_count;   /* total count of multicast entries in all interfaces */
+        int iff_allmultis, iff_promiscs;
+                        /* number of interfaces with corresponding IFF_ flags */
+
+        struct rate_control_ref *rate_ctrl;
+
+        int next_mode; /* MODE_IEEE80211*
+                        * The mode preference for next channel change. This is
+                        * used to select .11g vs. .11b channels (or 4.9 GHz vs.
+                        * .11a) when the channel number is not unique. */
+
+        /* Supported and basic rate filters for different modes. These are
+         * pointers to -1 terminated lists and rates in 100 kbps units. */
+        int *supp_rates[NUM_IEEE80211_MODES];
+        int *basic_rates[NUM_IEEE80211_MODES];
+
+        int rts_threshold;
+        int cts_protect_erp_frames;
+        int fragmentation_threshold;
+        int short_retry_limit; /* dot11ShortRetryLimit */
+        int long_retry_limit; /* dot11LongRetryLimit */
+        int short_preamble; /* use short preamble with IEEE 802.11b */
+
+        struct crypto_blkcipher *wep_tx_tfm;
+        struct crypto_blkcipher *wep_rx_tfm;
+        u32 wep_iv;
+        int key_tx_rx_threshold; /* number of times any key can be used in TX
+                                  * or RX before generating a rekey
+                                  * notification; 0 = notification disabled. */
+
+        int bridge_packets; /* bridge packets between associated stations and
+                             * deliver multicast frames both back to wireless
+                             * media and to the local net stack */
+
+        ieee80211_rx_handler *rx_pre_handlers;
+        ieee80211_rx_handler *rx_handlers;
+        ieee80211_tx_handler *tx_handlers;
+
+        rwlock_t sub_if_lock; /* Protects sub_if_list. Cannot be taken under
+                               * sta_bss_lock or sta_lock. */
+        struct list_head sub_if_list;
+        int sta_scanning;
+        int scan_channel_idx;
+        enum { SCAN_SET_CHANNEL, SCAN_SEND_PROBE } scan_state;
+        unsigned long last_scan_completed;
+        struct delayed_work scan_work;
+        struct net_device *scan_dev;
+        struct ieee80211_channel *oper_channel, *scan_channel;
+        struct ieee80211_hw_mode *oper_hw_mode, *scan_hw_mode;
+        u8 scan_ssid[IEEE80211_MAX_SSID_LEN];
+        size_t scan_ssid_len;
+        struct list_head sta_bss_list;
+        struct ieee80211_sta_bss *sta_bss_hash[STA_HASH_SIZE];
+        spinlock_t sta_bss_lock;
+#define IEEE80211_SCAN_MATCH_SSID BIT(0)
+#define IEEE80211_SCAN_WPA_ONLY BIT(1)
+#define IEEE80211_SCAN_EXTRA_INFO BIT(2)
+        int scan_flags;
+
+        /* SNMP counters */
+        /* dot11CountersTable */
+        u32 dot11TransmittedFragmentCount;
+        u32 dot11MulticastTransmittedFrameCount;
+        u32 dot11FailedCount;
+        u32 dot11RetryCount;
+        u32 dot11MultipleRetryCount;
+        u32 dot11FrameDuplicateCount;
+        u32 dot11ReceivedFragmentCount;
+        u32 dot11MulticastReceivedFrameCount;
+        u32 dot11TransmittedFrameCount;
+        u32 dot11WEPUndecryptableCount;
+
+#ifdef CONFIG_MAC80211_LEDS
+        int tx_led_counter, rx_led_counter;
+        struct led_trigger *tx_led, *rx_led;
+        char tx_led_name[32], rx_led_name[32];
+#endif
+
+        u32 channel_use;
+        u32 channel_use_raw;
+        u32 stat_time;
+        struct timer_list stat_timer;
+
+#ifdef CONFIG_MAC80211_DEBUGFS
+        struct work_struct sta_debugfs_add;
+#endif
+
+        enum {
+                STA_ANTENNA_SEL_AUTO = 0,
+                STA_ANTENNA_SEL_SW_CTRL = 1,
+                STA_ANTENNA_SEL_SW_CTRL_DEBUG = 2
+        } sta_antenna_sel;
+
+        int rate_ctrl_num_up, rate_ctrl_num_down;
+
+#ifdef CONFIG_MAC80211_DEBUG_COUNTERS
+        /* TX/RX handler statistics */
+        unsigned int tx_handlers_drop;
+        unsigned int tx_handlers_queued;
+        unsigned int tx_handlers_drop_unencrypted;
+        unsigned int tx_handlers_drop_fragment;
+        unsigned int tx_handlers_drop_wep;
+        unsigned int tx_handlers_drop_not_assoc;
+        unsigned int tx_handlers_drop_unauth_port;
+        unsigned int rx_handlers_drop;
+        unsigned int rx_handlers_queued;
+        unsigned int rx_handlers_drop_nullfunc;
+        unsigned int rx_handlers_drop_defrag;
+        unsigned int rx_handlers_drop_short;
+        unsigned int rx_handlers_drop_passive_scan;
+        unsigned int tx_expand_skb_head;
+        unsigned int tx_expand_skb_head_cloned;
+        unsigned int rx_expand_skb_head;
+        unsigned int rx_expand_skb_head2;
+        unsigned int rx_handlers_fragments;
+        unsigned int tx_status_drop;
+        unsigned int wme_rx_queue[NUM_RX_DATA_QUEUES];
+        unsigned int wme_tx_queue[NUM_RX_DATA_QUEUES];
+#define I802_DEBUG_INC(c) (c)++
+#else /* CONFIG_MAC80211_DEBUG_COUNTERS */
+#define I802_DEBUG_INC(c) do { } while (0)
+#endif /* CONFIG_MAC80211_DEBUG_COUNTERS */
+
+
+        int default_wep_only; /* only default WEP keys are used with this
+                               * interface; this is used to decide when hwaccel
+                               * can be used with default keys */
+        int total_ps_buffered; /* total number of all buffered unicast and
+                                * multicast packets for power saving stations
+                                */
+        int allow_broadcast_always; /* whether to allow TX of broadcast frames
+                                     * even when there are no associated STAs
+                                     */
+
+        int wifi_wme_noack_test;
+        unsigned int wmm_acm; /* bit field of ACM bits (BIT(802.1D tag)) */
+
+        unsigned int enabled_modes; /* bitfield of allowed modes;
+                                      * (1 << MODE_*) */
+        unsigned int hw_modes; /* bitfield of supported hardware modes;
+                                * (1 << MODE_*) */
+
+        int user_space_mlme;
+
+#ifdef CONFIG_MAC80211_DEBUGFS
+        struct local_debugfsdentries {
+                struct dentry *channel;
+                struct dentry *frequency;
+                struct dentry *radar_detect;
+                struct dentry *antenna_sel_tx;
+                struct dentry *antenna_sel_rx;
+                struct dentry *bridge_packets;
+                struct dentry *key_tx_rx_threshold;
+                struct dentry *rts_threshold;
+                struct dentry *fragmentation_threshold;
+                struct dentry *short_retry_limit;
+                struct dentry *long_retry_limit;
+                struct dentry *total_ps_buffered;
+                struct dentry *mode;
+                struct dentry *wep_iv;
+                struct dentry *tx_power_reduction;
+                struct dentry *modes;
+                struct dentry *statistics;
+                struct local_debugfsdentries_statsdentries {
+                        struct dentry *transmitted_fragment_count;
+                        struct dentry *multicast_transmitted_frame_count;
+                        struct dentry *failed_count;
+                        struct dentry *retry_count;
+                        struct dentry *multiple_retry_count;
+                        struct dentry *frame_duplicate_count;
+                        struct dentry *received_fragment_count;
+                        struct dentry *multicast_received_frame_count;
+                        struct dentry *transmitted_frame_count;
+                        struct dentry *wep_undecryptable_count;
+                        struct dentry *num_scans;
+#ifdef CONFIG_MAC80211_DEBUG_COUNTERS
+                        struct dentry *tx_handlers_drop;
+                        struct dentry *tx_handlers_queued;
+                        struct dentry *tx_handlers_drop_unencrypted;
+                        struct dentry *tx_handlers_drop_fragment;
+                        struct dentry *tx_handlers_drop_wep;
+                        struct dentry *tx_handlers_drop_not_assoc;
+                        struct dentry *tx_handlers_drop_unauth_port;
+                        struct dentry *rx_handlers_drop;
+                        struct dentry *rx_handlers_queued;
+                        struct dentry *rx_handlers_drop_nullfunc;
+                        struct dentry *rx_handlers_drop_defrag;
+                        struct dentry *rx_handlers_drop_short;
+                        struct dentry *rx_handlers_drop_passive_scan;
+                        struct dentry *tx_expand_skb_head;
+                        struct dentry *tx_expand_skb_head_cloned;
+                        struct dentry *rx_expand_skb_head;
+                        struct dentry *rx_expand_skb_head2;
+                        struct dentry *rx_handlers_fragments;
+                        struct dentry *tx_status_drop;
+                        struct dentry *wme_tx_queue;
+                        struct dentry *wme_rx_queue;
+#endif
+                        struct dentry *dot11ACKFailureCount;
+                        struct dentry *dot11RTSFailureCount;
+                        struct dentry *dot11FCSErrorCount;
+                        struct dentry *dot11RTSSuccessCount;
+                } stats;
+                struct dentry *stations;
+                struct dentry *keys;
+        } debugfs;
+#endif
+};
+
+static inline struct ieee80211_local *hw_to_local(
+        struct ieee80211_hw *hw)
+{
+        return container_of(hw, struct ieee80211_local, hw);
+}
+
+static inline struct ieee80211_hw *local_to_hw(
+        struct ieee80211_local *local)
+{
+        return &local->hw;
+}
+
+enum ieee80211_link_state_t {
+        IEEE80211_LINK_STATE_XOFF = 0,
+        IEEE80211_LINK_STATE_PENDING,
+};
+
+struct sta_attribute {
+        struct attribute attr;
+        ssize_t (*show)(const struct sta_info *, char *buf);
+        ssize_t (*store)(struct sta_info *, const char *buf, size_t count);
+};
+
+static inline void __bss_tim_set(struct ieee80211_if_ap *bss, int aid)
+{
+        /*
+         * This format has ben mandated by the IEEE specifications,
+         * so this line may not be changed to use the __set_bit() format.
+         */
+        bss->tim[(aid)/8] |= 1<<((aid) % 8);
+}
+
+static inline void bss_tim_set(struct ieee80211_local *local,
+                               struct ieee80211_if_ap *bss, int aid)
+{
+        spin_lock_bh(&local->sta_lock);
+        __bss_tim_set(bss, aid);
+        spin_unlock_bh(&local->sta_lock);
+}
+
+static inline void __bss_tim_clear(struct ieee80211_if_ap *bss, int aid)
+{
+        /*
+         * This format has ben mandated by the IEEE specifications,
+         * so this line may not be changed to use the __clear_bit() format.
+         */
+        bss->tim[(aid)/8] &= !(1<<((aid) % 8));
+}
+
+static inline void bss_tim_clear(struct ieee80211_local *local,
+                                 struct ieee80211_if_ap *bss, int aid)
+{
+        spin_lock_bh(&local->sta_lock);
+        __bss_tim_clear(bss, aid);
+        spin_unlock_bh(&local->sta_lock);
+}
+
+/**
+ * ieee80211_is_erp_rate - Check if a rate is an ERP rate
+ * @phymode: The PHY-mode for this rate (MODE_IEEE80211...)
+ * @rate: Transmission rate to check, in 100 kbps
+ *
+ * Check if a given rate is an Extended Rate PHY (ERP) rate.
+ */
+static inline int ieee80211_is_erp_rate(int phymode, int rate)
+{
+        if (phymode == MODE_IEEE80211G) {
+                if (rate != 10 && rate != 20 &&
+                    rate != 55 && rate != 110)
+                        return 1;
+        }
+        return 0;
+}
+
+/* ieee80211.c */
+int ieee80211_hw_config(struct ieee80211_local *local);
+int ieee80211_if_config(struct net_device *dev);
+int ieee80211_if_config_beacon(struct net_device *dev);
+struct ieee80211_key_conf *
+ieee80211_key_data2conf(struct ieee80211_local *local,
+                        const struct ieee80211_key *data);
+struct ieee80211_key *ieee80211_key_alloc(struct ieee80211_sub_if_data *sdata,
+                                          int idx, size_t key_len, gfp_t flags);
+void ieee80211_key_free(struct ieee80211_key *key);
+void ieee80211_rx_mgmt(struct ieee80211_local *local, struct sk_buff *skb,
+                       struct ieee80211_rx_status *status, u32 msg_type);
+void ieee80211_prepare_rates(struct ieee80211_local *local,
+                             struct ieee80211_hw_mode *mode);
+void ieee80211_tx_set_iswep(struct ieee80211_txrx_data *tx);
+int ieee80211_if_update_wds(struct net_device *dev, u8 *remote_addr);
+void ieee80211_if_setup(struct net_device *dev);
+void ieee80211_if_mgmt_setup(struct net_device *dev);
+int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
+                                 const char *name);
+struct net_device_stats *ieee80211_dev_stats(struct net_device *dev);
+
+/* ieee80211_ioctl.c */
+extern const struct iw_handler_def ieee80211_iw_handler_def;
+
+void ieee80211_update_default_wep_only(struct ieee80211_local *local);
+
+
+/* Least common multiple of the used rates (in 100 kbps). This is used to
+ * calculate rate_inv values for each rate so that only integers are needed. */
+#define CHAN_UTIL_RATE_LCM 95040
+/* 1 usec is 1/8 * (95040/10) = 1188 */
+#define CHAN_UTIL_PER_USEC 1188
+/* Amount of bits to shift the result right to scale the total utilization
+ * to values that will not wrap around 32-bit integers. */
+#define CHAN_UTIL_SHIFT 9
+/* Theoretical maximum of channel utilization counter in 10 ms (stat_time=1):
+ * (CHAN_UTIL_PER_USEC * 10000) >> CHAN_UTIL_SHIFT = 23203. So dividing the
+ * raw value with about 23 should give utilization in 10th of a percentage
+ * (1/1000). However, utilization is only estimated and not all intervals
+ * between frames etc. are calculated. 18 seems to give numbers that are closer
+ * to the real maximum. */
+#define CHAN_UTIL_PER_10MS 18
+#define CHAN_UTIL_HDR_LONG (202 * CHAN_UTIL_PER_USEC)
+#define CHAN_UTIL_HDR_SHORT (40 * CHAN_UTIL_PER_USEC)
+
+
+/* ieee80211_ioctl.c */
+int ieee80211_set_compression(struct ieee80211_local *local,
+                              struct net_device *dev, struct sta_info *sta);
+int ieee80211_init_client(struct net_device *dev);
+int ieee80211_set_channel(struct ieee80211_local *local, int channel, int freq);
+/* ieee80211_sta.c */
+void ieee80211_sta_timer(unsigned long data);
+void ieee80211_sta_work(struct work_struct *work);
+void ieee80211_sta_scan_work(struct work_struct *work);
+void ieee80211_sta_rx_mgmt(struct net_device *dev, struct sk_buff *skb,
+                           struct ieee80211_rx_status *rx_status);
+int ieee80211_sta_set_ssid(struct net_device *dev, char *ssid, size_t len);
+int ieee80211_sta_get_ssid(struct net_device *dev, char *ssid, size_t *len);
+int ieee80211_sta_set_bssid(struct net_device *dev, u8 *bssid);
+int ieee80211_sta_req_scan(struct net_device *dev, u8 *ssid, size_t ssid_len);
+void ieee80211_sta_req_auth(struct net_device *dev,
+                            struct ieee80211_if_sta *ifsta);
+int ieee80211_sta_scan_results(struct net_device *dev, char *buf, size_t len);
+void ieee80211_sta_rx_scan(struct net_device *dev, struct sk_buff *skb,
+                           struct ieee80211_rx_status *rx_status);
+void ieee80211_rx_bss_list_init(struct net_device *dev);
+void ieee80211_rx_bss_list_deinit(struct net_device *dev);
+int ieee80211_sta_set_extra_ie(struct net_device *dev, char *ie, size_t len);
+struct sta_info * ieee80211_ibss_add_sta(struct net_device *dev,
+                                         struct sk_buff *skb, u8 *bssid,
+                                         u8 *addr);
+int ieee80211_sta_deauthenticate(struct net_device *dev, u16 reason);
+int ieee80211_sta_disassociate(struct net_device *dev, u16 reason);
+
+/* ieee80211_iface.c */
+int ieee80211_if_add(struct net_device *dev, const char *name,
+                     struct net_device **new_dev, int type);
+void ieee80211_if_set_type(struct net_device *dev, int type);
+void ieee80211_if_reinit(struct net_device *dev);
+void __ieee80211_if_del(struct ieee80211_local *local,
+                        struct ieee80211_sub_if_data *sdata);
+int ieee80211_if_remove(struct net_device *dev, const char *name, int id);
+void ieee80211_if_free(struct net_device *dev);
+void ieee80211_if_sdata_init(struct ieee80211_sub_if_data *sdata);
+int ieee80211_if_add_mgmt(struct ieee80211_local *local);
+void ieee80211_if_del_mgmt(struct ieee80211_local *local);
+
+/* for wiphy privid */
+extern void *mac80211_wiphy_privid;
+
+#endif /* IEEE80211_I_H */
diff --git a/net/mac80211/ieee80211_iface.c b/net/mac80211/ieee80211_iface.c
new file mode 100644
index 000000000000..cf0f32e8c2a2
--- /dev/null
+++ b/net/mac80211/ieee80211_iface.c
@@ -0,0 +1,352 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
+ * Copyright 2005-2006, Devicescape Software, Inc.
+ * Copyright (c) 2006 Jiri Benc <jbenc@suse.cz>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/kernel.h>
+#include <linux/if_arp.h>
+#include <linux/netdevice.h>
+#include <linux/rtnetlink.h>
+#include <net/mac80211.h>
+#include "ieee80211_i.h"
+#include "sta_info.h"
+#include "debugfs_netdev.h"
+
+void ieee80211_if_sdata_init(struct ieee80211_sub_if_data *sdata)
+{
+        int i;
+
+        /* Default values for sub-interface parameters */
+        sdata->drop_unencrypted = 0;
+        sdata->eapol = 1;
+        for (i = 0; i < IEEE80211_FRAGMENT_MAX; i++)
+                skb_queue_head_init(&sdata->fragments[i].skb_list);
+}
+
+static void ieee80211_if_sdata_deinit(struct ieee80211_sub_if_data *sdata)
+{
+        int i;
+
+        for (i = 0; i < IEEE80211_FRAGMENT_MAX; i++) {
+                __skb_queue_purge(&sdata->fragments[i].skb_list);
+        }
+}
+
+/* Must be called with rtnl lock held. */
+int ieee80211_if_add(struct net_device *dev, const char *name,
+                     struct net_device **new_dev, int type)
+{
+        struct net_device *ndev;
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sub_if_data *sdata = NULL;
+        int ret;
+
+        ASSERT_RTNL();
+        ndev = alloc_netdev(sizeof(struct ieee80211_sub_if_data),
+                            name, ieee80211_if_setup);
+        if (!ndev)
+                return -ENOMEM;
+
+        ret = dev_alloc_name(ndev, ndev->name);
+        if (ret < 0)
+                goto fail;
+
+        memcpy(ndev->dev_addr, local->hw.wiphy->perm_addr, ETH_ALEN);
+        ndev->base_addr = dev->base_addr;
+        ndev->irq = dev->irq;
+        ndev->mem_start = dev->mem_start;
+        ndev->mem_end = dev->mem_end;
+        SET_NETDEV_DEV(ndev, wiphy_dev(local->hw.wiphy));
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(ndev);
+        ndev->ieee80211_ptr = &sdata->wdev;
+        sdata->wdev.wiphy = local->hw.wiphy;
+        sdata->type = IEEE80211_IF_TYPE_AP;
+        sdata->dev = ndev;
+        sdata->local = local;
+        ieee80211_if_sdata_init(sdata);
+
+        ret = register_netdevice(ndev);
+        if (ret)
+                goto fail;
+
+        ieee80211_debugfs_add_netdev(sdata);
+        ieee80211_if_set_type(ndev, type);
+
+        write_lock_bh(&local->sub_if_lock);
+        if (unlikely(local->reg_state == IEEE80211_DEV_UNREGISTERED)) {
+                write_unlock_bh(&local->sub_if_lock);
+                __ieee80211_if_del(local, sdata);
+                return -ENODEV;
+        }
+        list_add(&sdata->list, &local->sub_if_list);
+        if (new_dev)
+                *new_dev = ndev;
+        write_unlock_bh(&local->sub_if_lock);
+
+        ieee80211_update_default_wep_only(local);
+
+        return 0;
+
+fail:
+        free_netdev(ndev);
+        return ret;
+}
+
+int ieee80211_if_add_mgmt(struct ieee80211_local *local)
+{
+        struct net_device *ndev;
+        struct ieee80211_sub_if_data *nsdata;
+        int ret;
+
+        ASSERT_RTNL();
+
+        ndev = alloc_netdev(sizeof(struct ieee80211_sub_if_data), "wmgmt%d",
+                            ieee80211_if_mgmt_setup);
+        if (!ndev)
+                return -ENOMEM;
+        ret = dev_alloc_name(ndev, ndev->name);
+        if (ret < 0)
+                goto fail;
+
+        memcpy(ndev->dev_addr, local->hw.wiphy->perm_addr, ETH_ALEN);
+        SET_NETDEV_DEV(ndev, wiphy_dev(local->hw.wiphy));
+
+        nsdata = IEEE80211_DEV_TO_SUB_IF(ndev);
+        ndev->ieee80211_ptr = &nsdata->wdev;
+        nsdata->wdev.wiphy = local->hw.wiphy;
+        nsdata->type = IEEE80211_IF_TYPE_MGMT;
+        nsdata->dev = ndev;
+        nsdata->local = local;
+        ieee80211_if_sdata_init(nsdata);
+
+        ret = register_netdevice(ndev);
+        if (ret)
+                goto fail;
+
+        ieee80211_debugfs_add_netdev(nsdata);
+
+        if (local->open_count > 0)
+                dev_open(ndev);
+        local->apdev = ndev;
+        return 0;
+
+fail:
+        free_netdev(ndev);
+        return ret;
+}
+
+void ieee80211_if_del_mgmt(struct ieee80211_local *local)
+{
+        struct net_device *apdev;
+
+        ASSERT_RTNL();
+        apdev = local->apdev;
+        ieee80211_debugfs_remove_netdev(IEEE80211_DEV_TO_SUB_IF(apdev));
+        local->apdev = NULL;
+        unregister_netdevice(apdev);
+}
+
+void ieee80211_if_set_type(struct net_device *dev, int type)
+{
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        int oldtype = sdata->type;
+
+        sdata->type = type;
+        switch (type) {
+        case IEEE80211_IF_TYPE_WDS:
+                sdata->bss = NULL;
+                break;
+        case IEEE80211_IF_TYPE_VLAN:
+                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);
+                sdata->bss = &sdata->u.ap;
+                break;
+        case IEEE80211_IF_TYPE_STA:
+        case IEEE80211_IF_TYPE_IBSS: {
+                struct ieee80211_sub_if_data *msdata;
+                struct ieee80211_if_sta *ifsta;
+
+                ifsta = &sdata->u.sta;
+                INIT_WORK(&ifsta->work, ieee80211_sta_work);
+                setup_timer(&ifsta->timer, ieee80211_sta_timer,
+                            (unsigned long) sdata);
+                skb_queue_head_init(&ifsta->skb_queue);
+
+                ifsta->capab = WLAN_CAPABILITY_ESS;
+                ifsta->auth_algs = IEEE80211_AUTH_ALG_OPEN |
+                        IEEE80211_AUTH_ALG_SHARED_KEY;
+                ifsta->create_ibss = 1;
+                ifsta->wmm_enabled = 1;
+                ifsta->auto_channel_sel = 1;
+                ifsta->auto_bssid_sel = 1;
+
+                msdata = IEEE80211_DEV_TO_SUB_IF(sdata->local->mdev);
+                sdata->bss = &msdata->u.ap;
+                break;
+        }
+        case IEEE80211_IF_TYPE_MNTR:
+                dev->type = ARPHRD_IEEE80211_RADIOTAP;
+                break;
+        default:
+                printk(KERN_WARNING "%s: %s: Unknown interface type 0x%x",
+                       dev->name, __FUNCTION__, type);
+        }
+        ieee80211_debugfs_change_if_type(sdata, oldtype);
+        ieee80211_update_default_wep_only(local);
+}
+
+/* Must be called with rtnl lock held. */
+void ieee80211_if_reinit(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);
+        struct sta_info *sta;
+        int i;
+
+        ASSERT_RTNL();
+        ieee80211_if_sdata_deinit(sdata);
+        for (i = 0; i < NUM_DEFAULT_KEYS; i++) {
+                if (!sdata->keys[i])
+                        continue;
+#if 0
+                /* The interface is down at the moment, so there is not
+                 * really much point in disabling the keys at this point. */
+                memset(addr, 0xff, ETH_ALEN);
+                if (local->ops->set_key)
+                        local->ops->set_key(local_to_hw(local), DISABLE_KEY, addr,
+                                            local->keys[i], 0);
+#endif
+                ieee80211_key_free(sdata->keys[i]);
+                sdata->keys[i] = NULL;
+        }
+
+        switch (sdata->type) {
+        case IEEE80211_IF_TYPE_AP: {
+                /* Remove all virtual interfaces that use this BSS
+                 * as their sdata->bss */
+                struct ieee80211_sub_if_data *tsdata, *n;
+                LIST_HEAD(tmp_list);
+
+                write_lock_bh(&local->sub_if_lock);
+                list_for_each_entry_safe(tsdata, n, &local->sub_if_list, list) {
+                        if (tsdata != sdata && tsdata->bss == &sdata->u.ap) {
+                                printk(KERN_DEBUG "%s: removing virtual "
+                                       "interface %s because its BSS interface"
+                                       " is being removed\n",
+                                       sdata->dev->name, tsdata->dev->name);
+                                list_move_tail(&tsdata->list, &tmp_list);
+                        }
+                }
+                write_unlock_bh(&local->sub_if_lock);
+
+                list_for_each_entry_safe(tsdata, n, &tmp_list, list)
+                        __ieee80211_if_del(local, tsdata);
+
+                kfree(sdata->u.ap.beacon_head);
+                kfree(sdata->u.ap.beacon_tail);
+                kfree(sdata->u.ap.generic_elem);
+
+                if (dev != local->mdev) {
+                        struct sk_buff *skb;
+                        while ((skb = skb_dequeue(&sdata->u.ap.ps_bc_buf))) {
+                                local->total_ps_buffered--;
+                                dev_kfree_skb(skb);
+                        }
+                }
+
+                break;
+        }
+        case IEEE80211_IF_TYPE_WDS:
+                sta = sta_info_get(local, sdata->u.wds.remote_addr);
+                if (sta) {
+                        sta_info_put(sta);
+                        sta_info_free(sta, 0);
+                } else {
+#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
+                        printk(KERN_DEBUG "%s: Someone had deleted my STA "
+                               "entry for the WDS link\n", dev->name);
+#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
+                }
+                break;
+        case IEEE80211_IF_TYPE_STA:
+        case IEEE80211_IF_TYPE_IBSS:
+                kfree(sdata->u.sta.extra_ie);
+                sdata->u.sta.extra_ie = NULL;
+                kfree(sdata->u.sta.assocreq_ies);
+                sdata->u.sta.assocreq_ies = NULL;
+                kfree(sdata->u.sta.assocresp_ies);
+                sdata->u.sta.assocresp_ies = NULL;
+                if (sdata->u.sta.probe_resp) {
+                        dev_kfree_skb(sdata->u.sta.probe_resp);
+                        sdata->u.sta.probe_resp = NULL;
+                }
+
+                break;
+        case IEEE80211_IF_TYPE_MNTR:
+                dev->type = ARPHRD_ETHER;
+                break;
+        }
+
+        /* remove all STAs that are bound to this virtual interface */
+        sta_info_flush(local, dev);
+
+        memset(&sdata->u, 0, sizeof(sdata->u));
+        ieee80211_if_sdata_init(sdata);
+}
+
+/* Must be called with rtnl lock held. */
+void __ieee80211_if_del(struct ieee80211_local *local,
+                        struct ieee80211_sub_if_data *sdata)
+{
+        struct net_device *dev = sdata->dev;
+
+        ieee80211_debugfs_remove_netdev(sdata);
+        unregister_netdevice(dev);
+        /* Except master interface, the net_device will be freed by
+         * net_device->destructor (i. e. ieee80211_if_free). */
+}
+
+/* Must be called with rtnl lock held. */
+int ieee80211_if_remove(struct net_device *dev, const char *name, int id)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sub_if_data *sdata, *n;
+
+        ASSERT_RTNL();
+
+        write_lock_bh(&local->sub_if_lock);
+        list_for_each_entry_safe(sdata, n, &local->sub_if_list, list) {
+                if ((sdata->type == id || id == -1) &&
+                    strcmp(name, sdata->dev->name) == 0 &&
+                    sdata->dev != local->mdev) {
+                        list_del(&sdata->list);
+                        write_unlock_bh(&local->sub_if_lock);
+                        __ieee80211_if_del(local, sdata);
+                        ieee80211_update_default_wep_only(local);
+                        return 0;
+                }
+        }
+        write_unlock_bh(&local->sub_if_lock);
+        return -ENODEV;
+}
+
+void ieee80211_if_free(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);
+
+        /* local->apdev must be NULL when freeing management interface */
+        BUG_ON(dev == local->apdev);
+        ieee80211_if_sdata_deinit(sdata);
+        free_netdev(dev);
+}
diff --git a/net/mac80211/ieee80211_ioctl.c b/net/mac80211/ieee80211_ioctl.c
new file mode 100644
index 000000000000..352f03bd8a3a
--- /dev/null
+++ b/net/mac80211/ieee80211_ioctl.c
@@ -0,0 +1,1822 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
+ * Copyright 2005-2006, Devicescape Software, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/netdevice.h>
+#include <linux/types.h>
+#include <linux/slab.h>
+#include <linux/skbuff.h>
+#include <linux/etherdevice.h>
+#include <linux/if_arp.h>
+#include <linux/wireless.h>
+#include <net/iw_handler.h>
+#include <asm/uaccess.h>
+
+#include <net/mac80211.h>
+#include "ieee80211_i.h"
+#include "hostapd_ioctl.h"
+#include "ieee80211_rate.h"
+#include "wpa.h"
+#include "aes_ccm.h"
+#include "debugfs_key.h"
+
+static int ieee80211_regdom = 0x10; /* FCC */
+module_param(ieee80211_regdom, int, 0444);
+MODULE_PARM_DESC(ieee80211_regdom, "IEEE 802.11 regulatory domain; 64=MKK");
+
+/*
+ * If firmware is upgraded by the vendor, additional channels can be used based
+ * on the new Japanese regulatory rules. This is indicated by setting
+ * ieee80211_japan_5ghz module parameter to one when loading the 80211 kernel
+ * module.
+ */
+static int ieee80211_japan_5ghz /* = 0 */;
+module_param(ieee80211_japan_5ghz, int, 0444);
+MODULE_PARM_DESC(ieee80211_japan_5ghz, "Vendor-updated firmware for 5 GHz");
+
+static void ieee80211_set_hw_encryption(struct net_device *dev,
+                                        struct sta_info *sta, u8 addr[ETH_ALEN],
+                                        struct ieee80211_key *key)
+{
+        struct ieee80211_key_conf *keyconf = NULL;
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+
+        /* default to sw encryption; this will be cleared by low-level
+         * driver if the hw supports requested encryption */
+        if (key)
+                key->force_sw_encrypt = 1;
+
+        if (key && local->ops->set_key &&
+            (keyconf = ieee80211_key_data2conf(local, key))) {
+                if (local->ops->set_key(local_to_hw(local), SET_KEY, addr,
+                                       keyconf, sta ? sta->aid : 0)) {
+                        key->force_sw_encrypt = 1;
+                        key->hw_key_idx = HW_KEY_IDX_INVALID;
+                } else {
+                        key->force_sw_encrypt =
+                                !!(keyconf->flags & IEEE80211_KEY_FORCE_SW_ENCRYPT);
+                        key->hw_key_idx =
+                                keyconf->hw_key_idx;
+
+                }
+        }
+        kfree(keyconf);
+}
+
+
+static int ieee80211_set_encryption(struct net_device *dev, u8 *sta_addr,
+                                    int idx, int alg, int set_tx_key,
+                                    const u8 *_key, size_t key_len)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        int ret = 0;
+        struct sta_info *sta;
+        struct ieee80211_key *key, *old_key;
+        int try_hwaccel = 1;
+        struct ieee80211_key_conf *keyconf;
+        struct ieee80211_sub_if_data *sdata;
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+
+        if (is_broadcast_ether_addr(sta_addr)) {
+                sta = NULL;
+                if (idx >= NUM_DEFAULT_KEYS) {
+                        printk(KERN_DEBUG "%s: set_encrypt - invalid idx=%d\n",
+                               dev->name, idx);
+                        return -EINVAL;
+                }
+                key = sdata->keys[idx];
+
+                /* TODO: consider adding hwaccel support for these; at least
+                 * Atheros key cache should be able to handle this since AP is
+                 * only transmitting frames with default keys. */
+                /* FIX: hw key cache can be used when only one virtual
+                 * STA is associated with each AP. If more than one STA
+                 * is associated to the same AP, software encryption
+                 * must be used. This should be done automatically
+                 * based on configured station devices. For the time
+                 * being, this can be only set at compile time. */
+        } else {
+                set_tx_key = 0;
+                if (idx != 0) {
+                        printk(KERN_DEBUG "%s: set_encrypt - non-zero idx for "
+                               "individual key\n", dev->name);
+                        return -EINVAL;
+                }
+
+                sta = sta_info_get(local, sta_addr);
+                if (!sta) {
+#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
+                        printk(KERN_DEBUG "%s: set_encrypt - unknown addr "
+                               MAC_FMT "\n",
+                               dev->name, MAC_ARG(sta_addr));
+#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
+
+                        return -ENOENT;
+                }
+
+                key = sta->key;
+        }
+
+        /* FIX:
+         * Cannot configure default hwaccel keys with WEP algorithm, if
+         * any of the virtual interfaces is using static WEP
+         * configuration because hwaccel would otherwise try to decrypt
+         * these frames.
+         *
+         * For now, just disable WEP hwaccel for broadcast when there is
+         * possibility of conflict with default keys. This can maybe later be
+         * optimized by using non-default keys (at least with Atheros ar521x).
+         */
+        if (!sta && alg == ALG_WEP && !local->default_wep_only &&
+            sdata->type != IEEE80211_IF_TYPE_IBSS &&
+            sdata->type != IEEE80211_IF_TYPE_AP) {
+                try_hwaccel = 0;
+        }
+
+        if (local->hw.flags & IEEE80211_HW_DEVICE_HIDES_WEP) {
+                /* Software encryption cannot be used with devices that hide
+                 * encryption from the host system, so always try to use
+                 * hardware acceleration with such devices. */
+                try_hwaccel = 1;
+        }
+
+        if ((local->hw.flags & IEEE80211_HW_NO_TKIP_WMM_HWACCEL) &&
+            alg == ALG_TKIP) {
+                if (sta && (sta->flags & WLAN_STA_WME)) {
+                /* Hardware does not support hwaccel with TKIP when using WMM.
+                 */
+                        try_hwaccel = 0;
+                }
+                else if (sdata->type == IEEE80211_IF_TYPE_STA) {
+                        sta = sta_info_get(local, sdata->u.sta.bssid);
+                        if (sta) {
+                                if (sta->flags & WLAN_STA_WME) {
+                                        try_hwaccel = 0;
+                                }
+                                sta_info_put(sta);
+                                sta = NULL;
+                        }
+                }
+        }
+
+        if (alg == ALG_NONE) {
+                keyconf = NULL;
+                if (try_hwaccel && key &&
+                    key->hw_key_idx != HW_KEY_IDX_INVALID &&
+                    local->ops->set_key &&
+                    (keyconf = ieee80211_key_data2conf(local, key)) != NULL &&
+                    local->ops->set_key(local_to_hw(local), DISABLE_KEY,
+                                       sta_addr, keyconf, sta ? sta->aid : 0)) {
+                        printk(KERN_DEBUG "%s: set_encrypt - low-level disable"
+                               " failed\n", dev->name);
+                        ret = -EINVAL;
+                }
+                kfree(keyconf);
+
+                if (set_tx_key || sdata->default_key == key) {
+                        ieee80211_debugfs_key_remove_default(sdata);
+                        sdata->default_key = NULL;
+                }
+                ieee80211_debugfs_key_remove(key);
+                if (sta)
+                        sta->key = NULL;
+                else
+                        sdata->keys[idx] = NULL;
+                ieee80211_key_free(key);
+                key = NULL;
+        } else {
+                old_key = key;
+                key = ieee80211_key_alloc(sta ? NULL : sdata, idx, key_len,
+                                          GFP_KERNEL);
+                if (!key) {
+                        ret = -ENOMEM;
+                        goto err_out;
+                }
+
+                /* default to sw encryption; low-level driver sets these if the
+                 * requested encryption is supported */
+                key->hw_key_idx = HW_KEY_IDX_INVALID;
+                key->force_sw_encrypt = 1;
+
+                key->alg = alg;
+                key->keyidx = idx;
+                key->keylen = key_len;
+                memcpy(key->key, _key, key_len);
+                if (set_tx_key)
+                        key->default_tx_key = 1;
+
+                if (alg == ALG_CCMP) {
+                        /* Initialize AES key state here as an optimization
+                         * so that it does not need to be initialized for every
+                         * packet. */
+                        key->u.ccmp.tfm = ieee80211_aes_key_setup_encrypt(
+                                key->key);
+                        if (!key->u.ccmp.tfm) {
+                                ret = -ENOMEM;
+                                goto err_free;
+                        }
+                }
+
+                if (set_tx_key || sdata->default_key == old_key) {
+                        ieee80211_debugfs_key_remove_default(sdata);
+                        sdata->default_key = NULL;
+                }
+                ieee80211_debugfs_key_remove(old_key);
+                if (sta)
+                        sta->key = key;
+                else
+                        sdata->keys[idx] = key;
+                ieee80211_key_free(old_key);
+                ieee80211_debugfs_key_add(local, key);
+                if (sta)
+                        ieee80211_debugfs_key_sta_link(key, sta);
+
+                if (try_hwaccel &&
+                    (alg == ALG_WEP || alg == ALG_TKIP || alg == ALG_CCMP))
+                        ieee80211_set_hw_encryption(dev, sta, sta_addr, key);
+        }
+
+        if (set_tx_key || (!sta && !sdata->default_key && key)) {
+                sdata->default_key = key;
+                if (key)
+                        ieee80211_debugfs_key_add_default(sdata);
+
+                if (local->ops->set_key_idx &&
+                    local->ops->set_key_idx(local_to_hw(local), idx))
+                        printk(KERN_DEBUG "%s: failed to set TX key idx for "
+                               "low-level driver\n", dev->name);
+        }
+
+        if (sta)
+                sta_info_put(sta);
+
+        return 0;
+
+err_free:
+        ieee80211_key_free(key);
+err_out:
+        if (sta)
+                sta_info_put(sta);
+        return ret;
+}
+
+static int ieee80211_ioctl_siwgenie(struct net_device *dev,
+                                    struct iw_request_info *info,
+                                    struct iw_point *data, char *extra)
+{
+        struct ieee80211_sub_if_data *sdata;
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+
+        if (local->user_space_mlme)
+                return -EOPNOTSUPP;
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        if (sdata->type == IEEE80211_IF_TYPE_STA ||
+            sdata->type == IEEE80211_IF_TYPE_IBSS) {
+                int ret = ieee80211_sta_set_extra_ie(dev, extra, data->length);
+                if (ret)
+                        return ret;
+                sdata->u.sta.auto_bssid_sel = 0;
+                ieee80211_sta_req_auth(dev, &sdata->u.sta);
+                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;
+}
+
+static int ieee80211_ioctl_set_radio_enabled(struct net_device *dev,
+                                             int val)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_conf *conf = &local->hw.conf;
+
+        conf->radio_enabled = val;
+        return ieee80211_hw_config(wdev_priv(dev->ieee80211_ptr));
+}
+
+static int ieee80211_ioctl_giwname(struct net_device *dev,
+                                   struct iw_request_info *info,
+                                   char *name, char *extra)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+
+        switch (local->hw.conf.phymode) {
+        case MODE_IEEE80211A:
+                strcpy(name, "IEEE 802.11a");
+                break;
+        case MODE_IEEE80211B:
+                strcpy(name, "IEEE 802.11b");
+                break;
+        case MODE_IEEE80211G:
+                strcpy(name, "IEEE 802.11g");
+                break;
+        case MODE_ATHEROS_TURBO:
+                strcpy(name, "5GHz Turbo");
+                break;
+        default:
+                strcpy(name, "IEEE 802.11");
+                break;
+        }
+
+        return 0;
+}
+
+
+static int ieee80211_ioctl_giwrange(struct net_device *dev,
+                                 struct iw_request_info *info,
+                                 struct iw_point *data, char *extra)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct iw_range *range = (struct iw_range *) extra;
+
+        data->length = sizeof(struct iw_range);
+        memset(range, 0, sizeof(struct iw_range));
+
+        range->we_version_compiled = WIRELESS_EXT;
+        range->we_version_source = 21;
+        range->retry_capa = IW_RETRY_LIMIT;
+        range->retry_flags = IW_RETRY_LIMIT;
+        range->min_retry = 0;
+        range->max_retry = 255;
+        range->min_rts = 0;
+        range->max_rts = 2347;
+        range->min_frag = 256;
+        range->max_frag = 2346;
+
+        range->encoding_size[0] = 5;
+        range->encoding_size[1] = 13;
+        range->num_encoding_sizes = 2;
+        range->max_encoding_tokens = NUM_DEFAULT_KEYS;
+
+        range->max_qual.qual = local->hw.max_signal;
+        range->max_qual.level = local->hw.max_rssi;
+        range->max_qual.noise = local->hw.max_noise;
+        range->max_qual.updated = local->wstats_flags;
+
+        range->avg_qual.qual = local->hw.max_signal/2;
+        range->avg_qual.level = 0;
+        range->avg_qual.noise = 0;
+        range->avg_qual.updated = local->wstats_flags;
+
+        range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2 |
+                          IW_ENC_CAPA_CIPHER_TKIP | IW_ENC_CAPA_CIPHER_CCMP;
+
+        IW_EVENT_CAPA_SET_KERNEL(range->event_capa);
+        IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWTHRSPY);
+        IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWAP);
+        IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWSCAN);
+
+        return 0;
+}
+
+
+struct ieee80211_channel_range {
+        short start_freq;
+        short end_freq;
+        unsigned char power_level;
+        unsigned char antenna_max;
+};
+
+static const struct ieee80211_channel_range ieee80211_fcc_channels[] = {
+        { 2412, 2462, 27, 6 } /* IEEE 802.11b/g, channels 1..11 */,
+        { 5180, 5240, 17, 6 } /* IEEE 802.11a, channels 36..48 */,
+        { 5260, 5320, 23, 6 } /* IEEE 802.11a, channels 52..64 */,
+        { 5745, 5825, 30, 6 } /* IEEE 802.11a, channels 149..165, outdoor */,
+        { 0 }
+};
+
+static const struct ieee80211_channel_range ieee80211_mkk_channels[] = {
+        { 2412, 2472, 20, 6 } /* IEEE 802.11b/g, channels 1..13 */,
+        { 5170, 5240, 20, 6 } /* IEEE 802.11a, channels 34..48 */,
+        { 5260, 5320, 20, 6 } /* IEEE 802.11a, channels 52..64 */,
+        { 0 }
+};
+
+
+static const struct ieee80211_channel_range *channel_range =
+        ieee80211_fcc_channels;
+
+
+static void ieee80211_unmask_channel(struct net_device *dev, int mode,
+                                     struct ieee80211_channel *chan)
+{
+        int i;
+
+        chan->flag = 0;
+
+        if (ieee80211_regdom == 64 &&
+            (mode == MODE_ATHEROS_TURBO || mode == MODE_ATHEROS_TURBOG)) {
+                /* Do not allow Turbo modes in Japan. */
+                return;
+        }
+
+        for (i = 0; channel_range[i].start_freq; i++) {
+                const struct ieee80211_channel_range *r = &channel_range[i];
+                if (r->start_freq <= chan->freq && r->end_freq >= chan->freq) {
+                        if (ieee80211_regdom == 64 && !ieee80211_japan_5ghz &&
+                            chan->freq >= 5260 && chan->freq <= 5320) {
+                                /*
+                                 * Skip new channels in Japan since the
+                                 * firmware was not marked having been upgraded
+                                 * by the vendor.
+                                 */
+                                continue;
+                        }
+
+                        if (ieee80211_regdom == 0x10 &&
+                            (chan->freq == 5190 || chan->freq == 5210 ||
+                             chan->freq == 5230)) {
+                                    /* Skip MKK channels when in FCC domain. */
+                                    continue;
+                        }
+
+                        chan->flag |= IEEE80211_CHAN_W_SCAN |
+                                IEEE80211_CHAN_W_ACTIVE_SCAN |
+                                IEEE80211_CHAN_W_IBSS;
+                        chan->power_level = r->power_level;
+                        chan->antenna_max = r->antenna_max;
+
+                        if (ieee80211_regdom == 64 &&
+                            (chan->freq == 5170 || chan->freq == 5190 ||
+                             chan->freq == 5210 || chan->freq == 5230)) {
+                                /*
+                                 * New regulatory rules in Japan have backwards
+                                 * compatibility with old channels in 5.15-5.25
+                                 * GHz band, but the station is not allowed to
+                                 * use active scan on these old channels.
+                                 */
+                                chan->flag &= ~IEEE80211_CHAN_W_ACTIVE_SCAN;
+                        }
+
+                        if (ieee80211_regdom == 64 &&
+                            (chan->freq == 5260 || chan->freq == 5280 ||
+                             chan->freq == 5300 || chan->freq == 5320)) {
+                                /*
+                                 * IBSS is not allowed on 5.25-5.35 GHz band
+                                 * due to radar detection requirements.
+                                 */
+                                chan->flag &= ~IEEE80211_CHAN_W_IBSS;
+                        }
+
+                        break;
+                }
+        }
+}
+
+
+static int ieee80211_unmask_channels(struct net_device *dev)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_hw_mode *mode;
+        int c;
+
+        list_for_each_entry(mode, &local->modes_list, list) {
+                for (c = 0; c < mode->num_channels; c++) {
+                        ieee80211_unmask_channel(dev, mode->mode,
+                                                 &mode->channels[c]);
+                }
+        }
+        return 0;
+}
+
+
+int ieee80211_init_client(struct net_device *dev)
+{
+        if (ieee80211_regdom == 0x40)
+                channel_range = ieee80211_mkk_channels;
+        ieee80211_unmask_channels(dev);
+        return 0;
+}
+
+
+static int ieee80211_ioctl_siwmode(struct net_device *dev,
+                                   struct iw_request_info *info,
+                                   __u32 *mode, char *extra)
+{
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        int type;
+
+        if (sdata->type == IEEE80211_IF_TYPE_VLAN)
+                return -EOPNOTSUPP;
+
+        switch (*mode) {
+        case IW_MODE_INFRA:
+                type = IEEE80211_IF_TYPE_STA;
+                break;
+        case IW_MODE_ADHOC:
+                type = IEEE80211_IF_TYPE_IBSS;
+                break;
+        case IW_MODE_MONITOR:
+                type = IEEE80211_IF_TYPE_MNTR;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        if (type == sdata->type)
+                return 0;
+        if (netif_running(dev))
+                return -EBUSY;
+
+        ieee80211_if_reinit(dev);
+        ieee80211_if_set_type(dev, type);
+
+        return 0;
+}
+
+
+static int ieee80211_ioctl_giwmode(struct net_device *dev,
+                                   struct iw_request_info *info,
+                                   __u32 *mode, char *extra)
+{
+        struct ieee80211_sub_if_data *sdata;
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        switch (sdata->type) {
+        case IEEE80211_IF_TYPE_AP:
+                *mode = IW_MODE_MASTER;
+                break;
+        case IEEE80211_IF_TYPE_STA:
+                *mode = IW_MODE_INFRA;
+                break;
+        case IEEE80211_IF_TYPE_IBSS:
+                *mode = IW_MODE_ADHOC;
+                break;
+        case IEEE80211_IF_TYPE_MNTR:
+                *mode = IW_MODE_MONITOR;
+                break;
+        case IEEE80211_IF_TYPE_WDS:
+                *mode = IW_MODE_REPEAT;
+                break;
+        case IEEE80211_IF_TYPE_VLAN:
+                *mode = IW_MODE_SECOND;         /* FIXME */
+                break;
+        default:
+                *mode = IW_MODE_AUTO;
+                break;
+        }
+        return 0;
+}
+
+int ieee80211_set_channel(struct ieee80211_local *local, int channel, int freq)
+{
+        struct ieee80211_hw_mode *mode;
+        int c, set = 0;
+        int ret = -EINVAL;
+
+        list_for_each_entry(mode, &local->modes_list, list) {
+                if (!(local->enabled_modes & (1 << mode->mode)))
+                        continue;
+                for (c = 0; c < mode->num_channels; c++) {
+                        struct ieee80211_channel *chan = &mode->channels[c];
+                        if (chan->flag & IEEE80211_CHAN_W_SCAN &&
+                            ((chan->chan == channel) || (chan->freq == freq))) {
+                                /* Use next_mode as the mode preference to
+                                 * resolve non-unique channel numbers. */
+                                if (set && mode->mode != local->next_mode)
+                                        continue;
+
+                                local->oper_channel = chan;
+                                local->oper_hw_mode = mode;
+                                set++;
+                        }
+                }
+        }
+
+        if (set) {
+                if (local->sta_scanning)
+                        ret = 0;
+                else
+                        ret = ieee80211_hw_config(local);
+
+                rate_control_clear(local);
+        }
+
+        return ret;
+}
+
+static int ieee80211_ioctl_siwfreq(struct net_device *dev,
+                                   struct iw_request_info *info,
+                                   struct iw_freq *freq, char *extra)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+
+        if (sdata->type == IEEE80211_IF_TYPE_STA)
+                sdata->u.sta.auto_channel_sel = 0;
+
+        /* freq->e == 0: freq->m = channel; otherwise freq = m * 10^e */
+        if (freq->e == 0) {
+                if (freq->m < 0) {
+                        if (sdata->type == IEEE80211_IF_TYPE_STA)
+                                sdata->u.sta.auto_channel_sel = 1;
+                        return 0;
+                } else
+                        return ieee80211_set_channel(local, freq->m, -1);
+        } else {
+                int i, div = 1000000;
+                for (i = 0; i < freq->e; i++)
+                        div /= 10;
+                if (div > 0)
+                        return ieee80211_set_channel(local, -1, freq->m / div);
+                else
+                        return -EINVAL;
+        }
+}
+
+
+static int ieee80211_ioctl_giwfreq(struct net_device *dev,
+                                   struct iw_request_info *info,
+                                   struct iw_freq *freq, char *extra)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+
+        /* TODO: in station mode (Managed/Ad-hoc) might need to poll low-level
+         * driver for the current channel with firmware-based management */
+
+        freq->m = local->hw.conf.freq;
+        freq->e = 6;
+
+        return 0;
+}
+
+
+static int ieee80211_ioctl_siwessid(struct net_device *dev,
+                                    struct iw_request_info *info,
+                                    struct iw_point *data, char *ssid)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sub_if_data *sdata;
+        size_t len = data->length;
+
+        /* iwconfig uses nul termination in SSID.. */
+        if (len > 0 && ssid[len - 1] == '\0')
+                len--;
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        if (sdata->type == IEEE80211_IF_TYPE_STA ||
+            sdata->type == IEEE80211_IF_TYPE_IBSS) {
+                int ret;
+                if (local->user_space_mlme) {
+                        if (len > IEEE80211_MAX_SSID_LEN)
+                                return -EINVAL;
+                        memcpy(sdata->u.sta.ssid, ssid, len);
+                        sdata->u.sta.ssid_len = len;
+                        return 0;
+                }
+                sdata->u.sta.auto_ssid_sel = !data->flags;
+                ret = ieee80211_sta_set_ssid(dev, ssid, len);
+                if (ret)
+                        return ret;
+                ieee80211_sta_req_auth(dev, &sdata->u.sta);
+                return 0;
+        }
+
+        if (sdata->type == IEEE80211_IF_TYPE_AP) {
+                memcpy(sdata->u.ap.ssid, ssid, len);
+                memset(sdata->u.ap.ssid + len, 0,
+                       IEEE80211_MAX_SSID_LEN - len);
+                sdata->u.ap.ssid_len = len;
+                return ieee80211_if_config(dev);
+        }
+        return -EOPNOTSUPP;
+}
+
+
+static int ieee80211_ioctl_giwessid(struct net_device *dev,
+                                    struct iw_request_info *info,
+                                    struct iw_point *data, char *ssid)
+{
+        size_t len;
+
+        struct ieee80211_sub_if_data *sdata;
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        if (sdata->type == IEEE80211_IF_TYPE_STA ||
+            sdata->type == IEEE80211_IF_TYPE_IBSS) {
+                int res = ieee80211_sta_get_ssid(dev, ssid, &len);
+                if (res == 0) {
+                        data->length = len;
+                        data->flags = 1;
+                } else
+                        data->flags = 0;
+                return res;
+        }
+
+        if (sdata->type == IEEE80211_IF_TYPE_AP) {
+                len = sdata->u.ap.ssid_len;
+                if (len > IW_ESSID_MAX_SIZE)
+                        len = IW_ESSID_MAX_SIZE;
+                memcpy(ssid, sdata->u.ap.ssid, len);
+                data->length = len;
+                data->flags = 1;
+                return 0;
+        }
+        return -EOPNOTSUPP;
+}
+
+
+static int ieee80211_ioctl_siwap(struct net_device *dev,
+                                 struct iw_request_info *info,
+                                 struct sockaddr *ap_addr, char *extra)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sub_if_data *sdata;
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        if (sdata->type == IEEE80211_IF_TYPE_STA ||
+            sdata->type == IEEE80211_IF_TYPE_IBSS) {
+                int ret;
+                if (local->user_space_mlme) {
+                        memcpy(sdata->u.sta.bssid, (u8 *) &ap_addr->sa_data,
+                               ETH_ALEN);
+                        return 0;
+                }
+                if (is_zero_ether_addr((u8 *) &ap_addr->sa_data)) {
+                        sdata->u.sta.auto_bssid_sel = 1;
+                        sdata->u.sta.auto_channel_sel = 1;
+                } else if (is_broadcast_ether_addr((u8 *) &ap_addr->sa_data))
+                        sdata->u.sta.auto_bssid_sel = 1;
+                else
+                        sdata->u.sta.auto_bssid_sel = 0;
+                ret = ieee80211_sta_set_bssid(dev, (u8 *) &ap_addr->sa_data);
+                if (ret)
+                        return ret;
+                ieee80211_sta_req_auth(dev, &sdata->u.sta);
+                return 0;
+        } else if (sdata->type == IEEE80211_IF_TYPE_WDS) {
+                if (memcmp(sdata->u.wds.remote_addr, (u8 *) &ap_addr->sa_data,
+                           ETH_ALEN) == 0)
+                        return 0;
+                return ieee80211_if_update_wds(dev, (u8 *) &ap_addr->sa_data);
+        }
+
+        return -EOPNOTSUPP;
+}
+
+
+static int ieee80211_ioctl_giwap(struct net_device *dev,
+                                 struct iw_request_info *info,
+                                 struct sockaddr *ap_addr, char *extra)
+{
+        struct ieee80211_sub_if_data *sdata;
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        if (sdata->type == IEEE80211_IF_TYPE_STA ||
+            sdata->type == IEEE80211_IF_TYPE_IBSS) {
+                ap_addr->sa_family = ARPHRD_ETHER;
+                memcpy(&ap_addr->sa_data, sdata->u.sta.bssid, ETH_ALEN);
+                return 0;
+        } else if (sdata->type == IEEE80211_IF_TYPE_WDS) {
+                ap_addr->sa_family = ARPHRD_ETHER;
+                memcpy(&ap_addr->sa_data, sdata->u.wds.remote_addr, ETH_ALEN);
+                return 0;
+        }
+
+        return -EOPNOTSUPP;
+}
+
+
+static int ieee80211_ioctl_siwscan(struct net_device *dev,
+                                   struct iw_request_info *info,
+                                   struct iw_point *data, char *extra)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        u8 *ssid = NULL;
+        size_t ssid_len = 0;
+
+        if (!netif_running(dev))
+                return -ENETDOWN;
+
+        if (local->scan_flags & IEEE80211_SCAN_MATCH_SSID) {
+                if (sdata->type == IEEE80211_IF_TYPE_STA ||
+                    sdata->type == IEEE80211_IF_TYPE_IBSS) {
+                        ssid = sdata->u.sta.ssid;
+                        ssid_len = sdata->u.sta.ssid_len;
+                } else if (sdata->type == IEEE80211_IF_TYPE_AP) {
+                        ssid = sdata->u.ap.ssid;
+                        ssid_len = sdata->u.ap.ssid_len;
+                } else
+                        return -EINVAL;
+        }
+        return ieee80211_sta_req_scan(dev, ssid, ssid_len);
+}
+
+
+static int ieee80211_ioctl_giwscan(struct net_device *dev,
+                                   struct iw_request_info *info,
+                                   struct iw_point *data, char *extra)
+{
+        int res;
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        if (local->sta_scanning)
+                return -EAGAIN;
+        res = ieee80211_sta_scan_results(dev, extra, data->length);
+        if (res >= 0) {
+                data->length = res;
+                return 0;
+        }
+        data->length = 0;
+        return res;
+}
+
+
+static int ieee80211_ioctl_siwrts(struct net_device *dev,
+                                  struct iw_request_info *info,
+                                  struct iw_param *rts, char *extra)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+
+        if (rts->disabled)
+                local->rts_threshold = IEEE80211_MAX_RTS_THRESHOLD;
+        else if (rts->value < 0 || rts->value > IEEE80211_MAX_RTS_THRESHOLD)
+                return -EINVAL;
+        else
+                local->rts_threshold = rts->value;
+
+        /* If the wlan card performs RTS/CTS in hardware/firmware,
+         * configure it here */
+
+        if (local->ops->set_rts_threshold)
+                local->ops->set_rts_threshold(local_to_hw(local),
+                                             local->rts_threshold);
+
+        return 0;
+}
+
+static int ieee80211_ioctl_giwrts(struct net_device *dev,
+                                  struct iw_request_info *info,
+                                  struct iw_param *rts, char *extra)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+
+        rts->value = local->rts_threshold;
+        rts->disabled = (rts->value >= IEEE80211_MAX_RTS_THRESHOLD);
+        rts->fixed = 1;
+
+        return 0;
+}
+
+
+static int ieee80211_ioctl_siwfrag(struct net_device *dev,
+                                   struct iw_request_info *info,
+                                   struct iw_param *frag, char *extra)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+
+        if (frag->disabled)
+                local->fragmentation_threshold = IEEE80211_MAX_FRAG_THRESHOLD;
+        else if (frag->value < 256 ||
+                 frag->value > IEEE80211_MAX_FRAG_THRESHOLD)
+                return -EINVAL;
+        else {
+                /* Fragment length must be even, so strip LSB. */
+                local->fragmentation_threshold = frag->value & ~0x1;
+        }
+
+        /* If the wlan card performs fragmentation in hardware/firmware,
+         * configure it here */
+
+        if (local->ops->set_frag_threshold)
+                local->ops->set_frag_threshold(
+                        local_to_hw(local),
+                        local->fragmentation_threshold);
+
+        return 0;
+}
+
+static int ieee80211_ioctl_giwfrag(struct net_device *dev,
+                                   struct iw_request_info *info,
+                                   struct iw_param *frag, char *extra)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+
+        frag->value = local->fragmentation_threshold;
+        frag->disabled = (frag->value >= IEEE80211_MAX_RTS_THRESHOLD);
+        frag->fixed = 1;
+
+        return 0;
+}
+
+
+static int ieee80211_ioctl_siwretry(struct net_device *dev,
+                                    struct iw_request_info *info,
+                                    struct iw_param *retry, char *extra)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+
+        if (retry->disabled ||
+            (retry->flags & IW_RETRY_TYPE) != IW_RETRY_LIMIT)
+                return -EINVAL;
+
+        if (retry->flags & IW_RETRY_MAX)
+                local->long_retry_limit = retry->value;
+        else if (retry->flags & IW_RETRY_MIN)
+                local->short_retry_limit = retry->value;
+        else {
+                local->long_retry_limit = retry->value;
+                local->short_retry_limit = retry->value;
+        }
+
+        if (local->ops->set_retry_limit) {
+                return local->ops->set_retry_limit(
+                        local_to_hw(local),
+                        local->short_retry_limit,
+                        local->long_retry_limit);
+        }
+
+        return 0;
+}
+
+
+static int ieee80211_ioctl_giwretry(struct net_device *dev,
+                                    struct iw_request_info *info,
+                                    struct iw_param *retry, char *extra)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+
+        retry->disabled = 0;
+        if (retry->flags == 0 || retry->flags & IW_RETRY_MIN) {
+                /* first return min value, iwconfig will ask max value
+                 * later if needed */
+                retry->flags |= IW_RETRY_LIMIT;
+                retry->value = local->short_retry_limit;
+                if (local->long_retry_limit != local->short_retry_limit)
+                        retry->flags |= IW_RETRY_MIN;
+                return 0;
+        }
+        if (retry->flags & IW_RETRY_MAX) {
+                retry->flags = IW_RETRY_LIMIT | IW_RETRY_MAX;
+                retry->value = local->long_retry_limit;
+        }
+
+        return 0;
+}
+
+static int ieee80211_ioctl_clear_keys(struct net_device *dev)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_key_conf key;
+        int i;
+        u8 addr[ETH_ALEN];
+        struct ieee80211_key_conf *keyconf;
+        struct ieee80211_sub_if_data *sdata;
+        struct sta_info *sta;
+
+        memset(addr, 0xff, ETH_ALEN);
+        read_lock(&local->sub_if_lock);
+        list_for_each_entry(sdata, &local->sub_if_list, list) {
+                for (i = 0; i < NUM_DEFAULT_KEYS; i++) {
+                        keyconf = NULL;
+                        if (sdata->keys[i] &&
+                            !sdata->keys[i]->force_sw_encrypt &&
+                            local->ops->set_key &&
+                            (keyconf = ieee80211_key_data2conf(local,
+                                                               sdata->keys[i])))
+                                local->ops->set_key(local_to_hw(local),
+                                                   DISABLE_KEY, addr,
+                                                   keyconf, 0);
+                        kfree(keyconf);
+                        ieee80211_key_free(sdata->keys[i]);
+                        sdata->keys[i] = NULL;
+                }
+                sdata->default_key = NULL;
+        }
+        read_unlock(&local->sub_if_lock);
+
+        spin_lock_bh(&local->sta_lock);
+        list_for_each_entry(sta, &local->sta_list, list) {
+                keyconf = NULL;
+                if (sta->key && !sta->key->force_sw_encrypt &&
+                    local->ops->set_key &&
+                    (keyconf = ieee80211_key_data2conf(local, sta->key)))
+                        local->ops->set_key(local_to_hw(local), DISABLE_KEY,
+                                           sta->addr, keyconf, sta->aid);
+                kfree(keyconf);
+                ieee80211_key_free(sta->key);
+                sta->key = NULL;
+        }
+        spin_unlock_bh(&local->sta_lock);
+
+        memset(&key, 0, sizeof(key));
+        if (local->ops->set_key &&
+                    local->ops->set_key(local_to_hw(local), REMOVE_ALL_KEYS,
+                                       NULL, &key, 0))
+                printk(KERN_DEBUG "%s: failed to remove hwaccel keys\n",
+                       dev->name);
+
+        return 0;
+}
+
+
+static int
+ieee80211_ioctl_force_unicast_rate(struct net_device *dev,
+                                   struct ieee80211_sub_if_data *sdata,
+                                   int rate)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_hw_mode *mode;
+        int i;
+
+        if (sdata->type != IEEE80211_IF_TYPE_AP)
+                return -ENOENT;
+
+        if (rate == 0) {
+                sdata->u.ap.force_unicast_rateidx = -1;
+                return 0;
+        }
+
+        mode = local->oper_hw_mode;
+        for (i = 0; i < mode->num_rates; i++) {
+                if (mode->rates[i].rate == rate) {
+                        sdata->u.ap.force_unicast_rateidx = i;
+                        return 0;
+                }
+        }
+        return -EINVAL;
+}
+
+
+static int
+ieee80211_ioctl_max_ratectrl_rate(struct net_device *dev,
+                                  struct ieee80211_sub_if_data *sdata,
+                                  int rate)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_hw_mode *mode;
+        int i;
+
+        if (sdata->type != IEEE80211_IF_TYPE_AP)
+                return -ENOENT;
+
+        if (rate == 0) {
+                sdata->u.ap.max_ratectrl_rateidx = -1;
+                return 0;
+        }
+
+        mode = local->oper_hw_mode;
+        for (i = 0; i < mode->num_rates; i++) {
+                if (mode->rates[i].rate == rate) {
+                        sdata->u.ap.max_ratectrl_rateidx = i;
+                        return 0;
+                }
+        }
+        return -EINVAL;
+}
+
+
+static void ieee80211_key_enable_hwaccel(struct ieee80211_local *local,
+                                         struct ieee80211_key *key)
+{
+        struct ieee80211_key_conf *keyconf;
+        u8 addr[ETH_ALEN];
+
+        if (!key || key->alg != ALG_WEP || !key->force_sw_encrypt ||
+            (local->hw.flags & IEEE80211_HW_DEVICE_HIDES_WEP))
+                return;
+
+        memset(addr, 0xff, ETH_ALEN);
+        keyconf = ieee80211_key_data2conf(local, key);
+        if (keyconf && local->ops->set_key &&
+            local->ops->set_key(local_to_hw(local),
+                               SET_KEY, addr, keyconf, 0) == 0) {
+                key->force_sw_encrypt =
+                        !!(keyconf->flags & IEEE80211_KEY_FORCE_SW_ENCRYPT);
+                key->hw_key_idx = keyconf->hw_key_idx;
+        }
+        kfree(keyconf);
+}
+
+
+static void ieee80211_key_disable_hwaccel(struct ieee80211_local *local,
+                                          struct ieee80211_key *key)
+{
+        struct ieee80211_key_conf *keyconf;
+        u8 addr[ETH_ALEN];
+
+        if (!key || key->alg != ALG_WEP || key->force_sw_encrypt ||
+            (local->hw.flags & IEEE80211_HW_DEVICE_HIDES_WEP))
+                return;
+
+        memset(addr, 0xff, ETH_ALEN);
+        keyconf = ieee80211_key_data2conf(local, key);
+        if (keyconf && local->ops->set_key)
+                local->ops->set_key(local_to_hw(local), DISABLE_KEY,
+                                   addr, keyconf, 0);
+        kfree(keyconf);
+        key->force_sw_encrypt = 1;
+}
+
+
+static int ieee80211_ioctl_default_wep_only(struct ieee80211_local *local,
+                                            int value)
+{
+        int i;
+        struct ieee80211_sub_if_data *sdata;
+
+        local->default_wep_only = value;
+        read_lock(&local->sub_if_lock);
+        list_for_each_entry(sdata, &local->sub_if_list, list)
+                for (i = 0; i < NUM_DEFAULT_KEYS; i++)
+                        if (value)
+                                ieee80211_key_enable_hwaccel(local,
+                                                             sdata->keys[i]);
+                        else
+                                ieee80211_key_disable_hwaccel(local,
+                                                              sdata->keys[i]);
+        read_unlock(&local->sub_if_lock);
+
+        return 0;
+}
+
+
+void ieee80211_update_default_wep_only(struct ieee80211_local *local)
+{
+        int i = 0;
+        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 == local->mdev)
+                        continue;
+
+                /* If there is an AP interface then depend on userspace to
+                   set default_wep_only correctly. */
+                if (sdata->type == IEEE80211_IF_TYPE_AP) {
+                        read_unlock(&local->sub_if_lock);
+                        return;
+                }
+
+                i++;
+        }
+
+        read_unlock(&local->sub_if_lock);
+
+        if (i <= 1)
+                ieee80211_ioctl_default_wep_only(local, 1);
+        else
+                ieee80211_ioctl_default_wep_only(local, 0);
+}
+
+
+static int ieee80211_ioctl_prism2_param(struct net_device *dev,
+                                        struct iw_request_info *info,
+                                        void *wrqu, char *extra)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sub_if_data *sdata;
+        int *i = (int *) extra;
+        int param = *i;
+        int value = *(i + 1);
+        int ret = 0;
+
+        if (!capable(CAP_NET_ADMIN))
+                return -EPERM;
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+
+        switch (param) {
+        case PRISM2_PARAM_IEEE_802_1X:
+                if (local->ops->set_ieee8021x)
+                        ret = local->ops->set_ieee8021x(local_to_hw(local),
+                                                        value);
+                if (ret)
+                        printk(KERN_DEBUG "%s: failed to set IEEE 802.1X (%d) "
+                               "for low-level driver\n", dev->name, value);
+                else
+                        sdata->ieee802_1x = value;
+                break;
+
+        case PRISM2_PARAM_ANTSEL_TX:
+                local->hw.conf.antenna_sel_tx = value;
+                if (ieee80211_hw_config(local))
+                        ret = -EINVAL;
+                break;
+
+        case PRISM2_PARAM_ANTSEL_RX:
+                local->hw.conf.antenna_sel_rx = value;
+                if (ieee80211_hw_config(local))
+                        ret = -EINVAL;
+                break;
+
+        case PRISM2_PARAM_CTS_PROTECT_ERP_FRAMES:
+                local->cts_protect_erp_frames = value;
+                break;
+
+        case PRISM2_PARAM_DROP_UNENCRYPTED:
+                sdata->drop_unencrypted = value;
+                break;
+
+        case PRISM2_PARAM_PREAMBLE:
+                local->short_preamble = value;
+                break;
+
+        case PRISM2_PARAM_STAT_TIME:
+                if (!local->stat_time && value) {
+                        local->stat_timer.expires = jiffies + HZ * value / 100;
+                        add_timer(&local->stat_timer);
+                } else if (local->stat_time && !value) {
+                        del_timer_sync(&local->stat_timer);
+                }
+                local->stat_time = value;
+                break;
+        case PRISM2_PARAM_SHORT_SLOT_TIME:
+                if (value)
+                        local->hw.conf.flags |= IEEE80211_CONF_SHORT_SLOT_TIME;
+                else
+                        local->hw.conf.flags &= ~IEEE80211_CONF_SHORT_SLOT_TIME;
+                if (ieee80211_hw_config(local))
+                        ret = -EINVAL;
+                break;
+
+        case PRISM2_PARAM_NEXT_MODE:
+                local->next_mode = value;
+                break;
+
+        case PRISM2_PARAM_CLEAR_KEYS:
+                ret = ieee80211_ioctl_clear_keys(dev);
+                break;
+
+        case PRISM2_PARAM_RADIO_ENABLED:
+                ret = ieee80211_ioctl_set_radio_enabled(dev, value);
+                break;
+
+        case PRISM2_PARAM_ANTENNA_MODE:
+                local->hw.conf.antenna_mode = value;
+                if (ieee80211_hw_config(local))
+                        ret = -EINVAL;
+                break;
+
+        case PRISM2_PARAM_STA_ANTENNA_SEL:
+                local->sta_antenna_sel = value;
+                break;
+
+        case PRISM2_PARAM_FORCE_UNICAST_RATE:
+                ret = ieee80211_ioctl_force_unicast_rate(dev, sdata, value);
+                break;
+
+        case PRISM2_PARAM_MAX_RATECTRL_RATE:
+                ret = ieee80211_ioctl_max_ratectrl_rate(dev, sdata, value);
+                break;
+
+        case PRISM2_PARAM_RATE_CTRL_NUM_UP:
+                local->rate_ctrl_num_up = value;
+                break;
+
+        case PRISM2_PARAM_RATE_CTRL_NUM_DOWN:
+                local->rate_ctrl_num_down = value;
+                break;
+
+        case PRISM2_PARAM_TX_POWER_REDUCTION:
+                if (value < 0)
+                        ret = -EINVAL;
+                else
+                        local->hw.conf.tx_power_reduction = value;
+                break;
+
+        case PRISM2_PARAM_KEY_TX_RX_THRESHOLD:
+                local->key_tx_rx_threshold = value;
+                break;
+
+        case PRISM2_PARAM_DEFAULT_WEP_ONLY:
+                ret = ieee80211_ioctl_default_wep_only(local, value);
+                break;
+
+        case PRISM2_PARAM_WIFI_WME_NOACK_TEST:
+                local->wifi_wme_noack_test = value;
+                break;
+
+        case PRISM2_PARAM_SCAN_FLAGS:
+                local->scan_flags = value;
+                break;
+
+        case PRISM2_PARAM_MIXED_CELL:
+                if (sdata->type != IEEE80211_IF_TYPE_STA &&
+                    sdata->type != IEEE80211_IF_TYPE_IBSS)
+                        ret = -EINVAL;
+                else
+                        sdata->u.sta.mixed_cell = !!value;
+                break;
+
+        case PRISM2_PARAM_HW_MODES:
+                local->enabled_modes = value;
+                break;
+
+        case PRISM2_PARAM_CREATE_IBSS:
+                if (sdata->type != IEEE80211_IF_TYPE_IBSS)
+                        ret = -EINVAL;
+                else
+                        sdata->u.sta.create_ibss = !!value;
+                break;
+        case PRISM2_PARAM_WMM_ENABLED:
+                if (sdata->type != IEEE80211_IF_TYPE_STA &&
+                    sdata->type != IEEE80211_IF_TYPE_IBSS)
+                        ret = -EINVAL;
+                else
+                        sdata->u.sta.wmm_enabled = !!value;
+                break;
+        case PRISM2_PARAM_RADAR_DETECT:
+                local->hw.conf.radar_detect = value;
+                break;
+        case PRISM2_PARAM_SPECTRUM_MGMT:
+                local->hw.conf.spect_mgmt = value;
+                break;
+        default:
+                ret = -EOPNOTSUPP;
+                break;
+        }
+
+        return ret;
+}
+
+
+static int ieee80211_ioctl_get_prism2_param(struct net_device *dev,
+                                            struct iw_request_info *info,
+                                            void *wrqu, char *extra)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sub_if_data *sdata;
+        int *param = (int *) extra;
+        int ret = 0;
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+
+        switch (*param) {
+        case PRISM2_PARAM_IEEE_802_1X:
+                *param = sdata->ieee802_1x;
+                break;
+
+        case PRISM2_PARAM_ANTSEL_TX:
+                *param = local->hw.conf.antenna_sel_tx;
+                break;
+
+        case PRISM2_PARAM_ANTSEL_RX:
+                *param = local->hw.conf.antenna_sel_rx;
+                break;
+
+        case PRISM2_PARAM_CTS_PROTECT_ERP_FRAMES:
+                *param = local->cts_protect_erp_frames;
+                break;
+
+        case PRISM2_PARAM_DROP_UNENCRYPTED:
+                *param = sdata->drop_unencrypted;
+                break;
+
+        case PRISM2_PARAM_PREAMBLE:
+                *param = local->short_preamble;
+                break;
+
+        case PRISM2_PARAM_STAT_TIME:
+                *param = local->stat_time;
+                break;
+        case PRISM2_PARAM_SHORT_SLOT_TIME:
+                *param = !!(local->hw.conf.flags & IEEE80211_CONF_SHORT_SLOT_TIME);
+                break;
+
+        case PRISM2_PARAM_NEXT_MODE:
+                *param = local->next_mode;
+                break;
+
+        case PRISM2_PARAM_ANTENNA_MODE:
+                *param = local->hw.conf.antenna_mode;
+                break;
+
+        case PRISM2_PARAM_STA_ANTENNA_SEL:
+                *param = local->sta_antenna_sel;
+                break;
+
+        case PRISM2_PARAM_RATE_CTRL_NUM_UP:
+                *param = local->rate_ctrl_num_up;
+                break;
+
+        case PRISM2_PARAM_RATE_CTRL_NUM_DOWN:
+                *param = local->rate_ctrl_num_down;
+                break;
+
+        case PRISM2_PARAM_TX_POWER_REDUCTION:
+                *param = local->hw.conf.tx_power_reduction;
+                break;
+
+        case PRISM2_PARAM_KEY_TX_RX_THRESHOLD:
+                *param = local->key_tx_rx_threshold;
+                break;
+
+        case PRISM2_PARAM_DEFAULT_WEP_ONLY:
+                *param = local->default_wep_only;
+                break;
+
+        case PRISM2_PARAM_WIFI_WME_NOACK_TEST:
+                *param = local->wifi_wme_noack_test;
+                break;
+
+        case PRISM2_PARAM_SCAN_FLAGS:
+                *param = local->scan_flags;
+                break;
+
+        case PRISM2_PARAM_HW_MODES:
+                *param = local->enabled_modes;
+                break;
+
+        case PRISM2_PARAM_CREATE_IBSS:
+                if (sdata->type != IEEE80211_IF_TYPE_IBSS)
+                        ret = -EINVAL;
+                else
+                        *param = !!sdata->u.sta.create_ibss;
+                break;
+
+        case PRISM2_PARAM_MIXED_CELL:
+                if (sdata->type != IEEE80211_IF_TYPE_STA &&
+                    sdata->type != IEEE80211_IF_TYPE_IBSS)
+                        ret = -EINVAL;
+                else
+                        *param = !!sdata->u.sta.mixed_cell;
+                break;
+        case PRISM2_PARAM_WMM_ENABLED:
+                if (sdata->type != IEEE80211_IF_TYPE_STA &&
+                    sdata->type != IEEE80211_IF_TYPE_IBSS)
+                        ret = -EINVAL;
+                else
+                        *param = !!sdata->u.sta.wmm_enabled;
+                break;
+        default:
+                ret = -EOPNOTSUPP;
+                break;
+        }
+
+        return ret;
+}
+
+static int ieee80211_ioctl_siwmlme(struct net_device *dev,
+                                   struct iw_request_info *info,
+                                   struct iw_point *data, char *extra)
+{
+        struct ieee80211_sub_if_data *sdata;
+        struct iw_mlme *mlme = (struct iw_mlme *) extra;
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        if (sdata->type != IEEE80211_IF_TYPE_STA &&
+            sdata->type != IEEE80211_IF_TYPE_IBSS)
+                return -EINVAL;
+
+        switch (mlme->cmd) {
+        case IW_MLME_DEAUTH:
+                /* TODO: mlme->addr.sa_data */
+                return ieee80211_sta_deauthenticate(dev, mlme->reason_code);
+        case IW_MLME_DISASSOC:
+                /* TODO: mlme->addr.sa_data */
+                return ieee80211_sta_disassociate(dev, mlme->reason_code);
+        default:
+                return -EOPNOTSUPP;
+        }
+}
+
+
+static int ieee80211_ioctl_siwencode(struct net_device *dev,
+                                     struct iw_request_info *info,
+                                     struct iw_point *erq, char *keybuf)
+{
+        struct ieee80211_sub_if_data *sdata;
+        int idx, i, alg = ALG_WEP;
+        u8 bcaddr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+
+        idx = erq->flags & IW_ENCODE_INDEX;
+        if (idx == 0) {
+                if (sdata->default_key)
+                        for (i = 0; i < NUM_DEFAULT_KEYS; i++) {
+                                if (sdata->default_key == sdata->keys[i]) {
+                                        idx = i;
+                                        break;
+                                }
+                        }
+        } else if (idx < 1 || idx > 4)
+                return -EINVAL;
+        else
+                idx--;
+
+        if (erq->flags & IW_ENCODE_DISABLED)
+                alg = ALG_NONE;
+        else if (erq->length == 0) {
+                /* No key data - just set the default TX key index */
+                if (sdata->default_key != sdata->keys[idx]) {
+                        ieee80211_debugfs_key_remove_default(sdata);
+                        sdata->default_key = sdata->keys[idx];
+                        if (sdata->default_key)
+                                ieee80211_debugfs_key_add_default(sdata);
+                }
+                return 0;
+        }
+
+        return ieee80211_set_encryption(
+                dev, bcaddr,
+                idx, alg,
+                !sdata->default_key,
+                keybuf, erq->length);
+}
+
+
+static int ieee80211_ioctl_giwencode(struct net_device *dev,
+                                     struct iw_request_info *info,
+                                     struct iw_point *erq, char *key)
+{
+        struct ieee80211_sub_if_data *sdata;
+        int idx, i;
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+
+        idx = erq->flags & IW_ENCODE_INDEX;
+        if (idx < 1 || idx > 4) {
+                idx = -1;
+                if (!sdata->default_key)
+                        idx = 0;
+                else for (i = 0; i < NUM_DEFAULT_KEYS; i++) {
+                        if (sdata->default_key == sdata->keys[i]) {
+                                idx = i;
+                                break;
+                        }
+                }
+                if (idx < 0)
+                        return -EINVAL;
+        } else
+                idx--;
+
+        erq->flags = idx + 1;
+
+        if (!sdata->keys[idx]) {
+                erq->length = 0;
+                erq->flags |= IW_ENCODE_DISABLED;
+                return 0;
+        }
+
+        memcpy(key, sdata->keys[idx]->key,
+               min((int)erq->length, sdata->keys[idx]->keylen));
+        erq->length = sdata->keys[idx]->keylen;
+        erq->flags |= IW_ENCODE_ENABLED;
+
+        return 0;
+}
+
+static int ieee80211_ioctl_siwauth(struct net_device *dev,
+                                   struct iw_request_info *info,
+                                   struct iw_param *data, char *extra)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        int ret = 0;
+
+        switch (data->flags & IW_AUTH_INDEX) {
+        case IW_AUTH_WPA_VERSION:
+        case IW_AUTH_CIPHER_PAIRWISE:
+        case IW_AUTH_CIPHER_GROUP:
+        case IW_AUTH_WPA_ENABLED:
+        case IW_AUTH_RX_UNENCRYPTED_EAPOL:
+                break;
+        case IW_AUTH_KEY_MGMT:
+                if (sdata->type != IEEE80211_IF_TYPE_STA)
+                        ret = -EINVAL;
+                else {
+                        /*
+                         * TODO: sdata->u.sta.key_mgmt does not match with WE18
+                         * value completely; could consider modifying this to
+                         * be closer to WE18. For now, this value is not really
+                         * used for anything else than Privacy matching, so the
+                         * current code here should be more or less OK.
+                         */
+                        if (data->value & IW_AUTH_KEY_MGMT_802_1X) {
+                                sdata->u.sta.key_mgmt =
+                                        IEEE80211_KEY_MGMT_WPA_EAP;
+                        } else if (data->value & IW_AUTH_KEY_MGMT_PSK) {
+                                sdata->u.sta.key_mgmt =
+                                        IEEE80211_KEY_MGMT_WPA_PSK;
+                        } else {
+                                sdata->u.sta.key_mgmt =
+                                        IEEE80211_KEY_MGMT_NONE;
+                        }
+                }
+                break;
+        case IW_AUTH_80211_AUTH_ALG:
+                if (sdata->type == IEEE80211_IF_TYPE_STA ||
+                    sdata->type == IEEE80211_IF_TYPE_IBSS)
+                        sdata->u.sta.auth_algs = data->value;
+                else
+                        ret = -EOPNOTSUPP;
+                break;
+        case IW_AUTH_PRIVACY_INVOKED:
+                if (local->ops->set_privacy_invoked)
+                        ret = local->ops->set_privacy_invoked(
+                                        local_to_hw(local), data->value);
+                break;
+        default:
+                ret = -EOPNOTSUPP;
+                break;
+        }
+        return ret;
+}
+
+/* Get wireless statistics.  Called by /proc/net/wireless and by SIOCGIWSTATS */
+static struct iw_statistics *ieee80211_get_wireless_stats(struct net_device *dev)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct iw_statistics *wstats = &local->wstats;
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        struct sta_info *sta = NULL;
+
+        if (sdata->type == IEEE80211_IF_TYPE_STA ||
+            sdata->type == IEEE80211_IF_TYPE_IBSS)
+                sta = sta_info_get(local, sdata->u.sta.bssid);
+        if (!sta) {
+                wstats->discard.fragment = 0;
+                wstats->discard.misc = 0;
+                wstats->qual.qual = 0;
+                wstats->qual.level = 0;
+                wstats->qual.noise = 0;
+                wstats->qual.updated = IW_QUAL_ALL_INVALID;
+        } else {
+                wstats->qual.level = sta->last_rssi;
+                wstats->qual.qual = sta->last_signal;
+                wstats->qual.noise = sta->last_noise;
+                wstats->qual.updated = local->wstats_flags;
+                sta_info_put(sta);
+        }
+        return wstats;
+}
+
+static int ieee80211_ioctl_giwauth(struct net_device *dev,
+                                   struct iw_request_info *info,
+                                   struct iw_param *data, char *extra)
+{
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        int ret = 0;
+
+        switch (data->flags & IW_AUTH_INDEX) {
+        case IW_AUTH_80211_AUTH_ALG:
+                if (sdata->type == IEEE80211_IF_TYPE_STA ||
+                    sdata->type == IEEE80211_IF_TYPE_IBSS)
+                        data->value = sdata->u.sta.auth_algs;
+                else
+                        ret = -EOPNOTSUPP;
+                break;
+        default:
+                ret = -EOPNOTSUPP;
+                break;
+        }
+        return ret;
+}
+
+
+static int ieee80211_ioctl_siwencodeext(struct net_device *dev,
+                                        struct iw_request_info *info,
+                                        struct iw_point *erq, char *extra)
+{
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        struct iw_encode_ext *ext = (struct iw_encode_ext *) extra;
+        int alg, idx, i;
+
+        switch (ext->alg) {
+        case IW_ENCODE_ALG_NONE:
+                alg = ALG_NONE;
+                break;
+        case IW_ENCODE_ALG_WEP:
+                alg = ALG_WEP;
+                break;
+        case IW_ENCODE_ALG_TKIP:
+                alg = ALG_TKIP;
+                break;
+        case IW_ENCODE_ALG_CCMP:
+                alg = ALG_CCMP;
+                break;
+        default:
+                return -EOPNOTSUPP;
+        }
+
+        if (erq->flags & IW_ENCODE_DISABLED)
+                alg = ALG_NONE;
+
+        idx = erq->flags & IW_ENCODE_INDEX;
+        if (idx < 1 || idx > 4) {
+                idx = -1;
+                if (!sdata->default_key)
+                        idx = 0;
+                else for (i = 0; i < NUM_DEFAULT_KEYS; i++) {
+                        if (sdata->default_key == sdata->keys[i]) {
+                                idx = i;
+                                break;
+                        }
+                }
+                if (idx < 0)
+                        return -EINVAL;
+        } else
+                idx--;
+
+        return ieee80211_set_encryption(dev, ext->addr.sa_data, idx, alg,
+                                        ext->ext_flags &
+                                        IW_ENCODE_EXT_SET_TX_KEY,
+                                        ext->key, ext->key_len);
+}
+
+
+static const struct iw_priv_args ieee80211_ioctl_priv[] = {
+        { PRISM2_IOCTL_PRISM2_PARAM,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2, 0, "param" },
+        { PRISM2_IOCTL_GET_PRISM2_PARAM,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "get_param" },
+};
+
+/* Structures to export the Wireless Handlers */
+
+static const iw_handler ieee80211_handler[] =
+{
+        (iw_handler) NULL,                              /* SIOCSIWCOMMIT */
+        (iw_handler) ieee80211_ioctl_giwname,           /* SIOCGIWNAME */
+        (iw_handler) NULL,                              /* SIOCSIWNWID */
+        (iw_handler) NULL,                              /* SIOCGIWNWID */
+        (iw_handler) ieee80211_ioctl_siwfreq,           /* SIOCSIWFREQ */
+        (iw_handler) ieee80211_ioctl_giwfreq,           /* SIOCGIWFREQ */
+        (iw_handler) ieee80211_ioctl_siwmode,           /* SIOCSIWMODE */
+        (iw_handler) ieee80211_ioctl_giwmode,           /* SIOCGIWMODE */
+        (iw_handler) NULL,                              /* SIOCSIWSENS */
+        (iw_handler) NULL,                              /* SIOCGIWSENS */
+        (iw_handler) NULL /* not used */,               /* SIOCSIWRANGE */
+        (iw_handler) ieee80211_ioctl_giwrange,          /* SIOCGIWRANGE */
+        (iw_handler) NULL /* not used */,               /* SIOCSIWPRIV */
+        (iw_handler) NULL /* kernel code */,            /* SIOCGIWPRIV */
+        (iw_handler) NULL /* not used */,               /* SIOCSIWSTATS */
+        (iw_handler) NULL /* kernel code */,            /* SIOCGIWSTATS */
+        iw_handler_set_spy,                             /* SIOCSIWSPY */
+        iw_handler_get_spy,                             /* SIOCGIWSPY */
+        iw_handler_set_thrspy,                          /* SIOCSIWTHRSPY */
+        iw_handler_get_thrspy,                          /* SIOCGIWTHRSPY */
+        (iw_handler) ieee80211_ioctl_siwap,             /* SIOCSIWAP */
+        (iw_handler) ieee80211_ioctl_giwap,             /* SIOCGIWAP */
+        (iw_handler) ieee80211_ioctl_siwmlme,           /* SIOCSIWMLME */
+        (iw_handler) NULL,                              /* SIOCGIWAPLIST */
+        (iw_handler) ieee80211_ioctl_siwscan,           /* SIOCSIWSCAN */
+        (iw_handler) ieee80211_ioctl_giwscan,           /* SIOCGIWSCAN */
+        (iw_handler) ieee80211_ioctl_siwessid,          /* SIOCSIWESSID */
+        (iw_handler) ieee80211_ioctl_giwessid,          /* SIOCGIWESSID */
+        (iw_handler) NULL,                              /* SIOCSIWNICKN */
+        (iw_handler) NULL,                              /* SIOCGIWNICKN */
+        (iw_handler) NULL,                              /* -- hole -- */
+        (iw_handler) NULL,                              /* -- hole -- */
+        (iw_handler) NULL,                              /* SIOCSIWRATE */
+        (iw_handler) NULL,                              /* SIOCGIWRATE */
+        (iw_handler) ieee80211_ioctl_siwrts,            /* SIOCSIWRTS */
+        (iw_handler) ieee80211_ioctl_giwrts,            /* SIOCGIWRTS */
+        (iw_handler) ieee80211_ioctl_siwfrag,           /* SIOCSIWFRAG */
+        (iw_handler) ieee80211_ioctl_giwfrag,           /* SIOCGIWFRAG */
+        (iw_handler) NULL,                              /* SIOCSIWTXPOW */
+        (iw_handler) NULL,                              /* SIOCGIWTXPOW */
+        (iw_handler) ieee80211_ioctl_siwretry,          /* SIOCSIWRETRY */
+        (iw_handler) ieee80211_ioctl_giwretry,          /* SIOCGIWRETRY */
+        (iw_handler) ieee80211_ioctl_siwencode,         /* SIOCSIWENCODE */
+        (iw_handler) ieee80211_ioctl_giwencode,         /* SIOCGIWENCODE */
+        (iw_handler) NULL,                              /* SIOCSIWPOWER */
+        (iw_handler) NULL,                              /* SIOCGIWPOWER */
+        (iw_handler) NULL,                              /* -- hole -- */
+        (iw_handler) NULL,                              /* -- hole -- */
+        (iw_handler) ieee80211_ioctl_siwgenie,          /* SIOCSIWGENIE */
+        (iw_handler) NULL,                              /* SIOCGIWGENIE */
+        (iw_handler) ieee80211_ioctl_siwauth,           /* SIOCSIWAUTH */
+        (iw_handler) ieee80211_ioctl_giwauth,           /* SIOCGIWAUTH */
+        (iw_handler) ieee80211_ioctl_siwencodeext,      /* SIOCSIWENCODEEXT */
+        (iw_handler) NULL,                              /* SIOCGIWENCODEEXT */
+        (iw_handler) NULL,                              /* SIOCSIWPMKSA */
+        (iw_handler) NULL,                              /* -- hole -- */
+};
+
+static const iw_handler ieee80211_private_handler[] =
+{                                                       /* SIOCIWFIRSTPRIV + */
+        (iw_handler) ieee80211_ioctl_prism2_param,      /* 0 */
+        (iw_handler) ieee80211_ioctl_get_prism2_param,  /* 1 */
+};
+
+const struct iw_handler_def ieee80211_iw_handler_def =
+{
+        .num_standard   = ARRAY_SIZE(ieee80211_handler),
+        .num_private    = ARRAY_SIZE(ieee80211_private_handler),
+        .num_private_args = ARRAY_SIZE(ieee80211_ioctl_priv),
+        .standard       = (iw_handler *) ieee80211_handler,
+        .private        = (iw_handler *) ieee80211_private_handler,
+        .private_args   = (struct iw_priv_args *) ieee80211_ioctl_priv,
+        .get_wireless_stats = ieee80211_get_wireless_stats,
+};
diff --git a/net/mac80211/ieee80211_key.h b/net/mac80211/ieee80211_key.h
new file mode 100644
index 000000000000..c33384912782
--- /dev/null
+++ b/net/mac80211/ieee80211_key.h
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2002-2004, Instant802 Networks, Inc.
+ * Copyright 2005, Devicescape Software, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef IEEE80211_KEY_H
+#define IEEE80211_KEY_H
+
+#include <linux/types.h>
+#include <linux/kref.h>
+#include <linux/crypto.h>
+#include <net/mac80211.h>
+
+/* ALG_TKIP
+ * struct ieee80211_key::key is encoded as a 256-bit (32 byte) data block:
+ * Temporal Encryption Key (128 bits)
+ * Temporal Authenticator Tx MIC Key (64 bits)
+ * Temporal Authenticator Rx MIC Key (64 bits)
+ */
+
+#define WEP_IV_LEN 4
+#define WEP_ICV_LEN 4
+
+#define ALG_TKIP_KEY_LEN 32
+/* Starting offsets for each key */
+#define ALG_TKIP_TEMP_ENCR_KEY 0
+#define ALG_TKIP_TEMP_AUTH_TX_MIC_KEY 16
+#define ALG_TKIP_TEMP_AUTH_RX_MIC_KEY 24
+#define TKIP_IV_LEN 8
+#define TKIP_ICV_LEN 4
+
+#define ALG_CCMP_KEY_LEN 16
+#define CCMP_HDR_LEN 8
+#define CCMP_MIC_LEN 8
+#define CCMP_TK_LEN 16
+#define CCMP_PN_LEN 6
+
+#define NUM_RX_DATA_QUEUES 17
+
+struct ieee80211_key {
+        struct kref kref;
+
+        int hw_key_idx; /* filled and used by low-level driver */
+        ieee80211_key_alg alg;
+        union {
+                struct {
+                        /* last used TSC */
+                        u32 iv32;
+                        u16 iv16;
+                        u16 p1k[5];
+                        int tx_initialized;
+
+                        /* last received RSC */
+                        u32 iv32_rx[NUM_RX_DATA_QUEUES];
+                        u16 iv16_rx[NUM_RX_DATA_QUEUES];
+                        u16 p1k_rx[NUM_RX_DATA_QUEUES][5];
+                        int rx_initialized[NUM_RX_DATA_QUEUES];
+                } tkip;
+                struct {
+                        u8 tx_pn[6];
+                        u8 rx_pn[NUM_RX_DATA_QUEUES][6];
+                        struct crypto_cipher *tfm;
+                        u32 replays; /* dot11RSNAStatsCCMPReplays */
+                        /* scratch buffers for virt_to_page() (crypto API) */
+#ifndef AES_BLOCK_LEN
+#define AES_BLOCK_LEN 16
+#endif
+                        u8 tx_crypto_buf[6 * AES_BLOCK_LEN];
+                        u8 rx_crypto_buf[6 * AES_BLOCK_LEN];
+                } ccmp;
+        } u;
+        int tx_rx_count; /* number of times this key has been used */
+        int keylen;
+
+        /* if the low level driver can provide hardware acceleration it should
+         * clear this flag */
+        unsigned int force_sw_encrypt:1;
+        unsigned int default_tx_key:1; /* This key is the new default TX key
+                                        * (used only for broadcast keys). */
+        s8 keyidx; /* WEP key index */
+
+#ifdef CONFIG_MAC80211_DEBUGFS
+        struct {
+                struct dentry *stalink;
+                struct dentry *dir;
+                struct dentry *keylen;
+                struct dentry *force_sw_encrypt;
+                struct dentry *keyidx;
+                struct dentry *hw_key_idx;
+                struct dentry *tx_rx_count;
+                struct dentry *algorithm;
+                struct dentry *tx_spec;
+                struct dentry *rx_spec;
+                struct dentry *replays;
+                struct dentry *key;
+        } debugfs;
+#endif
+
+        u8 key[0];
+};
+
+#endif /* IEEE80211_KEY_H */
diff --git a/net/mac80211/ieee80211_led.c b/net/mac80211/ieee80211_led.c
new file mode 100644
index 000000000000..719d75b20707
--- /dev/null
+++ b/net/mac80211/ieee80211_led.c
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2006, Johannes Berg <johannes@sipsolutions.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/* just for IFNAMSIZ */
+#include <linux/if.h>
+#include "ieee80211_led.h"
+
+void ieee80211_led_rx(struct ieee80211_local *local)
+{
+        if (unlikely(!local->rx_led))
+                return;
+        if (local->rx_led_counter++ % 2 == 0)
+                led_trigger_event(local->rx_led, LED_OFF);
+        else
+                led_trigger_event(local->rx_led, LED_FULL);
+}
+
+/* q is 1 if a packet was enqueued, 0 if it has been transmitted */
+void ieee80211_led_tx(struct ieee80211_local *local, int q)
+{
+        if (unlikely(!local->tx_led))
+                return;
+        /* not sure how this is supposed to work ... */
+        local->tx_led_counter += 2*q-1;
+        if (local->tx_led_counter % 2 == 0)
+                led_trigger_event(local->tx_led, LED_OFF);
+        else
+                led_trigger_event(local->tx_led, LED_FULL);
+}
+
+void ieee80211_led_init(struct ieee80211_local *local)
+{
+        local->rx_led = kzalloc(sizeof(struct led_trigger), GFP_KERNEL);
+        if (!local->rx_led)
+                return;
+        snprintf(local->rx_led_name, sizeof(local->rx_led_name),
+                 "%srx", wiphy_name(local->hw.wiphy));
+        local->rx_led->name = local->rx_led_name;
+        if (led_trigger_register(local->rx_led)) {
+                kfree(local->rx_led);
+                local->rx_led = NULL;
+        }
+
+        local->tx_led = kzalloc(sizeof(struct led_trigger), GFP_KERNEL);
+        if (!local->tx_led)
+                return;
+        snprintf(local->tx_led_name, sizeof(local->tx_led_name),
+                 "%stx", wiphy_name(local->hw.wiphy));
+        local->tx_led->name = local->tx_led_name;
+        if (led_trigger_register(local->tx_led)) {
+                kfree(local->tx_led);
+                local->tx_led = NULL;
+        }
+}
+
+void ieee80211_led_exit(struct ieee80211_local *local)
+{
+        if (local->tx_led) {
+                led_trigger_unregister(local->tx_led);
+                kfree(local->tx_led);
+        }
+        if (local->rx_led) {
+                led_trigger_unregister(local->rx_led);
+                kfree(local->rx_led);
+        }
+}
+
+char *__ieee80211_get_tx_led_name(struct ieee80211_hw *hw)
+{
+        struct ieee80211_local *local = hw_to_local(hw);
+
+        if (local->tx_led)
+                return local->tx_led_name;
+        return NULL;
+}
+EXPORT_SYMBOL(__ieee80211_get_tx_led_name);
+
+char *__ieee80211_get_rx_led_name(struct ieee80211_hw *hw)
+{
+        struct ieee80211_local *local = hw_to_local(hw);
+
+        if (local->rx_led)
+                return local->rx_led_name;
+        return NULL;
+}
+EXPORT_SYMBOL(__ieee80211_get_rx_led_name);
diff --git a/net/mac80211/ieee80211_led.h b/net/mac80211/ieee80211_led.h
new file mode 100644
index 000000000000..5c8ab8263878
--- /dev/null
+++ b/net/mac80211/ieee80211_led.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2006, Johannes Berg <johannes@sipsolutions.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/list.h>
+#include <linux/spinlock.h>
+#include <linux/leds.h>
+#include "ieee80211_i.h"
+
+#ifdef CONFIG_MAC80211_LEDS
+extern void ieee80211_led_rx(struct ieee80211_local *local);
+extern void ieee80211_led_tx(struct ieee80211_local *local, int q);
+extern void ieee80211_led_init(struct ieee80211_local *local);
+extern void ieee80211_led_exit(struct ieee80211_local *local);
+#else
+static inline void ieee80211_led_rx(struct ieee80211_local *local)
+{
+}
+static inline void ieee80211_led_tx(struct ieee80211_local *local, int q)
+{
+}
+static inline void ieee80211_led_init(struct ieee80211_local *local)
+{
+}
+static inline void ieee80211_led_exit(struct ieee80211_local *local)
+{
+}
+#endif
diff --git a/net/mac80211/ieee80211_rate.c b/net/mac80211/ieee80211_rate.c
new file mode 100644
index 000000000000..16e850864b8a
--- /dev/null
+++ b/net/mac80211/ieee80211_rate.c
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
+ * Copyright 2005-2006, Devicescape Software, Inc.
+ * Copyright (c) 2006 Jiri Benc <jbenc@suse.cz>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include "ieee80211_rate.h"
+#include "ieee80211_i.h"
+
+struct rate_control_alg {
+        struct list_head list;
+        struct rate_control_ops *ops;
+};
+
+static LIST_HEAD(rate_ctrl_algs);
+static DEFINE_MUTEX(rate_ctrl_mutex);
+
+int ieee80211_rate_control_register(struct rate_control_ops *ops)
+{
+        struct rate_control_alg *alg;
+
+        alg = kmalloc(sizeof(*alg), GFP_KERNEL);
+        if (alg == NULL) {
+                return -ENOMEM;
+        }
+        memset(alg, 0, sizeof(*alg));
+        alg->ops = ops;
+
+        mutex_lock(&rate_ctrl_mutex);
+        list_add_tail(&alg->list, &rate_ctrl_algs);
+        mutex_unlock(&rate_ctrl_mutex);
+
+        return 0;
+}
+EXPORT_SYMBOL(ieee80211_rate_control_register);
+
+void ieee80211_rate_control_unregister(struct rate_control_ops *ops)
+{
+        struct rate_control_alg *alg;
+
+        mutex_lock(&rate_ctrl_mutex);
+        list_for_each_entry(alg, &rate_ctrl_algs, list) {
+                if (alg->ops == ops) {
+                        list_del(&alg->list);
+                        break;
+                }
+        }
+        mutex_unlock(&rate_ctrl_mutex);
+        kfree(alg);
+}
+EXPORT_SYMBOL(ieee80211_rate_control_unregister);
+
+static struct rate_control_ops *
+ieee80211_try_rate_control_ops_get(const char *name)
+{
+        struct rate_control_alg *alg;
+        struct rate_control_ops *ops = NULL;
+
+        mutex_lock(&rate_ctrl_mutex);
+        list_for_each_entry(alg, &rate_ctrl_algs, list) {
+                if (!name || !strcmp(alg->ops->name, name))
+                        if (try_module_get(alg->ops->module)) {
+                                ops = alg->ops;
+                                break;
+                        }
+        }
+        mutex_unlock(&rate_ctrl_mutex);
+        return ops;
+}
+
+/* Get the rate control algorithm. If `name' is NULL, get the first
+ * available algorithm. */
+static struct rate_control_ops *
+ieee80211_rate_control_ops_get(const char *name)
+{
+        struct rate_control_ops *ops;
+
+        ops = ieee80211_try_rate_control_ops_get(name);
+        if (!ops) {
+                request_module("rc80211_%s", name ? name : "default");
+                ops = ieee80211_try_rate_control_ops_get(name);
+        }
+        return ops;
+}
+
+static void ieee80211_rate_control_ops_put(struct rate_control_ops *ops)
+{
+        module_put(ops->module);
+}
+
+struct rate_control_ref *rate_control_alloc(const char *name,
+                                            struct ieee80211_local *local)
+{
+        struct rate_control_ref *ref;
+
+        ref = kmalloc(sizeof(struct rate_control_ref), GFP_KERNEL);
+        if (!ref)
+                goto fail_ref;
+        kref_init(&ref->kref);
+        ref->ops = ieee80211_rate_control_ops_get(name);
+        if (!ref->ops)
+                goto fail_ops;
+        ref->priv = ref->ops->alloc(local);
+        if (!ref->priv)
+                goto fail_priv;
+        return ref;
+
+fail_priv:
+        ieee80211_rate_control_ops_put(ref->ops);
+fail_ops:
+        kfree(ref);
+fail_ref:
+        return NULL;
+}
+
+static void rate_control_release(struct kref *kref)
+{
+        struct rate_control_ref *ctrl_ref;
+
+        ctrl_ref = container_of(kref, struct rate_control_ref, kref);
+        ctrl_ref->ops->free(ctrl_ref->priv);
+        ieee80211_rate_control_ops_put(ctrl_ref->ops);
+        kfree(ctrl_ref);
+}
+
+struct rate_control_ref *rate_control_get(struct rate_control_ref *ref)
+{
+        kref_get(&ref->kref);
+        return ref;
+}
+
+void rate_control_put(struct rate_control_ref *ref)
+{
+        kref_put(&ref->kref, rate_control_release);
+}
diff --git a/net/mac80211/ieee80211_rate.h b/net/mac80211/ieee80211_rate.h
new file mode 100644
index 000000000000..f021a028d9d0
--- /dev/null
+++ b/net/mac80211/ieee80211_rate.h
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
+ * Copyright 2005, Devicescape Software, Inc.
+ * Copyright (c) 2006 Jiri Benc <jbenc@suse.cz>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef IEEE80211_RATE_H
+#define IEEE80211_RATE_H
+
+#include <linux/netdevice.h>
+#include <linux/skbuff.h>
+#include <linux/types.h>
+#include <net/mac80211.h>
+#include "ieee80211_i.h"
+#include "sta_info.h"
+
+#define RATE_CONTROL_NUM_DOWN 20
+#define RATE_CONTROL_NUM_UP   15
+
+
+struct rate_control_extra {
+        /* values from rate_control_get_rate() to the caller: */
+        struct ieee80211_rate *probe; /* probe with this rate, or NULL for no
+                                       * probing */
+        struct ieee80211_rate *nonerp;
+
+        /* parameters from the caller to rate_control_get_rate(): */
+        struct ieee80211_hw_mode *mode;
+        int mgmt_data; /* this is data frame that is used for management
+                        * (e.g., IEEE 802.1X EAPOL) */
+        u16 ethertype;
+};
+
+
+struct rate_control_ops {
+        struct module *module;
+        const char *name;
+        void (*tx_status)(void *priv, struct net_device *dev,
+                          struct sk_buff *skb,
+                          struct ieee80211_tx_status *status);
+        struct ieee80211_rate *(*get_rate)(void *priv, struct net_device *dev,
+                                           struct sk_buff *skb,
+                                           struct rate_control_extra *extra);
+        void (*rate_init)(void *priv, void *priv_sta,
+                          struct ieee80211_local *local, struct sta_info *sta);
+        void (*clear)(void *priv);
+
+        void *(*alloc)(struct ieee80211_local *local);
+        void (*free)(void *priv);
+        void *(*alloc_sta)(void *priv, gfp_t gfp);
+        void (*free_sta)(void *priv, void *priv_sta);
+
+        int (*add_attrs)(void *priv, struct kobject *kobj);
+        void (*remove_attrs)(void *priv, struct kobject *kobj);
+        void (*add_sta_debugfs)(void *priv, void *priv_sta,
+                                struct dentry *dir);
+        void (*remove_sta_debugfs)(void *priv, void *priv_sta);
+};
+
+struct rate_control_ref {
+        struct rate_control_ops *ops;
+        void *priv;
+        struct kref kref;
+};
+
+int ieee80211_rate_control_register(struct rate_control_ops *ops);
+void ieee80211_rate_control_unregister(struct rate_control_ops *ops);
+
+/* Get a reference to the rate control algorithm. If `name' is NULL, get the
+ * first available algorithm. */
+struct rate_control_ref *rate_control_alloc(const char *name,
+                                            struct ieee80211_local *local);
+struct rate_control_ref *rate_control_get(struct rate_control_ref *ref);
+void rate_control_put(struct rate_control_ref *ref);
+
+static inline void rate_control_tx_status(struct ieee80211_local *local,
+                                          struct net_device *dev,
+                                          struct sk_buff *skb,
+                                          struct ieee80211_tx_status *status)
+{
+        struct rate_control_ref *ref = local->rate_ctrl;
+        ref->ops->tx_status(ref->priv, dev, skb, status);
+}
+
+
+static inline struct ieee80211_rate *
+rate_control_get_rate(struct ieee80211_local *local, struct net_device *dev,
+                      struct sk_buff *skb, struct rate_control_extra *extra)
+{
+        struct rate_control_ref *ref = local->rate_ctrl;
+        return ref->ops->get_rate(ref->priv, dev, skb, extra);
+}
+
+
+static inline void rate_control_rate_init(struct sta_info *sta,
+                                          struct ieee80211_local *local)
+{
+        struct rate_control_ref *ref = sta->rate_ctrl;
+        ref->ops->rate_init(ref->priv, sta->rate_ctrl_priv, local, sta);
+}
+
+
+static inline void rate_control_clear(struct ieee80211_local *local)
+{
+        struct rate_control_ref *ref = local->rate_ctrl;
+        ref->ops->clear(ref->priv);
+}
+
+static inline void *rate_control_alloc_sta(struct rate_control_ref *ref,
+                                           gfp_t gfp)
+{
+        return ref->ops->alloc_sta(ref->priv, gfp);
+}
+
+static inline void rate_control_free_sta(struct rate_control_ref *ref,
+                                         void *priv)
+{
+        ref->ops->free_sta(ref->priv, priv);
+}
+
+static inline void rate_control_add_sta_debugfs(struct sta_info *sta)
+{
+#ifdef CONFIG_MAC80211_DEBUGFS
+        struct rate_control_ref *ref = sta->rate_ctrl;
+        if (sta->debugfs.dir && ref->ops->add_sta_debugfs)
+                ref->ops->add_sta_debugfs(ref->priv, sta->rate_ctrl_priv,
+                                          sta->debugfs.dir);
+#endif
+}
+
+static inline void rate_control_remove_sta_debugfs(struct sta_info *sta)
+{
+#ifdef CONFIG_MAC80211_DEBUGFS
+        struct rate_control_ref *ref = sta->rate_ctrl;
+        if (ref->ops->remove_sta_debugfs)
+                ref->ops->remove_sta_debugfs(ref->priv, sta->rate_ctrl_priv);
+#endif
+}
+
+#endif /* IEEE80211_RATE_H */
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
new file mode 100644
index 000000000000..822917debeff
--- /dev/null
+++ b/net/mac80211/ieee80211_sta.c
@@ -0,0 +1,3060 @@
+/*
+ * BSS client mode implementation
+ * Copyright 2003, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright 2004, Instant802 Networks, Inc.
+ * Copyright 2005, Devicescape Software, Inc.
+ * Copyright 2006-2007  Jiri Benc <jbenc@suse.cz>
+ * Copyright 2007, Michael Wu <flamingice@sourmilk.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/* TODO:
+ * BSS table: use <BSSID,SSID> as the key to support multi-SSID APs
+ * order BSS list by RSSI(?) ("quality of AP")
+ * scan result table filtering (by capability (privacy, IBSS/BSS, WPA/RSN IE,
+ *    SSID)
+ */
+#include <linux/if_ether.h>
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+#include <linux/if_arp.h>
+#include <linux/wireless.h>
+#include <linux/random.h>
+#include <linux/etherdevice.h>
+#include <linux/rtnetlink.h>
+#include <net/iw_handler.h>
+#include <asm/types.h>
+#include <asm/delay.h>
+
+#include <net/mac80211.h>
+#include "ieee80211_i.h"
+#include "ieee80211_rate.h"
+#include "hostapd_ioctl.h"
+
+#define IEEE80211_AUTH_TIMEOUT (HZ / 5)
+#define IEEE80211_AUTH_MAX_TRIES 3
+#define IEEE80211_ASSOC_TIMEOUT (HZ / 5)
+#define IEEE80211_ASSOC_MAX_TRIES 3
+#define IEEE80211_MONITORING_INTERVAL (2 * HZ)
+#define IEEE80211_PROBE_INTERVAL (60 * HZ)
+#define IEEE80211_RETRY_AUTH_INTERVAL (1 * HZ)
+#define IEEE80211_SCAN_INTERVAL (2 * HZ)
+#define IEEE80211_SCAN_INTERVAL_SLOW (15 * HZ)
+#define IEEE80211_IBSS_JOIN_TIMEOUT (20 * HZ)
+
+#define IEEE80211_PROBE_DELAY (HZ / 33)
+#define IEEE80211_CHANNEL_TIME (HZ / 33)
+#define IEEE80211_PASSIVE_CHANNEL_TIME (HZ / 5)
+#define IEEE80211_SCAN_RESULT_EXPIRE (10 * HZ)
+#define IEEE80211_IBSS_MERGE_INTERVAL (30 * HZ)
+#define IEEE80211_IBSS_INACTIVITY_LIMIT (60 * HZ)
+
+#define IEEE80211_IBSS_MAX_STA_ENTRIES 128
+
+
+#define IEEE80211_FC(type, stype) cpu_to_le16(type | stype)
+
+#define ERP_INFO_USE_PROTECTION BIT(1)
+
+static void ieee80211_send_probe_req(struct net_device *dev, u8 *dst,
+                                     u8 *ssid, size_t ssid_len);
+static struct ieee80211_sta_bss *
+ieee80211_rx_bss_get(struct net_device *dev, u8 *bssid);
+static void ieee80211_rx_bss_put(struct net_device *dev,
+                                 struct ieee80211_sta_bss *bss);
+static int ieee80211_sta_find_ibss(struct net_device *dev,
+                                   struct ieee80211_if_sta *ifsta);
+static int ieee80211_sta_wep_configured(struct net_device *dev);
+static int ieee80211_sta_start_scan(struct net_device *dev,
+                                    u8 *ssid, size_t ssid_len);
+static int ieee80211_sta_config_auth(struct net_device *dev,
+                                     struct ieee80211_if_sta *ifsta);
+
+
+/* Parsed Information Elements */
+struct ieee802_11_elems {
+        u8 *ssid;
+        u8 ssid_len;
+        u8 *supp_rates;
+        u8 supp_rates_len;
+        u8 *fh_params;
+        u8 fh_params_len;
+        u8 *ds_params;
+        u8 ds_params_len;
+        u8 *cf_params;
+        u8 cf_params_len;
+        u8 *tim;
+        u8 tim_len;
+        u8 *ibss_params;
+        u8 ibss_params_len;
+        u8 *challenge;
+        u8 challenge_len;
+        u8 *wpa;
+        u8 wpa_len;
+        u8 *rsn;
+        u8 rsn_len;
+        u8 *erp_info;
+        u8 erp_info_len;
+        u8 *ext_supp_rates;
+        u8 ext_supp_rates_len;
+        u8 *wmm_info;
+        u8 wmm_info_len;
+        u8 *wmm_param;
+        u8 wmm_param_len;
+};
+
+typedef enum { ParseOK = 0, ParseUnknown = 1, ParseFailed = -1 } ParseRes;
+
+
+static ParseRes ieee802_11_parse_elems(u8 *start, size_t len,
+                                       struct ieee802_11_elems *elems)
+{
+        size_t left = len;
+        u8 *pos = start;
+        int unknown = 0;
+
+        memset(elems, 0, sizeof(*elems));
+
+        while (left >= 2) {
+                u8 id, elen;
+
+                id = *pos++;
+                elen = *pos++;
+                left -= 2;
+
+                if (elen > left) {
+#if 0
+                        if (net_ratelimit())
+                                printk(KERN_DEBUG "IEEE 802.11 element parse "
+                                       "failed (id=%d elen=%d left=%d)\n",
+                                       id, elen, left);
+#endif
+                        return ParseFailed;
+                }
+
+                switch (id) {
+                case WLAN_EID_SSID:
+                        elems->ssid = pos;
+                        elems->ssid_len = elen;
+                        break;
+                case WLAN_EID_SUPP_RATES:
+                        elems->supp_rates = pos;
+                        elems->supp_rates_len = elen;
+                        break;
+                case WLAN_EID_FH_PARAMS:
+                        elems->fh_params = pos;
+                        elems->fh_params_len = elen;
+                        break;
+                case WLAN_EID_DS_PARAMS:
+                        elems->ds_params = pos;
+                        elems->ds_params_len = elen;
+                        break;
+                case WLAN_EID_CF_PARAMS:
+                        elems->cf_params = pos;
+                        elems->cf_params_len = elen;
+                        break;
+                case WLAN_EID_TIM:
+                        elems->tim = pos;
+                        elems->tim_len = elen;
+                        break;
+                case WLAN_EID_IBSS_PARAMS:
+                        elems->ibss_params = pos;
+                        elems->ibss_params_len = elen;
+                        break;
+                case WLAN_EID_CHALLENGE:
+                        elems->challenge = pos;
+                        elems->challenge_len = elen;
+                        break;
+                case WLAN_EID_WPA:
+                        if (elen >= 4 && pos[0] == 0x00 && pos[1] == 0x50 &&
+                            pos[2] == 0xf2) {
+                                /* Microsoft OUI (00:50:F2) */
+                                if (pos[3] == 1) {
+                                        /* OUI Type 1 - WPA IE */
+                                        elems->wpa = pos;
+                                        elems->wpa_len = elen;
+                                } else if (elen >= 5 && pos[3] == 2) {
+                                        if (pos[4] == 0) {
+                                                elems->wmm_info = pos;
+                                                elems->wmm_info_len = elen;
+                                        } else if (pos[4] == 1) {
+                                                elems->wmm_param = pos;
+                                                elems->wmm_param_len = elen;
+                                        }
+                                }
+                        }
+                        break;
+                case WLAN_EID_RSN:
+                        elems->rsn = pos;
+                        elems->rsn_len = elen;
+                        break;
+                case WLAN_EID_ERP_INFO:
+                        elems->erp_info = pos;
+                        elems->erp_info_len = elen;
+                        break;
+                case WLAN_EID_EXT_SUPP_RATES:
+                        elems->ext_supp_rates = pos;
+                        elems->ext_supp_rates_len = elen;
+                        break;
+                default:
+#if 0
+                        printk(KERN_DEBUG "IEEE 802.11 element parse ignored "
+                                      "unknown element (id=%d elen=%d)\n",
+                                      id, elen);
+#endif
+                        unknown++;
+                        break;
+                }
+
+                left -= elen;
+                pos += elen;
+        }
+
+        /* Do not trigger error if left == 1 as Apple Airport base stations
+         * send AssocResps that are one spurious byte too long. */
+
+        return unknown ? ParseUnknown : ParseOK;
+}
+
+
+
+
+static int ecw2cw(int ecw)
+{
+        int cw = 1;
+        while (ecw > 0) {
+                cw <<= 1;
+                ecw--;
+        }
+        return cw - 1;
+}
+
+
+static void ieee80211_sta_wmm_params(struct net_device *dev,
+                                     struct ieee80211_if_sta *ifsta,
+                                     u8 *wmm_param, size_t wmm_param_len)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_tx_queue_params params;
+        size_t left;
+        int count;
+        u8 *pos;
+
+        if (wmm_param_len < 8 || wmm_param[5] /* version */ != 1)
+                return;
+        count = wmm_param[6] & 0x0f;
+        if (count == ifsta->wmm_last_param_set)
+                return;
+        ifsta->wmm_last_param_set = count;
+
+        pos = wmm_param + 8;
+        left = wmm_param_len - 8;
+
+        memset(&params, 0, sizeof(params));
+
+        if (!local->ops->conf_tx)
+                return;
+
+        local->wmm_acm = 0;
+        for (; left >= 4; left -= 4, pos += 4) {
+                int aci = (pos[0] >> 5) & 0x03;
+                int acm = (pos[0] >> 4) & 0x01;
+                int queue;
+
+                switch (aci) {
+                case 1:
+                        queue = IEEE80211_TX_QUEUE_DATA3;
+                        if (acm) {
+                                local->wmm_acm |= BIT(0) | BIT(3);
+                        }
+                        break;
+                case 2:
+                        queue = IEEE80211_TX_QUEUE_DATA1;
+                        if (acm) {
+                                local->wmm_acm |= BIT(4) | BIT(5);
+                        }
+                        break;
+                case 3:
+                        queue = IEEE80211_TX_QUEUE_DATA0;
+                        if (acm) {
+                                local->wmm_acm |= BIT(6) | BIT(7);
+                        }
+                        break;
+                case 0:
+                default:
+                        queue = IEEE80211_TX_QUEUE_DATA2;
+                        if (acm) {
+                                local->wmm_acm |= BIT(1) | BIT(2);
+                        }
+                        break;
+                }
+
+                params.aifs = pos[0] & 0x0f;
+                params.cw_max = ecw2cw((pos[1] & 0xf0) >> 4);
+                params.cw_min = ecw2cw(pos[1] & 0x0f);
+                /* TXOP is in units of 32 usec; burst_time in 0.1 ms */
+                params.burst_time = (pos[2] | (pos[3] << 8)) * 32 / 100;
+                printk(KERN_DEBUG "%s: WMM queue=%d aci=%d acm=%d aifs=%d "
+                       "cWmin=%d cWmax=%d burst=%d\n",
+                       dev->name, queue, aci, acm, params.aifs, params.cw_min,
+                       params.cw_max, params.burst_time);
+                /* TODO: handle ACM (block TX, fallback to next lowest allowed
+                 * AC for now) */
+                if (local->ops->conf_tx(local_to_hw(local), queue, &params)) {
+                        printk(KERN_DEBUG "%s: failed to set TX queue "
+                               "parameters for queue %d\n", dev->name, queue);
+                }
+        }
+}
+
+
+static void ieee80211_sta_send_associnfo(struct net_device *dev,
+                                         struct ieee80211_if_sta *ifsta)
+{
+        char *buf;
+        size_t len;
+        int i;
+        union iwreq_data wrqu;
+
+        if (!ifsta->assocreq_ies && !ifsta->assocresp_ies)
+                return;
+
+        buf = kmalloc(50 + 2 * (ifsta->assocreq_ies_len +
+                                ifsta->assocresp_ies_len), GFP_ATOMIC);
+        if (!buf)
+                return;
+
+        len = sprintf(buf, "ASSOCINFO(");
+        if (ifsta->assocreq_ies) {
+                len += sprintf(buf + len, "ReqIEs=");
+                for (i = 0; i < ifsta->assocreq_ies_len; i++) {
+                        len += sprintf(buf + len, "%02x",
+                                       ifsta->assocreq_ies[i]);
+                }
+        }
+        if (ifsta->assocresp_ies) {
+                if (ifsta->assocreq_ies)
+                        len += sprintf(buf + len, " ");
+                len += sprintf(buf + len, "RespIEs=");
+                for (i = 0; i < ifsta->assocresp_ies_len; i++) {
+                        len += sprintf(buf + len, "%02x",
+                                       ifsta->assocresp_ies[i]);
+                }
+        }
+        len += sprintf(buf + len, ")");
+
+        if (len > IW_CUSTOM_MAX) {
+                len = sprintf(buf, "ASSOCRESPIE=");
+                for (i = 0; i < ifsta->assocresp_ies_len; i++) {
+                        len += sprintf(buf + len, "%02x",
+                                       ifsta->assocresp_ies[i]);
+                }
+        }
+
+        memset(&wrqu, 0, sizeof(wrqu));
+        wrqu.data.length = len;
+        wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);
+
+        kfree(buf);
+}
+
+
+static void ieee80211_set_associated(struct net_device *dev,
+                                     struct ieee80211_if_sta *ifsta, int assoc)
+{
+        union iwreq_data wrqu;
+
+        if (ifsta->associated == assoc)
+                return;
+
+        ifsta->associated = assoc;
+
+        if (assoc) {
+                struct ieee80211_sub_if_data *sdata;
+                sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+                if (sdata->type != IEEE80211_IF_TYPE_STA)
+                        return;
+                netif_carrier_on(dev);
+                ifsta->prev_bssid_set = 1;
+                memcpy(ifsta->prev_bssid, sdata->u.sta.bssid, ETH_ALEN);
+                memcpy(wrqu.ap_addr.sa_data, sdata->u.sta.bssid, ETH_ALEN);
+                ieee80211_sta_send_associnfo(dev, ifsta);
+        } else {
+                netif_carrier_off(dev);
+                memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN);
+        }
+        wrqu.ap_addr.sa_family = ARPHRD_ETHER;
+        wireless_send_event(dev, SIOCGIWAP, &wrqu, NULL);
+        ifsta->last_probe = jiffies;
+}
+
+static void ieee80211_set_disassoc(struct net_device *dev,
+                                   struct ieee80211_if_sta *ifsta, int deauth)
+{
+        if (deauth)
+                ifsta->auth_tries = 0;
+        ifsta->assoc_tries = 0;
+        ieee80211_set_associated(dev, ifsta, 0);
+}
+
+static void ieee80211_sta_tx(struct net_device *dev, struct sk_buff *skb,
+                             int encrypt)
+{
+        struct ieee80211_sub_if_data *sdata;
+        struct ieee80211_tx_packet_data *pkt_data;
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        skb->dev = sdata->local->mdev;
+        skb_set_mac_header(skb, 0);
+        skb_set_network_header(skb, 0);
+        skb_set_transport_header(skb, 0);
+
+        pkt_data = (struct ieee80211_tx_packet_data *) skb->cb;
+        memset(pkt_data, 0, sizeof(struct ieee80211_tx_packet_data));
+        pkt_data->ifindex = sdata->dev->ifindex;
+        pkt_data->mgmt_iface = (sdata->type == IEEE80211_IF_TYPE_MGMT);
+        pkt_data->do_not_encrypt = !encrypt;
+
+        dev_queue_xmit(skb);
+}
+
+
+static void ieee80211_send_auth(struct net_device *dev,
+                                struct ieee80211_if_sta *ifsta,
+                                int transaction, u8 *extra, size_t extra_len,
+                                int encrypt)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct sk_buff *skb;
+        struct ieee80211_mgmt *mgmt;
+
+        skb = dev_alloc_skb(local->hw.extra_tx_headroom +
+                            sizeof(*mgmt) + 6 + extra_len);
+        if (!skb) {
+                printk(KERN_DEBUG "%s: failed to allocate buffer for auth "
+                       "frame\n", dev->name);
+                return;
+        }
+        skb_reserve(skb, local->hw.extra_tx_headroom);
+
+        mgmt = (struct ieee80211_mgmt *) skb_put(skb, 24 + 6);
+        memset(mgmt, 0, 24 + 6);
+        mgmt->frame_control = IEEE80211_FC(IEEE80211_FTYPE_MGMT,
+                                           IEEE80211_STYPE_AUTH);
+        if (encrypt)
+                mgmt->frame_control |= cpu_to_le16(IEEE80211_FCTL_PROTECTED);
+        memcpy(mgmt->da, ifsta->bssid, ETH_ALEN);
+        memcpy(mgmt->sa, dev->dev_addr, ETH_ALEN);
+        memcpy(mgmt->bssid, ifsta->bssid, ETH_ALEN);
+        mgmt->u.auth.auth_alg = cpu_to_le16(ifsta->auth_alg);
+        mgmt->u.auth.auth_transaction = cpu_to_le16(transaction);
+        ifsta->auth_transaction = transaction + 1;
+        mgmt->u.auth.status_code = cpu_to_le16(0);
+        if (extra)
+                memcpy(skb_put(skb, extra_len), extra, extra_len);
+
+        ieee80211_sta_tx(dev, skb, encrypt);
+}
+
+
+static void ieee80211_authenticate(struct net_device *dev,
+                                   struct ieee80211_if_sta *ifsta)
+{
+        ifsta->auth_tries++;
+        if (ifsta->auth_tries > IEEE80211_AUTH_MAX_TRIES) {
+                printk(KERN_DEBUG "%s: authentication with AP " MAC_FMT
+                       " timed out\n",
+                       dev->name, MAC_ARG(ifsta->bssid));
+                ifsta->state = IEEE80211_DISABLED;
+                return;
+        }
+
+        ifsta->state = IEEE80211_AUTHENTICATE;
+        printk(KERN_DEBUG "%s: authenticate with AP " MAC_FMT "\n",
+               dev->name, MAC_ARG(ifsta->bssid));
+
+        ieee80211_send_auth(dev, ifsta, 1, NULL, 0, 0);
+
+        mod_timer(&ifsta->timer, jiffies + IEEE80211_AUTH_TIMEOUT);
+}
+
+
+static void ieee80211_send_assoc(struct net_device *dev,
+                                 struct ieee80211_if_sta *ifsta)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_hw_mode *mode;
+        struct sk_buff *skb;
+        struct ieee80211_mgmt *mgmt;
+        u8 *pos, *ies;
+        int i, len;
+        u16 capab;
+        struct ieee80211_sta_bss *bss;
+        int wmm = 0;
+
+        skb = dev_alloc_skb(local->hw.extra_tx_headroom +
+                            sizeof(*mgmt) + 200 + ifsta->extra_ie_len +
+                            ifsta->ssid_len);
+        if (!skb) {
+                printk(KERN_DEBUG "%s: failed to allocate buffer for assoc "
+                       "frame\n", dev->name);
+                return;
+        }
+        skb_reserve(skb, local->hw.extra_tx_headroom);
+
+        mode = local->oper_hw_mode;
+        capab = ifsta->capab;
+        if (mode->mode == MODE_IEEE80211G) {
+                capab |= WLAN_CAPABILITY_SHORT_SLOT_TIME |
+                        WLAN_CAPABILITY_SHORT_PREAMBLE;
+        }
+        bss = ieee80211_rx_bss_get(dev, ifsta->bssid);
+        if (bss) {
+                if (bss->capability & WLAN_CAPABILITY_PRIVACY)
+                        capab |= WLAN_CAPABILITY_PRIVACY;
+                if (bss->wmm_ie) {
+                        wmm = 1;
+                }
+                ieee80211_rx_bss_put(dev, bss);
+        }
+
+        mgmt = (struct ieee80211_mgmt *) skb_put(skb, 24);
+        memset(mgmt, 0, 24);
+        memcpy(mgmt->da, ifsta->bssid, ETH_ALEN);
+        memcpy(mgmt->sa, dev->dev_addr, ETH_ALEN);
+        memcpy(mgmt->bssid, ifsta->bssid, ETH_ALEN);
+
+        if (ifsta->prev_bssid_set) {
+                skb_put(skb, 10);
+                mgmt->frame_control = IEEE80211_FC(IEEE80211_FTYPE_MGMT,
+                                                   IEEE80211_STYPE_REASSOC_REQ);
+                mgmt->u.reassoc_req.capab_info = cpu_to_le16(capab);
+                mgmt->u.reassoc_req.listen_interval = cpu_to_le16(1);
+                memcpy(mgmt->u.reassoc_req.current_ap, ifsta->prev_bssid,
+                       ETH_ALEN);
+        } else {
+                skb_put(skb, 4);
+                mgmt->frame_control = IEEE80211_FC(IEEE80211_FTYPE_MGMT,
+                                                   IEEE80211_STYPE_ASSOC_REQ);
+                mgmt->u.assoc_req.capab_info = cpu_to_le16(capab);
+                mgmt->u.assoc_req.listen_interval = cpu_to_le16(1);
+        }
+
+        /* SSID */
+        ies = pos = skb_put(skb, 2 + ifsta->ssid_len);
+        *pos++ = WLAN_EID_SSID;
+        *pos++ = ifsta->ssid_len;
+        memcpy(pos, ifsta->ssid, ifsta->ssid_len);
+
+        len = mode->num_rates;
+        if (len > 8)
+                len = 8;
+        pos = skb_put(skb, len + 2);
+        *pos++ = WLAN_EID_SUPP_RATES;
+        *pos++ = len;
+        for (i = 0; i < len; i++) {
+                int rate = mode->rates[i].rate;
+                if (mode->mode == MODE_ATHEROS_TURBO)
+                        rate /= 2;
+                *pos++ = (u8) (rate / 5);
+        }
+
+        if (mode->num_rates > len) {
+                pos = skb_put(skb, mode->num_rates - len + 2);
+                *pos++ = WLAN_EID_EXT_SUPP_RATES;
+                *pos++ = mode->num_rates - len;
+                for (i = len; i < mode->num_rates; i++) {
+                        int rate = mode->rates[i].rate;
+                        if (mode->mode == MODE_ATHEROS_TURBO)
+                                rate /= 2;
+                        *pos++ = (u8) (rate / 5);
+                }
+        }
+
+        if (ifsta->extra_ie) {
+                pos = skb_put(skb, ifsta->extra_ie_len);
+                memcpy(pos, ifsta->extra_ie, ifsta->extra_ie_len);
+        }
+
+        if (wmm && ifsta->wmm_enabled) {
+                pos = skb_put(skb, 9);
+                *pos++ = WLAN_EID_VENDOR_SPECIFIC;
+                *pos++ = 7; /* len */
+                *pos++ = 0x00; /* Microsoft OUI 00:50:F2 */
+                *pos++ = 0x50;
+                *pos++ = 0xf2;
+                *pos++ = 2; /* WME */
+                *pos++ = 0; /* WME info */
+                *pos++ = 1; /* WME ver */
+                *pos++ = 0;
+        }
+
+        kfree(ifsta->assocreq_ies);
+        ifsta->assocreq_ies_len = (skb->data + skb->len) - ies;
+        ifsta->assocreq_ies = kmalloc(ifsta->assocreq_ies_len, GFP_ATOMIC);
+        if (ifsta->assocreq_ies)
+                memcpy(ifsta->assocreq_ies, ies, ifsta->assocreq_ies_len);
+
+        ieee80211_sta_tx(dev, skb, 0);
+}
+
+
+static void ieee80211_send_deauth(struct net_device *dev,
+                                  struct ieee80211_if_sta *ifsta, u16 reason)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct sk_buff *skb;
+        struct ieee80211_mgmt *mgmt;
+
+        skb = dev_alloc_skb(local->hw.extra_tx_headroom + sizeof(*mgmt));
+        if (!skb) {
+                printk(KERN_DEBUG "%s: failed to allocate buffer for deauth "
+                       "frame\n", dev->name);
+                return;
+        }
+        skb_reserve(skb, local->hw.extra_tx_headroom);
+
+        mgmt = (struct ieee80211_mgmt *) skb_put(skb, 24);
+        memset(mgmt, 0, 24);
+        memcpy(mgmt->da, ifsta->bssid, ETH_ALEN);
+        memcpy(mgmt->sa, dev->dev_addr, ETH_ALEN);
+        memcpy(mgmt->bssid, ifsta->bssid, ETH_ALEN);
+        mgmt->frame_control = IEEE80211_FC(IEEE80211_FTYPE_MGMT,
+                                           IEEE80211_STYPE_DEAUTH);
+        skb_put(skb, 2);
+        mgmt->u.deauth.reason_code = cpu_to_le16(reason);
+
+        ieee80211_sta_tx(dev, skb, 0);
+}
+
+
+static void ieee80211_send_disassoc(struct net_device *dev,
+                                    struct ieee80211_if_sta *ifsta, u16 reason)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct sk_buff *skb;
+        struct ieee80211_mgmt *mgmt;
+
+        skb = dev_alloc_skb(local->hw.extra_tx_headroom + sizeof(*mgmt));
+        if (!skb) {
+                printk(KERN_DEBUG "%s: failed to allocate buffer for disassoc "
+                       "frame\n", dev->name);
+                return;
+        }
+        skb_reserve(skb, local->hw.extra_tx_headroom);
+
+        mgmt = (struct ieee80211_mgmt *) skb_put(skb, 24);
+        memset(mgmt, 0, 24);
+        memcpy(mgmt->da, ifsta->bssid, ETH_ALEN);
+        memcpy(mgmt->sa, dev->dev_addr, ETH_ALEN);
+        memcpy(mgmt->bssid, ifsta->bssid, ETH_ALEN);
+        mgmt->frame_control = IEEE80211_FC(IEEE80211_FTYPE_MGMT,
+                                           IEEE80211_STYPE_DISASSOC);
+        skb_put(skb, 2);
+        mgmt->u.disassoc.reason_code = cpu_to_le16(reason);
+
+        ieee80211_sta_tx(dev, skb, 0);
+}
+
+
+static int ieee80211_privacy_mismatch(struct net_device *dev,
+                                      struct ieee80211_if_sta *ifsta)
+{
+        struct ieee80211_sta_bss *bss;
+        int res = 0;
+
+        if (!ifsta || ifsta->mixed_cell ||
+            ifsta->key_mgmt != IEEE80211_KEY_MGMT_NONE)
+                return 0;
+
+        bss = ieee80211_rx_bss_get(dev, ifsta->bssid);
+        if (!bss)
+                return 0;
+
+        if (ieee80211_sta_wep_configured(dev) !=
+            !!(bss->capability & WLAN_CAPABILITY_PRIVACY))
+                res = 1;
+
+        ieee80211_rx_bss_put(dev, bss);
+
+        return res;
+}
+
+
+static void ieee80211_associate(struct net_device *dev,
+                                struct ieee80211_if_sta *ifsta)
+{
+        ifsta->assoc_tries++;
+        if (ifsta->assoc_tries > IEEE80211_ASSOC_MAX_TRIES) {
+                printk(KERN_DEBUG "%s: association with AP " MAC_FMT
+                       " timed out\n",
+                       dev->name, MAC_ARG(ifsta->bssid));
+                ifsta->state = IEEE80211_DISABLED;
+                return;
+        }
+
+        ifsta->state = IEEE80211_ASSOCIATE;
+        printk(KERN_DEBUG "%s: associate with AP " MAC_FMT "\n",
+               dev->name, MAC_ARG(ifsta->bssid));
+        if (ieee80211_privacy_mismatch(dev, ifsta)) {
+                printk(KERN_DEBUG "%s: mismatch in privacy configuration and "
+                       "mixed-cell disabled - abort association\n", dev->name);
+                ifsta->state = IEEE80211_DISABLED;
+                return;
+        }
+
+        ieee80211_send_assoc(dev, ifsta);
+
+        mod_timer(&ifsta->timer, jiffies + IEEE80211_ASSOC_TIMEOUT);
+}
+
+
+static void ieee80211_associated(struct net_device *dev,
+                                 struct ieee80211_if_sta *ifsta)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct sta_info *sta;
+        int disassoc;
+
+        /* TODO: start monitoring current AP signal quality and number of
+         * missed beacons. Scan other channels every now and then and search
+         * for better APs. */
+        /* TODO: remove expired BSSes */
+
+        ifsta->state = IEEE80211_ASSOCIATED;
+
+        sta = sta_info_get(local, ifsta->bssid);
+        if (!sta) {
+                printk(KERN_DEBUG "%s: No STA entry for own AP " MAC_FMT "\n",
+                       dev->name, MAC_ARG(ifsta->bssid));
+                disassoc = 1;
+        } else {
+                disassoc = 0;
+                if (time_after(jiffies,
+                               sta->last_rx + IEEE80211_MONITORING_INTERVAL)) {
+                        if (ifsta->probereq_poll) {
+                                printk(KERN_DEBUG "%s: No ProbeResp from "
+                                       "current AP " MAC_FMT " - assume out of "
+                                       "range\n",
+                                       dev->name, MAC_ARG(ifsta->bssid));
+                                disassoc = 1;
+                                sta_info_free(sta, 0);
+                                ifsta->probereq_poll = 0;
+                        } else {
+                                ieee80211_send_probe_req(dev, ifsta->bssid,
+                                                         local->scan_ssid,
+                                                         local->scan_ssid_len);
+                                ifsta->probereq_poll = 1;
+                        }
+                } else {
+                        ifsta->probereq_poll = 0;
+                        if (time_after(jiffies, ifsta->last_probe +
+                                       IEEE80211_PROBE_INTERVAL)) {
+                                ifsta->last_probe = jiffies;
+                                ieee80211_send_probe_req(dev, ifsta->bssid,
+                                                         ifsta->ssid,
+                                                         ifsta->ssid_len);
+                        }
+                }
+                sta_info_put(sta);
+        }
+        if (disassoc) {
+                union iwreq_data wrqu;
+                memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN);
+                wrqu.ap_addr.sa_family = ARPHRD_ETHER;
+                wireless_send_event(dev, SIOCGIWAP, &wrqu, NULL);
+                mod_timer(&ifsta->timer, jiffies +
+                                      IEEE80211_MONITORING_INTERVAL + 30 * HZ);
+        } else {
+                mod_timer(&ifsta->timer, jiffies +
+                                      IEEE80211_MONITORING_INTERVAL);
+        }
+}
+
+
+static void ieee80211_send_probe_req(struct net_device *dev, u8 *dst,
+                                     u8 *ssid, size_t ssid_len)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_hw_mode *mode;
+        struct sk_buff *skb;
+        struct ieee80211_mgmt *mgmt;
+        u8 *pos, *supp_rates, *esupp_rates = NULL;
+        int i;
+
+        skb = dev_alloc_skb(local->hw.extra_tx_headroom + sizeof(*mgmt) + 200);
+        if (!skb) {
+                printk(KERN_DEBUG "%s: failed to allocate buffer for probe "
+                       "request\n", dev->name);
+                return;
+        }
+        skb_reserve(skb, local->hw.extra_tx_headroom);
+
+        mgmt = (struct ieee80211_mgmt *) skb_put(skb, 24);
+        memset(mgmt, 0, 24);
+        mgmt->frame_control = IEEE80211_FC(IEEE80211_FTYPE_MGMT,
+                                           IEEE80211_STYPE_PROBE_REQ);
+        memcpy(mgmt->sa, dev->dev_addr, ETH_ALEN);
+        if (dst) {
+                memcpy(mgmt->da, dst, ETH_ALEN);
+                memcpy(mgmt->bssid, dst, ETH_ALEN);
+        } else {
+                memset(mgmt->da, 0xff, ETH_ALEN);
+                memset(mgmt->bssid, 0xff, ETH_ALEN);
+        }
+        pos = skb_put(skb, 2 + ssid_len);
+        *pos++ = WLAN_EID_SSID;
+        *pos++ = ssid_len;
+        memcpy(pos, ssid, ssid_len);
+
+        supp_rates = skb_put(skb, 2);
+        supp_rates[0] = WLAN_EID_SUPP_RATES;
+        supp_rates[1] = 0;
+        mode = local->oper_hw_mode;
+        for (i = 0; i < mode->num_rates; i++) {
+                struct ieee80211_rate *rate = &mode->rates[i];
+                if (!(rate->flags & IEEE80211_RATE_SUPPORTED))
+                        continue;
+                if (esupp_rates) {
+                        pos = skb_put(skb, 1);
+                        esupp_rates[1]++;
+                } else if (supp_rates[1] == 8) {
+                        esupp_rates = skb_put(skb, 3);
+                        esupp_rates[0] = WLAN_EID_EXT_SUPP_RATES;
+                        esupp_rates[1] = 1;
+                        pos = &esupp_rates[2];
+                } else {
+                        pos = skb_put(skb, 1);
+                        supp_rates[1]++;
+                }
+                if (mode->mode == MODE_ATHEROS_TURBO)
+                        *pos = rate->rate / 10;
+                else
+                        *pos = rate->rate / 5;
+        }
+
+        ieee80211_sta_tx(dev, skb, 0);
+}
+
+
+static int ieee80211_sta_wep_configured(struct net_device *dev)
+{
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        if (!sdata || !sdata->default_key ||
+            sdata->default_key->alg != ALG_WEP)
+                return 0;
+        return 1;
+}
+
+
+static void ieee80211_auth_completed(struct net_device *dev,
+                                     struct ieee80211_if_sta *ifsta)
+{
+        printk(KERN_DEBUG "%s: authenticated\n", dev->name);
+        ifsta->authenticated = 1;
+        ieee80211_associate(dev, ifsta);
+}
+
+
+static void ieee80211_auth_challenge(struct net_device *dev,
+                                     struct ieee80211_if_sta *ifsta,
+                                     struct ieee80211_mgmt *mgmt,
+                                     size_t len)
+{
+        u8 *pos;
+        struct ieee802_11_elems elems;
+
+        printk(KERN_DEBUG "%s: replying to auth challenge\n", dev->name);
+        pos = mgmt->u.auth.variable;
+        if (ieee802_11_parse_elems(pos, len - (pos - (u8 *) mgmt), &elems)
+            == ParseFailed) {
+                printk(KERN_DEBUG "%s: failed to parse Auth(challenge)\n",
+                       dev->name);
+                return;
+        }
+        if (!elems.challenge) {
+                printk(KERN_DEBUG "%s: no challenge IE in shared key auth "
+                       "frame\n", dev->name);
+                return;
+        }
+        ieee80211_send_auth(dev, ifsta, 3, elems.challenge - 2,
+                            elems.challenge_len + 2, 1);
+}
+
+
+static void ieee80211_rx_mgmt_auth(struct net_device *dev,
+                                   struct ieee80211_if_sta *ifsta,
+                                   struct ieee80211_mgmt *mgmt,
+                                   size_t len)
+{
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        u16 auth_alg, auth_transaction, status_code;
+
+        if (ifsta->state != IEEE80211_AUTHENTICATE &&
+            sdata->type != IEEE80211_IF_TYPE_IBSS) {
+                printk(KERN_DEBUG "%s: authentication frame received from "
+                       MAC_FMT ", but not in authenticate state - ignored\n",
+                       dev->name, MAC_ARG(mgmt->sa));
+                return;
+        }
+
+        if (len < 24 + 6) {
+                printk(KERN_DEBUG "%s: too short (%zd) authentication frame "
+                       "received from " MAC_FMT " - ignored\n",
+                       dev->name, len, MAC_ARG(mgmt->sa));
+                return;
+        }
+
+        if (sdata->type != IEEE80211_IF_TYPE_IBSS &&
+            memcmp(ifsta->bssid, mgmt->sa, ETH_ALEN) != 0) {
+                printk(KERN_DEBUG "%s: authentication frame received from "
+                       "unknown AP (SA=" MAC_FMT " BSSID=" MAC_FMT ") - "
+                       "ignored\n", dev->name, MAC_ARG(mgmt->sa),
+                       MAC_ARG(mgmt->bssid));
+                return;
+        }
+
+        if (sdata->type != IEEE80211_IF_TYPE_IBSS &&
+            memcmp(ifsta->bssid, mgmt->bssid, ETH_ALEN) != 0) {
+                printk(KERN_DEBUG "%s: authentication frame received from "
+                       "unknown BSSID (SA=" MAC_FMT " BSSID=" MAC_FMT ") - "
+                       "ignored\n", dev->name, MAC_ARG(mgmt->sa),
+                       MAC_ARG(mgmt->bssid));
+                return;
+        }
+
+        auth_alg = le16_to_cpu(mgmt->u.auth.auth_alg);
+        auth_transaction = le16_to_cpu(mgmt->u.auth.auth_transaction);
+        status_code = le16_to_cpu(mgmt->u.auth.status_code);
+
+        printk(KERN_DEBUG "%s: RX authentication from " MAC_FMT " (alg=%d "
+               "transaction=%d status=%d)\n",
+               dev->name, MAC_ARG(mgmt->sa), auth_alg,
+               auth_transaction, status_code);
+
+        if (sdata->type == IEEE80211_IF_TYPE_IBSS) {
+                /* IEEE 802.11 standard does not require authentication in IBSS
+                 * networks and most implementations do not seem to use it.
+                 * However, try to reply to authentication attempts if someone
+                 * has actually implemented this.
+                 * TODO: Could implement shared key authentication. */
+                if (auth_alg != WLAN_AUTH_OPEN || auth_transaction != 1) {
+                        printk(KERN_DEBUG "%s: unexpected IBSS authentication "
+                               "frame (alg=%d transaction=%d)\n",
+                               dev->name, auth_alg, auth_transaction);
+                        return;
+                }
+                ieee80211_send_auth(dev, ifsta, 2, NULL, 0, 0);
+        }
+
+        if (auth_alg != ifsta->auth_alg ||
+            auth_transaction != ifsta->auth_transaction) {
+                printk(KERN_DEBUG "%s: unexpected authentication frame "
+                       "(alg=%d transaction=%d)\n",
+                       dev->name, auth_alg, auth_transaction);
+                return;
+        }
+
+        if (status_code != WLAN_STATUS_SUCCESS) {
+                printk(KERN_DEBUG "%s: AP denied authentication (auth_alg=%d "
+                       "code=%d)\n", dev->name, ifsta->auth_alg, status_code);
+                if (status_code == WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG) {
+                        u8 algs[3];
+                        const int num_algs = ARRAY_SIZE(algs);
+                        int i, pos;
+                        algs[0] = algs[1] = algs[2] = 0xff;
+                        if (ifsta->auth_algs & IEEE80211_AUTH_ALG_OPEN)
+                                algs[0] = WLAN_AUTH_OPEN;
+                        if (ifsta->auth_algs & IEEE80211_AUTH_ALG_SHARED_KEY)
+                                algs[1] = WLAN_AUTH_SHARED_KEY;
+                        if (ifsta->auth_algs & IEEE80211_AUTH_ALG_LEAP)
+                                algs[2] = WLAN_AUTH_LEAP;
+                        if (ifsta->auth_alg == WLAN_AUTH_OPEN)
+                                pos = 0;
+                        else if (ifsta->auth_alg == WLAN_AUTH_SHARED_KEY)
+                                pos = 1;
+                        else
+                                pos = 2;
+                        for (i = 0; i < num_algs; i++) {
+                                pos++;
+                                if (pos >= num_algs)
+                                        pos = 0;
+                                if (algs[pos] == ifsta->auth_alg ||
+                                    algs[pos] == 0xff)
+                                        continue;
+                                if (algs[pos] == WLAN_AUTH_SHARED_KEY &&
+                                    !ieee80211_sta_wep_configured(dev))
+                                        continue;
+                                ifsta->auth_alg = algs[pos];
+                                printk(KERN_DEBUG "%s: set auth_alg=%d for "
+                                       "next try\n",
+                                       dev->name, ifsta->auth_alg);
+                                break;
+                        }
+                }
+                return;
+        }
+
+        switch (ifsta->auth_alg) {
+        case WLAN_AUTH_OPEN:
+        case WLAN_AUTH_LEAP:
+                ieee80211_auth_completed(dev, ifsta);
+                break;
+        case WLAN_AUTH_SHARED_KEY:
+                if (ifsta->auth_transaction == 4)
+                        ieee80211_auth_completed(dev, ifsta);
+                else
+                        ieee80211_auth_challenge(dev, ifsta, mgmt, len);
+                break;
+        }
+}
+
+
+static void ieee80211_rx_mgmt_deauth(struct net_device *dev,
+                                     struct ieee80211_if_sta *ifsta,
+                                     struct ieee80211_mgmt *mgmt,
+                                     size_t len)
+{
+        u16 reason_code;
+
+        if (len < 24 + 2) {
+                printk(KERN_DEBUG "%s: too short (%zd) deauthentication frame "
+                       "received from " MAC_FMT " - ignored\n",
+                       dev->name, len, MAC_ARG(mgmt->sa));
+                return;
+        }
+
+        if (memcmp(ifsta->bssid, mgmt->sa, ETH_ALEN) != 0) {
+                printk(KERN_DEBUG "%s: deauthentication frame received from "
+                       "unknown AP (SA=" MAC_FMT " BSSID=" MAC_FMT ") - "
+                       "ignored\n", dev->name, MAC_ARG(mgmt->sa),
+                       MAC_ARG(mgmt->bssid));
+                return;
+        }
+
+        reason_code = le16_to_cpu(mgmt->u.deauth.reason_code);
+
+        printk(KERN_DEBUG "%s: RX deauthentication from " MAC_FMT
+               " (reason=%d)\n",
+               dev->name, MAC_ARG(mgmt->sa), reason_code);
+
+        if (ifsta->authenticated) {
+                printk(KERN_DEBUG "%s: deauthenticated\n", dev->name);
+        }
+
+        if (ifsta->state == IEEE80211_AUTHENTICATE ||
+            ifsta->state == IEEE80211_ASSOCIATE ||
+            ifsta->state == IEEE80211_ASSOCIATED) {
+                ifsta->state = IEEE80211_AUTHENTICATE;
+                mod_timer(&ifsta->timer, jiffies +
+                                      IEEE80211_RETRY_AUTH_INTERVAL);
+        }
+
+        ieee80211_set_disassoc(dev, ifsta, 1);
+        ifsta->authenticated = 0;
+}
+
+
+static void ieee80211_rx_mgmt_disassoc(struct net_device *dev,
+                                       struct ieee80211_if_sta *ifsta,
+                                       struct ieee80211_mgmt *mgmt,
+                                       size_t len)
+{
+        u16 reason_code;
+
+        if (len < 24 + 2) {
+                printk(KERN_DEBUG "%s: too short (%zd) disassociation frame "
+                       "received from " MAC_FMT " - ignored\n",
+                       dev->name, len, MAC_ARG(mgmt->sa));
+                return;
+        }
+
+        if (memcmp(ifsta->bssid, mgmt->sa, ETH_ALEN) != 0) {
+                printk(KERN_DEBUG "%s: disassociation frame received from "
+                       "unknown AP (SA=" MAC_FMT " BSSID=" MAC_FMT ") - "
+                       "ignored\n", dev->name, MAC_ARG(mgmt->sa),
+                       MAC_ARG(mgmt->bssid));
+                return;
+        }
+
+        reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code);
+
+        printk(KERN_DEBUG "%s: RX disassociation from " MAC_FMT
+               " (reason=%d)\n",
+               dev->name, MAC_ARG(mgmt->sa), reason_code);
+
+        if (ifsta->associated)
+                printk(KERN_DEBUG "%s: disassociated\n", dev->name);
+
+        if (ifsta->state == IEEE80211_ASSOCIATED) {
+                ifsta->state = IEEE80211_ASSOCIATE;
+                mod_timer(&ifsta->timer, jiffies +
+                                      IEEE80211_RETRY_AUTH_INTERVAL);
+        }
+
+        ieee80211_set_disassoc(dev, ifsta, 0);
+}
+
+
+static void ieee80211_rx_mgmt_assoc_resp(struct net_device *dev,
+                                         struct ieee80211_if_sta *ifsta,
+                                         struct ieee80211_mgmt *mgmt,
+                                         size_t len,
+                                         int reassoc)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_hw_mode *mode;
+        struct sta_info *sta;
+        u32 rates;
+        u16 capab_info, status_code, aid;
+        struct ieee802_11_elems elems;
+        u8 *pos;
+        int i, j;
+
+        /* AssocResp and ReassocResp have identical structure, so process both
+         * of them in this function. */
+
+        if (ifsta->state != IEEE80211_ASSOCIATE) {
+                printk(KERN_DEBUG "%s: association frame received from "
+                       MAC_FMT ", but not in associate state - ignored\n",
+                       dev->name, MAC_ARG(mgmt->sa));
+                return;
+        }
+
+        if (len < 24 + 6) {
+                printk(KERN_DEBUG "%s: too short (%zd) association frame "
+                       "received from " MAC_FMT " - ignored\n",
+                       dev->name, len, MAC_ARG(mgmt->sa));
+                return;
+        }
+
+        if (memcmp(ifsta->bssid, mgmt->sa, ETH_ALEN) != 0) {
+                printk(KERN_DEBUG "%s: association frame received from "
+                       "unknown AP (SA=" MAC_FMT " BSSID=" MAC_FMT ") - "
+                       "ignored\n", dev->name, MAC_ARG(mgmt->sa),
+                       MAC_ARG(mgmt->bssid));
+                return;
+        }
+
+        capab_info = le16_to_cpu(mgmt->u.assoc_resp.capab_info);
+        status_code = le16_to_cpu(mgmt->u.assoc_resp.status_code);
+        aid = le16_to_cpu(mgmt->u.assoc_resp.aid);
+        if ((aid & (BIT(15) | BIT(14))) != (BIT(15) | BIT(14)))
+                printk(KERN_DEBUG "%s: invalid aid value %d; bits 15:14 not "
+                       "set\n", dev->name, aid);
+        aid &= ~(BIT(15) | BIT(14));
+
+        printk(KERN_DEBUG "%s: RX %sssocResp from " MAC_FMT " (capab=0x%x "
+               "status=%d aid=%d)\n",
+               dev->name, reassoc ? "Rea" : "A", MAC_ARG(mgmt->sa),
+               capab_info, status_code, aid);
+
+        if (status_code != WLAN_STATUS_SUCCESS) {
+                printk(KERN_DEBUG "%s: AP denied association (code=%d)\n",
+                       dev->name, status_code);
+                return;
+        }
+
+        pos = mgmt->u.assoc_resp.variable;
+        if (ieee802_11_parse_elems(pos, len - (pos - (u8 *) mgmt), &elems)
+            == ParseFailed) {
+                printk(KERN_DEBUG "%s: failed to parse AssocResp\n",
+                       dev->name);
+                return;
+        }
+
+        if (!elems.supp_rates) {
+                printk(KERN_DEBUG "%s: no SuppRates element in AssocResp\n",
+                       dev->name);
+                return;
+        }
+
+        printk(KERN_DEBUG "%s: associated\n", dev->name);
+        ifsta->aid = aid;
+        ifsta->ap_capab = capab_info;
+
+        kfree(ifsta->assocresp_ies);
+        ifsta->assocresp_ies_len = len - (pos - (u8 *) mgmt);
+        ifsta->assocresp_ies = kmalloc(ifsta->assocresp_ies_len, GFP_ATOMIC);
+        if (ifsta->assocresp_ies)
+                memcpy(ifsta->assocresp_ies, pos, ifsta->assocresp_ies_len);
+
+        ieee80211_set_associated(dev, ifsta, 1);
+
+        /* Add STA entry for the AP */
+        sta = sta_info_get(local, ifsta->bssid);
+        if (!sta) {
+                struct ieee80211_sta_bss *bss;
+                sta = sta_info_add(local, dev, ifsta->bssid, GFP_ATOMIC);
+                if (!sta) {
+                        printk(KERN_DEBUG "%s: failed to add STA entry for the"
+                               " AP\n", dev->name);
+                        return;
+                }
+                bss = ieee80211_rx_bss_get(dev, ifsta->bssid);
+                if (bss) {
+                        sta->last_rssi = bss->rssi;
+                        sta->last_signal = bss->signal;
+                        sta->last_noise = bss->noise;
+                        ieee80211_rx_bss_put(dev, bss);
+                }
+        }
+
+        sta->dev = dev;
+        sta->flags |= WLAN_STA_AUTH | WLAN_STA_ASSOC;
+        sta->assoc_ap = 1;
+
+        rates = 0;
+        mode = local->oper_hw_mode;
+        for (i = 0; i < elems.supp_rates_len; i++) {
+                int rate = (elems.supp_rates[i] & 0x7f) * 5;
+                if (mode->mode == MODE_ATHEROS_TURBO)
+                        rate *= 2;
+                for (j = 0; j < mode->num_rates; j++)
+                        if (mode->rates[j].rate == rate)
+                                rates |= BIT(j);
+        }
+        for (i = 0; i < elems.ext_supp_rates_len; i++) {
+                int rate = (elems.ext_supp_rates[i] & 0x7f) * 5;
+                if (mode->mode == MODE_ATHEROS_TURBO)
+                        rate *= 2;
+                for (j = 0; j < mode->num_rates; j++)
+                        if (mode->rates[j].rate == rate)
+                                rates |= BIT(j);
+        }
+        sta->supp_rates = rates;
+
+        rate_control_rate_init(sta, local);
+
+        if (elems.wmm_param && ifsta->wmm_enabled) {
+                sta->flags |= WLAN_STA_WME;
+                ieee80211_sta_wmm_params(dev, ifsta, elems.wmm_param,
+                                         elems.wmm_param_len);
+        }
+
+
+        sta_info_put(sta);
+
+        ieee80211_associated(dev, ifsta);
+}
+
+
+/* Caller must hold local->sta_bss_lock */
+static void __ieee80211_rx_bss_hash_add(struct net_device *dev,
+                                        struct ieee80211_sta_bss *bss)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        bss->hnext = local->sta_bss_hash[STA_HASH(bss->bssid)];
+        local->sta_bss_hash[STA_HASH(bss->bssid)] = bss;
+}
+
+
+/* Caller must hold local->sta_bss_lock */
+static void __ieee80211_rx_bss_hash_del(struct net_device *dev,
+                                        struct ieee80211_sta_bss *bss)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sta_bss *b, *prev = NULL;
+        b = local->sta_bss_hash[STA_HASH(bss->bssid)];
+        while (b) {
+                if (b == bss) {
+                        if (!prev)
+                                local->sta_bss_hash[STA_HASH(bss->bssid)] =
+                                        bss->hnext;
+                        else
+                                prev->hnext = bss->hnext;
+                        break;
+                }
+                prev = b;
+                b = b->hnext;
+        }
+}
+
+
+static struct ieee80211_sta_bss *
+ieee80211_rx_bss_add(struct net_device *dev, u8 *bssid)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sta_bss *bss;
+
+        bss = kmalloc(sizeof(*bss), GFP_ATOMIC);
+        if (!bss)
+                return NULL;
+        memset(bss, 0, sizeof(*bss));
+        atomic_inc(&bss->users);
+        atomic_inc(&bss->users);
+        memcpy(bss->bssid, bssid, ETH_ALEN);
+
+        spin_lock_bh(&local->sta_bss_lock);
+        /* TODO: order by RSSI? */
+        list_add_tail(&bss->list, &local->sta_bss_list);
+        __ieee80211_rx_bss_hash_add(dev, bss);
+        spin_unlock_bh(&local->sta_bss_lock);
+        return bss;
+}
+
+
+static struct ieee80211_sta_bss *
+ieee80211_rx_bss_get(struct net_device *dev, u8 *bssid)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sta_bss *bss;
+
+        spin_lock_bh(&local->sta_bss_lock);
+        bss = local->sta_bss_hash[STA_HASH(bssid)];
+        while (bss) {
+                if (memcmp(bss->bssid, bssid, ETH_ALEN) == 0) {
+                        atomic_inc(&bss->users);
+                        break;
+                }
+                bss = bss->hnext;
+        }
+        spin_unlock_bh(&local->sta_bss_lock);
+        return bss;
+}
+
+
+static void ieee80211_rx_bss_free(struct ieee80211_sta_bss *bss)
+{
+        kfree(bss->wpa_ie);
+        kfree(bss->rsn_ie);
+        kfree(bss->wmm_ie);
+        kfree(bss);
+}
+
+
+static void ieee80211_rx_bss_put(struct net_device *dev,
+                                 struct ieee80211_sta_bss *bss)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        if (!atomic_dec_and_test(&bss->users))
+                return;
+
+        spin_lock_bh(&local->sta_bss_lock);
+        __ieee80211_rx_bss_hash_del(dev, bss);
+        list_del(&bss->list);
+        spin_unlock_bh(&local->sta_bss_lock);
+        ieee80211_rx_bss_free(bss);
+}
+
+
+void ieee80211_rx_bss_list_init(struct net_device *dev)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        spin_lock_init(&local->sta_bss_lock);
+        INIT_LIST_HEAD(&local->sta_bss_list);
+}
+
+
+void ieee80211_rx_bss_list_deinit(struct net_device *dev)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sta_bss *bss, *tmp;
+
+        list_for_each_entry_safe(bss, tmp, &local->sta_bss_list, list)
+                ieee80211_rx_bss_put(dev, bss);
+}
+
+
+static void ieee80211_rx_bss_info(struct net_device *dev,
+                                  struct ieee80211_mgmt *mgmt,
+                                  size_t len,
+                                  struct ieee80211_rx_status *rx_status,
+                                  int beacon)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee802_11_elems elems;
+        size_t baselen;
+        int channel, invalid = 0, clen;
+        struct ieee80211_sta_bss *bss;
+        struct sta_info *sta;
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        u64 timestamp;
+
+        if (!beacon && memcmp(mgmt->da, dev->dev_addr, ETH_ALEN))
+                return; /* ignore ProbeResp to foreign address */
+
+#if 0
+        printk(KERN_DEBUG "%s: RX %s from " MAC_FMT " to " MAC_FMT "\n",
+               dev->name, beacon ? "Beacon" : "Probe Response",
+               MAC_ARG(mgmt->sa), MAC_ARG(mgmt->da));
+#endif
+
+        baselen = (u8 *) mgmt->u.beacon.variable - (u8 *) mgmt;
+        if (baselen > len)
+                return;
+
+        timestamp = le64_to_cpu(mgmt->u.beacon.timestamp);
+
+        if (sdata->type == IEEE80211_IF_TYPE_IBSS && beacon &&
+            memcmp(mgmt->bssid, sdata->u.sta.bssid, ETH_ALEN) == 0) {
+#ifdef CONFIG_MAC80211_IBSS_DEBUG
+                static unsigned long last_tsf_debug = 0;
+                u64 tsf;
+                if (local->ops->get_tsf)
+                        tsf = local->ops->get_tsf(local_to_hw(local));
+                else
+                        tsf = -1LLU;
+                if (time_after(jiffies, last_tsf_debug + 5 * HZ)) {
+                        printk(KERN_DEBUG "RX beacon SA=" MAC_FMT " BSSID="
+                               MAC_FMT " TSF=0x%llx BCN=0x%llx diff=%lld "
+                               "@%lu\n",
+                               MAC_ARG(mgmt->sa), MAC_ARG(mgmt->bssid),
+                               (unsigned long long)tsf,
+                               (unsigned long long)timestamp,
+                               (unsigned long long)(tsf - timestamp),
+                               jiffies);
+                        last_tsf_debug = jiffies;
+                }
+#endif /* CONFIG_MAC80211_IBSS_DEBUG */
+        }
+
+        if (ieee802_11_parse_elems(mgmt->u.beacon.variable, len - baselen,
+                                   &elems) == ParseFailed)
+                invalid = 1;
+
+        if (sdata->type == IEEE80211_IF_TYPE_IBSS && elems.supp_rates &&
+            memcmp(mgmt->bssid, sdata->u.sta.bssid, ETH_ALEN) == 0 &&
+            (sta = sta_info_get(local, mgmt->sa))) {
+                struct ieee80211_hw_mode *mode;
+                struct ieee80211_rate *rates;
+                size_t num_rates;
+                u32 supp_rates, prev_rates;
+                int i, j;
+
+                mode = local->sta_scanning ?
+                       local->scan_hw_mode : local->oper_hw_mode;
+                rates = mode->rates;
+                num_rates = mode->num_rates;
+
+                supp_rates = 0;
+                for (i = 0; i < elems.supp_rates_len +
+                             elems.ext_supp_rates_len; i++) {
+                        u8 rate = 0;
+                        int own_rate;
+                        if (i < elems.supp_rates_len)
+                                rate = elems.supp_rates[i];
+                        else if (elems.ext_supp_rates)
+                                rate = elems.ext_supp_rates
+                                        [i - elems.supp_rates_len];
+                        own_rate = 5 * (rate & 0x7f);
+                        if (mode->mode == MODE_ATHEROS_TURBO)
+                                own_rate *= 2;
+                        for (j = 0; j < num_rates; j++)
+                                if (rates[j].rate == own_rate)
+                                        supp_rates |= BIT(j);
+                }
+
+                prev_rates = sta->supp_rates;
+                sta->supp_rates &= supp_rates;
+                if (sta->supp_rates == 0) {
+                        /* No matching rates - this should not really happen.
+                         * Make sure that at least one rate is marked
+                         * supported to avoid issues with TX rate ctrl. */
+                        sta->supp_rates = sdata->u.sta.supp_rates_bits;
+                }
+                if (sta->supp_rates != prev_rates) {
+                        printk(KERN_DEBUG "%s: updated supp_rates set for "
+                               MAC_FMT " based on beacon info (0x%x & 0x%x -> "
+                               "0x%x)\n",
+                               dev->name, MAC_ARG(sta->addr), prev_rates,
+                               supp_rates, sta->supp_rates);
+                }
+                sta_info_put(sta);
+        }
+
+        if (!elems.ssid)
+                return;
+
+        if (elems.ds_params && elems.ds_params_len == 1)
+                channel = elems.ds_params[0];
+        else
+                channel = rx_status->channel;
+
+        bss = ieee80211_rx_bss_get(dev, mgmt->bssid);
+        if (!bss) {
+                bss = ieee80211_rx_bss_add(dev, mgmt->bssid);
+                if (!bss)
+                        return;
+        } else {
+#if 0
+                /* TODO: order by RSSI? */
+                spin_lock_bh(&local->sta_bss_lock);
+                list_move_tail(&bss->list, &local->sta_bss_list);
+                spin_unlock_bh(&local->sta_bss_lock);
+#endif
+        }
+
+        if (bss->probe_resp && beacon) {
+                /* Do not allow beacon to override data from Probe Response. */
+                ieee80211_rx_bss_put(dev, bss);
+                return;
+        }
+
+        bss->beacon_int = le16_to_cpu(mgmt->u.beacon.beacon_int);
+        bss->capability = le16_to_cpu(mgmt->u.beacon.capab_info);
+        if (elems.ssid && elems.ssid_len <= IEEE80211_MAX_SSID_LEN) {
+                memcpy(bss->ssid, elems.ssid, elems.ssid_len);
+                bss->ssid_len = elems.ssid_len;
+        }
+
+        bss->supp_rates_len = 0;
+        if (elems.supp_rates) {
+                clen = IEEE80211_MAX_SUPP_RATES - bss->supp_rates_len;
+                if (clen > elems.supp_rates_len)
+                        clen = elems.supp_rates_len;
+                memcpy(&bss->supp_rates[bss->supp_rates_len], elems.supp_rates,
+                       clen);
+                bss->supp_rates_len += clen;
+        }
+        if (elems.ext_supp_rates) {
+                clen = IEEE80211_MAX_SUPP_RATES - bss->supp_rates_len;
+                if (clen > elems.ext_supp_rates_len)
+                        clen = elems.ext_supp_rates_len;
+                memcpy(&bss->supp_rates[bss->supp_rates_len],
+                       elems.ext_supp_rates, clen);
+                bss->supp_rates_len += clen;
+        }
+
+        if (elems.wpa &&
+            (!bss->wpa_ie || bss->wpa_ie_len != elems.wpa_len ||
+             memcmp(bss->wpa_ie, elems.wpa, elems.wpa_len))) {
+                kfree(bss->wpa_ie);
+                bss->wpa_ie = kmalloc(elems.wpa_len + 2, GFP_ATOMIC);
+                if (bss->wpa_ie) {
+                        memcpy(bss->wpa_ie, elems.wpa - 2, elems.wpa_len + 2);
+                        bss->wpa_ie_len = elems.wpa_len + 2;
+                } else
+                        bss->wpa_ie_len = 0;
+        } else if (!elems.wpa && bss->wpa_ie) {
+                kfree(bss->wpa_ie);
+                bss->wpa_ie = NULL;
+                bss->wpa_ie_len = 0;
+        }
+
+        if (elems.rsn &&
+            (!bss->rsn_ie || bss->rsn_ie_len != elems.rsn_len ||
+             memcmp(bss->rsn_ie, elems.rsn, elems.rsn_len))) {
+                kfree(bss->rsn_ie);
+                bss->rsn_ie = kmalloc(elems.rsn_len + 2, GFP_ATOMIC);
+                if (bss->rsn_ie) {
+                        memcpy(bss->rsn_ie, elems.rsn - 2, elems.rsn_len + 2);
+                        bss->rsn_ie_len = elems.rsn_len + 2;
+                } else
+                        bss->rsn_ie_len = 0;
+        } else if (!elems.rsn && bss->rsn_ie) {
+                kfree(bss->rsn_ie);
+                bss->rsn_ie = NULL;
+                bss->rsn_ie_len = 0;
+        }
+
+        if (elems.wmm_param &&
+            (!bss->wmm_ie || bss->wmm_ie_len != elems.wmm_param_len ||
+             memcmp(bss->wmm_ie, elems.wmm_param, elems.wmm_param_len))) {
+                kfree(bss->wmm_ie);
+                bss->wmm_ie = kmalloc(elems.wmm_param_len + 2, GFP_ATOMIC);
+                if (bss->wmm_ie) {
+                        memcpy(bss->wmm_ie, elems.wmm_param - 2,
+                               elems.wmm_param_len + 2);
+                        bss->wmm_ie_len = elems.wmm_param_len + 2;
+                } else
+                        bss->wmm_ie_len = 0;
+        } else if (!elems.wmm_param && bss->wmm_ie) {
+                kfree(bss->wmm_ie);
+                bss->wmm_ie = NULL;
+                bss->wmm_ie_len = 0;
+        }
+
+
+        bss->hw_mode = rx_status->phymode;
+        bss->channel = channel;
+        bss->freq = rx_status->freq;
+        if (channel != rx_status->channel &&
+            (bss->hw_mode == MODE_IEEE80211G ||
+             bss->hw_mode == MODE_IEEE80211B) &&
+            channel >= 1 && channel <= 14) {
+                static const int freq_list[] = {
+                        2412, 2417, 2422, 2427, 2432, 2437, 2442,
+                        2447, 2452, 2457, 2462, 2467, 2472, 2484
+                };
+                /* IEEE 802.11g/b mode can receive packets from neighboring
+                 * channels, so map the channel into frequency. */
+                bss->freq = freq_list[channel - 1];
+        }
+        bss->timestamp = timestamp;
+        bss->last_update = jiffies;
+        bss->rssi = rx_status->ssi;
+        bss->signal = rx_status->signal;
+        bss->noise = rx_status->noise;
+        if (!beacon)
+                bss->probe_resp++;
+        ieee80211_rx_bss_put(dev, bss);
+}
+
+
+static void ieee80211_rx_mgmt_probe_resp(struct net_device *dev,
+                                         struct ieee80211_mgmt *mgmt,
+                                         size_t len,
+                                         struct ieee80211_rx_status *rx_status)
+{
+        ieee80211_rx_bss_info(dev, mgmt, len, rx_status, 0);
+}
+
+
+static void ieee80211_rx_mgmt_beacon(struct net_device *dev,
+                                     struct ieee80211_mgmt *mgmt,
+                                     size_t len,
+                                     struct ieee80211_rx_status *rx_status)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sub_if_data *sdata;
+        struct ieee80211_if_sta *ifsta;
+        int use_protection;
+        size_t baselen;
+        struct ieee802_11_elems elems;
+
+        ieee80211_rx_bss_info(dev, mgmt, len, rx_status, 1);
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        if (sdata->type != IEEE80211_IF_TYPE_STA)
+                return;
+        ifsta = &sdata->u.sta;
+
+        if (!ifsta->associated ||
+            memcmp(ifsta->bssid, mgmt->bssid, ETH_ALEN) != 0)
+                return;
+
+        /* Process beacon from the current BSS */
+        baselen = (u8 *) mgmt->u.beacon.variable - (u8 *) mgmt;
+        if (baselen > len)
+                return;
+
+        if (ieee802_11_parse_elems(mgmt->u.beacon.variable, len - baselen,
+                                   &elems) == ParseFailed)
+                return;
+
+        use_protection = 0;
+        if (elems.erp_info && elems.erp_info_len >= 1) {
+                use_protection =
+                        (elems.erp_info[0] & ERP_INFO_USE_PROTECTION) != 0;
+        }
+
+        if (use_protection != !!ifsta->use_protection) {
+                if (net_ratelimit()) {
+                        printk(KERN_DEBUG "%s: CTS protection %s (BSSID="
+                               MAC_FMT ")\n",
+                               dev->name,
+                               use_protection ? "enabled" : "disabled",
+                               MAC_ARG(ifsta->bssid));
+                }
+                ifsta->use_protection = use_protection ? 1 : 0;
+                local->cts_protect_erp_frames = use_protection;
+        }
+
+        if (elems.wmm_param && ifsta->wmm_enabled) {
+                ieee80211_sta_wmm_params(dev, ifsta, elems.wmm_param,
+                                         elems.wmm_param_len);
+        }
+}
+
+
+static void ieee80211_rx_mgmt_probe_req(struct net_device *dev,
+                                        struct ieee80211_if_sta *ifsta,
+                                        struct ieee80211_mgmt *mgmt,
+                                        size_t len,
+                                        struct ieee80211_rx_status *rx_status)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        int tx_last_beacon;
+        struct sk_buff *skb;
+        struct ieee80211_mgmt *resp;
+        u8 *pos, *end;
+
+        if (sdata->type != IEEE80211_IF_TYPE_IBSS ||
+            ifsta->state != IEEE80211_IBSS_JOINED ||
+            len < 24 + 2 || !ifsta->probe_resp)
+                return;
+
+        if (local->ops->tx_last_beacon)
+                tx_last_beacon = local->ops->tx_last_beacon(local_to_hw(local));
+        else
+                tx_last_beacon = 1;
+
+#ifdef CONFIG_MAC80211_IBSS_DEBUG
+        printk(KERN_DEBUG "%s: RX ProbeReq SA=" MAC_FMT " DA=" MAC_FMT " BSSID="
+               MAC_FMT " (tx_last_beacon=%d)\n",
+               dev->name, MAC_ARG(mgmt->sa), MAC_ARG(mgmt->da),
+               MAC_ARG(mgmt->bssid), tx_last_beacon);
+#endif /* CONFIG_MAC80211_IBSS_DEBUG */
+
+        if (!tx_last_beacon)
+                return;
+
+        if (memcmp(mgmt->bssid, ifsta->bssid, ETH_ALEN) != 0 &&
+            memcmp(mgmt->bssid, "\xff\xff\xff\xff\xff\xff", ETH_ALEN) != 0)
+                return;
+
+        end = ((u8 *) mgmt) + len;
+        pos = mgmt->u.probe_req.variable;
+        if (pos[0] != WLAN_EID_SSID ||
+            pos + 2 + pos[1] > end) {
+                if (net_ratelimit()) {
+                        printk(KERN_DEBUG "%s: Invalid SSID IE in ProbeReq "
+                               "from " MAC_FMT "\n",
+                               dev->name, MAC_ARG(mgmt->sa));
+                }
+                return;
+        }
+        if (pos[1] != 0 &&
+            (pos[1] != ifsta->ssid_len ||
+             memcmp(pos + 2, ifsta->ssid, ifsta->ssid_len) != 0)) {
+                /* Ignore ProbeReq for foreign SSID */
+                return;
+        }
+
+        /* Reply with ProbeResp */
+        skb = skb_copy(ifsta->probe_resp, GFP_ATOMIC);
+        if (!skb)
+                return;
+
+        resp = (struct ieee80211_mgmt *) skb->data;
+        memcpy(resp->da, mgmt->sa, ETH_ALEN);
+#ifdef CONFIG_MAC80211_IBSS_DEBUG
+        printk(KERN_DEBUG "%s: Sending ProbeResp to " MAC_FMT "\n",
+               dev->name, MAC_ARG(resp->da));
+#endif /* CONFIG_MAC80211_IBSS_DEBUG */
+        ieee80211_sta_tx(dev, skb, 0);
+}
+
+
+void ieee80211_sta_rx_mgmt(struct net_device *dev, struct sk_buff *skb,
+                           struct ieee80211_rx_status *rx_status)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sub_if_data *sdata;
+        struct ieee80211_if_sta *ifsta;
+        struct ieee80211_mgmt *mgmt;
+        u16 fc;
+
+        if (skb->len < 24)
+                goto fail;
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        ifsta = &sdata->u.sta;
+
+        mgmt = (struct ieee80211_mgmt *) skb->data;
+        fc = le16_to_cpu(mgmt->frame_control);
+
+        switch (fc & IEEE80211_FCTL_STYPE) {
+        case IEEE80211_STYPE_PROBE_REQ:
+        case IEEE80211_STYPE_PROBE_RESP:
+        case IEEE80211_STYPE_BEACON:
+                memcpy(skb->cb, rx_status, sizeof(*rx_status));
+        case IEEE80211_STYPE_AUTH:
+        case IEEE80211_STYPE_ASSOC_RESP:
+        case IEEE80211_STYPE_REASSOC_RESP:
+        case IEEE80211_STYPE_DEAUTH:
+        case IEEE80211_STYPE_DISASSOC:
+                skb_queue_tail(&ifsta->skb_queue, skb);
+                queue_work(local->hw.workqueue, &ifsta->work);
+                return;
+        default:
+                printk(KERN_DEBUG "%s: received unknown management frame - "
+                       "stype=%d\n", dev->name,
+                       (fc & IEEE80211_FCTL_STYPE) >> 4);
+                break;
+        }
+
+ fail:
+        kfree_skb(skb);
+}
+
+
+static void ieee80211_sta_rx_queued_mgmt(struct net_device *dev,
+                                         struct sk_buff *skb)
+{
+        struct ieee80211_rx_status *rx_status;
+        struct ieee80211_sub_if_data *sdata;
+        struct ieee80211_if_sta *ifsta;
+        struct ieee80211_mgmt *mgmt;
+        u16 fc;
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        ifsta = &sdata->u.sta;
+
+        rx_status = (struct ieee80211_rx_status *) skb->cb;
+        mgmt = (struct ieee80211_mgmt *) skb->data;
+        fc = le16_to_cpu(mgmt->frame_control);
+
+        switch (fc & IEEE80211_FCTL_STYPE) {
+        case IEEE80211_STYPE_PROBE_REQ:
+                ieee80211_rx_mgmt_probe_req(dev, ifsta, mgmt, skb->len,
+                                            rx_status);
+                break;
+        case IEEE80211_STYPE_PROBE_RESP:
+                ieee80211_rx_mgmt_probe_resp(dev, mgmt, skb->len, rx_status);
+                break;
+        case IEEE80211_STYPE_BEACON:
+                ieee80211_rx_mgmt_beacon(dev, mgmt, skb->len, rx_status);
+                break;
+        case IEEE80211_STYPE_AUTH:
+                ieee80211_rx_mgmt_auth(dev, ifsta, mgmt, skb->len);
+                break;
+        case IEEE80211_STYPE_ASSOC_RESP:
+                ieee80211_rx_mgmt_assoc_resp(dev, ifsta, mgmt, skb->len, 0);
+                break;
+        case IEEE80211_STYPE_REASSOC_RESP:
+                ieee80211_rx_mgmt_assoc_resp(dev, ifsta, mgmt, skb->len, 1);
+                break;
+        case IEEE80211_STYPE_DEAUTH:
+                ieee80211_rx_mgmt_deauth(dev, ifsta, mgmt, skb->len);
+                break;
+        case IEEE80211_STYPE_DISASSOC:
+                ieee80211_rx_mgmt_disassoc(dev, ifsta, mgmt, skb->len);
+                break;
+        }
+
+        kfree_skb(skb);
+}
+
+
+void ieee80211_sta_rx_scan(struct net_device *dev, struct sk_buff *skb,
+                           struct ieee80211_rx_status *rx_status)
+{
+        struct ieee80211_mgmt *mgmt;
+        u16 fc;
+
+        if (skb->len < 24) {
+                dev_kfree_skb(skb);
+                return;
+        }
+
+        mgmt = (struct ieee80211_mgmt *) skb->data;
+        fc = le16_to_cpu(mgmt->frame_control);
+
+        if ((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT) {
+                if ((fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PROBE_RESP) {
+                        ieee80211_rx_mgmt_probe_resp(dev, mgmt,
+                                                     skb->len, rx_status);
+                } else if ((fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_BEACON) {
+                        ieee80211_rx_mgmt_beacon(dev, mgmt, skb->len,
+                                                 rx_status);
+                }
+        }
+
+        dev_kfree_skb(skb);
+}
+
+
+static int ieee80211_sta_active_ibss(struct net_device *dev)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        int active = 0;
+        struct sta_info *sta;
+
+        spin_lock_bh(&local->sta_lock);
+        list_for_each_entry(sta, &local->sta_list, list) {
+                if (sta->dev == dev &&
+                    time_after(sta->last_rx + IEEE80211_IBSS_MERGE_INTERVAL,
+                               jiffies)) {
+                        active++;
+                        break;
+                }
+        }
+        spin_unlock_bh(&local->sta_lock);
+
+        return active;
+}
+
+
+static void ieee80211_sta_expire(struct net_device *dev)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct sta_info *sta, *tmp;
+
+        spin_lock_bh(&local->sta_lock);
+        list_for_each_entry_safe(sta, tmp, &local->sta_list, list)
+                if (time_after(jiffies, sta->last_rx +
+                               IEEE80211_IBSS_INACTIVITY_LIMIT)) {
+                        printk(KERN_DEBUG "%s: expiring inactive STA " MAC_FMT
+                               "\n", dev->name, MAC_ARG(sta->addr));
+                        sta_info_free(sta, 1);
+                }
+        spin_unlock_bh(&local->sta_lock);
+}
+
+
+static void ieee80211_sta_merge_ibss(struct net_device *dev,
+                                     struct ieee80211_if_sta *ifsta)
+{
+        mod_timer(&ifsta->timer, jiffies + IEEE80211_IBSS_MERGE_INTERVAL);
+
+        ieee80211_sta_expire(dev);
+        if (ieee80211_sta_active_ibss(dev))
+                return;
+
+        printk(KERN_DEBUG "%s: No active IBSS STAs - trying to scan for other "
+               "IBSS networks with same SSID (merge)\n", dev->name);
+        ieee80211_sta_req_scan(dev, ifsta->ssid, ifsta->ssid_len);
+}
+
+
+void ieee80211_sta_timer(unsigned long data)
+{
+        struct ieee80211_sub_if_data *sdata =
+                (struct ieee80211_sub_if_data *) data;
+        struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+        struct ieee80211_local *local = wdev_priv(&sdata->wdev);
+
+        set_bit(IEEE80211_STA_REQ_RUN, &ifsta->request);
+        queue_work(local->hw.workqueue, &ifsta->work);
+}
+
+
+void ieee80211_sta_work(struct work_struct *work)
+{
+        struct ieee80211_sub_if_data *sdata =
+                container_of(work, struct ieee80211_sub_if_data, u.sta.work);
+        struct net_device *dev = sdata->dev;
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_if_sta *ifsta;
+        struct sk_buff *skb;
+
+        if (!netif_running(dev))
+                return;
+
+        if (local->sta_scanning)
+                return;
+
+        if (sdata->type != IEEE80211_IF_TYPE_STA &&
+            sdata->type != IEEE80211_IF_TYPE_IBSS) {
+                printk(KERN_DEBUG "%s: ieee80211_sta_work: non-STA interface "
+                       "(type=%d)\n", dev->name, sdata->type);
+                return;
+        }
+        ifsta = &sdata->u.sta;
+
+        while ((skb = skb_dequeue(&ifsta->skb_queue)))
+                ieee80211_sta_rx_queued_mgmt(dev, skb);
+
+        if (ifsta->state != IEEE80211_AUTHENTICATE &&
+            ifsta->state != IEEE80211_ASSOCIATE &&
+            test_and_clear_bit(IEEE80211_STA_REQ_SCAN, &ifsta->request)) {
+                ieee80211_sta_start_scan(dev, NULL, 0);
+                return;
+        }
+
+        if (test_and_clear_bit(IEEE80211_STA_REQ_AUTH, &ifsta->request)) {
+                if (ieee80211_sta_config_auth(dev, ifsta))
+                        return;
+                clear_bit(IEEE80211_STA_REQ_RUN, &ifsta->request);
+        } else if (!test_and_clear_bit(IEEE80211_STA_REQ_RUN, &ifsta->request))
+                return;
+
+        switch (ifsta->state) {
+        case IEEE80211_DISABLED:
+                break;
+        case IEEE80211_AUTHENTICATE:
+                ieee80211_authenticate(dev, ifsta);
+                break;
+        case IEEE80211_ASSOCIATE:
+                ieee80211_associate(dev, ifsta);
+                break;
+        case IEEE80211_ASSOCIATED:
+                ieee80211_associated(dev, ifsta);
+                break;
+        case IEEE80211_IBSS_SEARCH:
+                ieee80211_sta_find_ibss(dev, ifsta);
+                break;
+        case IEEE80211_IBSS_JOINED:
+                ieee80211_sta_merge_ibss(dev, ifsta);
+                break;
+        default:
+                printk(KERN_DEBUG "ieee80211_sta_work: Unknown state %d\n",
+                       ifsta->state);
+                break;
+        }
+
+        if (ieee80211_privacy_mismatch(dev, ifsta)) {
+                printk(KERN_DEBUG "%s: privacy configuration mismatch and "
+                       "mixed-cell disabled - disassociate\n", dev->name);
+
+                ieee80211_send_disassoc(dev, ifsta, WLAN_REASON_UNSPECIFIED);
+                ieee80211_set_disassoc(dev, ifsta, 0);
+        }
+}
+
+
+static void ieee80211_sta_reset_auth(struct net_device *dev,
+                                     struct ieee80211_if_sta *ifsta)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+
+        if (local->ops->reset_tsf) {
+                /* Reset own TSF to allow time synchronization work. */
+                local->ops->reset_tsf(local_to_hw(local));
+        }
+
+        ifsta->wmm_last_param_set = -1; /* allow any WMM update */
+
+
+        if (ifsta->auth_algs & IEEE80211_AUTH_ALG_OPEN)
+                ifsta->auth_alg = WLAN_AUTH_OPEN;
+        else if (ifsta->auth_algs & IEEE80211_AUTH_ALG_SHARED_KEY)
+                ifsta->auth_alg = WLAN_AUTH_SHARED_KEY;
+        else if (ifsta->auth_algs & IEEE80211_AUTH_ALG_LEAP)
+                ifsta->auth_alg = WLAN_AUTH_LEAP;
+        else
+                ifsta->auth_alg = WLAN_AUTH_OPEN;
+        printk(KERN_DEBUG "%s: Initial auth_alg=%d\n", dev->name,
+               ifsta->auth_alg);
+        ifsta->auth_transaction = -1;
+        ifsta->associated = ifsta->auth_tries = ifsta->assoc_tries = 0;
+        netif_carrier_off(dev);
+}
+
+
+void ieee80211_sta_req_auth(struct net_device *dev,
+                            struct ieee80211_if_sta *ifsta)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+
+        if (sdata->type != IEEE80211_IF_TYPE_STA)
+                return;
+
+        if ((ifsta->bssid_set || ifsta->auto_bssid_sel) &&
+            (ifsta->ssid_set || ifsta->auto_ssid_sel)) {
+                set_bit(IEEE80211_STA_REQ_AUTH, &ifsta->request);
+                queue_work(local->hw.workqueue, &ifsta->work);
+        }
+}
+
+static int ieee80211_sta_match_ssid(struct ieee80211_if_sta *ifsta,
+                                    const char *ssid, int ssid_len)
+{
+        int tmp, hidden_ssid;
+
+        if (!memcmp(ifsta->ssid, ssid, ssid_len))
+                return 1;
+
+        if (ifsta->auto_bssid_sel)
+                return 0;
+
+        hidden_ssid = 1;
+        tmp = ssid_len;
+        while (tmp--) {
+                if (ssid[tmp] != '\0') {
+                        hidden_ssid = 0;
+                        break;
+                }
+        }
+
+        if (hidden_ssid && ifsta->ssid_len == ssid_len)
+                return 1;
+
+        if (ssid_len == 1 && ssid[0] == ' ')
+                return 1;
+
+        return 0;
+}
+
+static int ieee80211_sta_config_auth(struct net_device *dev,
+                                     struct ieee80211_if_sta *ifsta)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        struct ieee80211_sta_bss *bss, *selected = NULL;
+        int top_rssi = 0, freq;
+
+        rtnl_lock();
+
+        if (!ifsta->auto_channel_sel && !ifsta->auto_bssid_sel &&
+            !ifsta->auto_ssid_sel) {
+                ifsta->state = IEEE80211_AUTHENTICATE;
+                rtnl_unlock();
+                ieee80211_sta_reset_auth(dev, ifsta);
+                return 0;
+        }
+
+        spin_lock_bh(&local->sta_bss_lock);
+        freq = local->oper_channel->freq;
+        list_for_each_entry(bss, &local->sta_bss_list, list) {
+                if (!(bss->capability & WLAN_CAPABILITY_ESS))
+                        continue;
+
+                if (!!(bss->capability & WLAN_CAPABILITY_PRIVACY) ^
+                    !!sdata->default_key)
+                        continue;
+
+                if (!ifsta->auto_channel_sel && bss->freq != freq)
+                        continue;
+
+                if (!ifsta->auto_bssid_sel &&
+                    memcmp(bss->bssid, ifsta->bssid, ETH_ALEN))
+                        continue;
+
+                if (!ifsta->auto_ssid_sel &&
+                    !ieee80211_sta_match_ssid(ifsta, bss->ssid, bss->ssid_len))
+                        continue;
+
+                if (!selected || top_rssi < bss->rssi) {
+                        selected = bss;
+                        top_rssi = bss->rssi;
+                }
+        }
+        if (selected)
+                atomic_inc(&selected->users);
+        spin_unlock_bh(&local->sta_bss_lock);
+
+        if (selected) {
+                ieee80211_set_channel(local, -1, selected->freq);
+                if (!ifsta->ssid_set)
+                        ieee80211_sta_set_ssid(dev, selected->ssid,
+                                               selected->ssid_len);
+                ieee80211_sta_set_bssid(dev, selected->bssid);
+                ieee80211_rx_bss_put(dev, selected);
+                ifsta->state = IEEE80211_AUTHENTICATE;
+                rtnl_unlock();
+                ieee80211_sta_reset_auth(dev, ifsta);
+                return 0;
+        } else {
+                if (ifsta->state != IEEE80211_AUTHENTICATE) {
+                        ieee80211_sta_start_scan(dev, NULL, 0);
+                        ifsta->state = IEEE80211_AUTHENTICATE;
+                        set_bit(IEEE80211_STA_REQ_AUTH, &ifsta->request);
+                } else
+                        ifsta->state = IEEE80211_DISABLED;
+        }
+        rtnl_unlock();
+        return -1;
+}
+
+static int ieee80211_sta_join_ibss(struct net_device *dev,
+                                   struct ieee80211_if_sta *ifsta,
+                                   struct ieee80211_sta_bss *bss)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        int res, rates, i, j;
+        struct sk_buff *skb;
+        struct ieee80211_mgmt *mgmt;
+        struct ieee80211_tx_control control;
+        struct ieee80211_rate *rate;
+        struct ieee80211_hw_mode *mode;
+        struct rate_control_extra extra;
+        u8 *pos;
+        struct ieee80211_sub_if_data *sdata;
+
+        /* Remove possible STA entries from other IBSS networks. */
+        sta_info_flush(local, NULL);
+
+        if (local->ops->reset_tsf) {
+                /* Reset own TSF to allow time synchronization work. */
+                local->ops->reset_tsf(local_to_hw(local));
+        }
+        memcpy(ifsta->bssid, bss->bssid, ETH_ALEN);
+        res = ieee80211_if_config(dev);
+        if (res)
+                return res;
+
+        local->hw.conf.beacon_int = bss->beacon_int >= 10 ? bss->beacon_int : 10;
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        sdata->drop_unencrypted = bss->capability &
+                WLAN_CAPABILITY_PRIVACY ? 1 : 0;
+
+        res = ieee80211_set_channel(local, -1, bss->freq);
+
+        if (!(local->oper_channel->flag & IEEE80211_CHAN_W_IBSS)) {
+                printk(KERN_DEBUG "%s: IBSS not allowed on channel %d "
+                       "(%d MHz)\n", dev->name, local->hw.conf.channel,
+                       local->hw.conf.freq);
+                return -1;
+        }
+
+        /* Set beacon template based on scan results */
+        skb = dev_alloc_skb(local->hw.extra_tx_headroom + 400);
+        do {
+                if (!skb)
+                        break;
+
+                skb_reserve(skb, local->hw.extra_tx_headroom);
+
+                mgmt = (struct ieee80211_mgmt *)
+                        skb_put(skb, 24 + sizeof(mgmt->u.beacon));
+                memset(mgmt, 0, 24 + sizeof(mgmt->u.beacon));
+                mgmt->frame_control = IEEE80211_FC(IEEE80211_FTYPE_MGMT,
+                                                   IEEE80211_STYPE_BEACON);
+                memset(mgmt->da, 0xff, ETH_ALEN);
+                memcpy(mgmt->sa, dev->dev_addr, ETH_ALEN);
+                memcpy(mgmt->bssid, ifsta->bssid, ETH_ALEN);
+                mgmt->u.beacon.beacon_int =
+                        cpu_to_le16(local->hw.conf.beacon_int);
+                mgmt->u.beacon.capab_info = cpu_to_le16(bss->capability);
+
+                pos = skb_put(skb, 2 + ifsta->ssid_len);
+                *pos++ = WLAN_EID_SSID;
+                *pos++ = ifsta->ssid_len;
+                memcpy(pos, ifsta->ssid, ifsta->ssid_len);
+
+                rates = bss->supp_rates_len;
+                if (rates > 8)
+                        rates = 8;
+                pos = skb_put(skb, 2 + rates);
+                *pos++ = WLAN_EID_SUPP_RATES;
+                *pos++ = rates;
+                memcpy(pos, bss->supp_rates, rates);
+
+                pos = skb_put(skb, 2 + 1);
+                *pos++ = WLAN_EID_DS_PARAMS;
+                *pos++ = 1;
+                *pos++ = bss->channel;
+
+                pos = skb_put(skb, 2 + 2);
+                *pos++ = WLAN_EID_IBSS_PARAMS;
+                *pos++ = 2;
+                /* FIX: set ATIM window based on scan results */
+                *pos++ = 0;
+                *pos++ = 0;
+
+                if (bss->supp_rates_len > 8) {
+                        rates = bss->supp_rates_len - 8;
+                        pos = skb_put(skb, 2 + rates);
+                        *pos++ = WLAN_EID_EXT_SUPP_RATES;
+                        *pos++ = rates;
+                        memcpy(pos, &bss->supp_rates[8], rates);
+                }
+
+                memset(&control, 0, sizeof(control));
+                memset(&extra, 0, sizeof(extra));
+                extra.mode = local->oper_hw_mode;
+                rate = rate_control_get_rate(local, dev, skb, &extra);
+                if (!rate) {
+                        printk(KERN_DEBUG "%s: Failed to determine TX rate "
+                               "for IBSS beacon\n", dev->name);
+                        break;
+                }
+                control.tx_rate = (local->short_preamble &&
+                                   (rate->flags & IEEE80211_RATE_PREAMBLE2)) ?
+                        rate->val2 : rate->val;
+                control.antenna_sel_tx = local->hw.conf.antenna_sel_tx;
+                control.power_level = local->hw.conf.power_level;
+                control.flags |= IEEE80211_TXCTL_NO_ACK;
+                control.retry_limit = 1;
+
+                ifsta->probe_resp = skb_copy(skb, GFP_ATOMIC);
+                if (ifsta->probe_resp) {
+                        mgmt = (struct ieee80211_mgmt *)
+                                ifsta->probe_resp->data;
+                        mgmt->frame_control =
+                                IEEE80211_FC(IEEE80211_FTYPE_MGMT,
+                                             IEEE80211_STYPE_PROBE_RESP);
+                } else {
+                        printk(KERN_DEBUG "%s: Could not allocate ProbeResp "
+                               "template for IBSS\n", dev->name);
+                }
+
+                if (local->ops->beacon_update &&
+                    local->ops->beacon_update(local_to_hw(local),
+                                             skb, &control) == 0) {
+                        printk(KERN_DEBUG "%s: Configured IBSS beacon "
+                               "template based on scan results\n", dev->name);
+                        skb = NULL;
+                }
+
+                rates = 0;
+                mode = local->oper_hw_mode;
+                for (i = 0; i < bss->supp_rates_len; i++) {
+                        int bitrate = (bss->supp_rates[i] & 0x7f) * 5;
+                        if (mode->mode == MODE_ATHEROS_TURBO)
+                                bitrate *= 2;
+                        for (j = 0; j < mode->num_rates; j++)
+                                if (mode->rates[j].rate == bitrate)
+                                        rates |= BIT(j);
+                }
+                ifsta->supp_rates_bits = rates;
+        } while (0);
+
+        if (skb) {
+                printk(KERN_DEBUG "%s: Failed to configure IBSS beacon "
+                       "template\n", dev->name);
+                dev_kfree_skb(skb);
+        }
+
+        ifsta->state = IEEE80211_IBSS_JOINED;
+        mod_timer(&ifsta->timer, jiffies + IEEE80211_IBSS_MERGE_INTERVAL);
+
+        ieee80211_rx_bss_put(dev, bss);
+
+        return res;
+}
+
+
+static int ieee80211_sta_create_ibss(struct net_device *dev,
+                                     struct ieee80211_if_sta *ifsta)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sta_bss *bss;
+        struct ieee80211_sub_if_data *sdata;
+        struct ieee80211_hw_mode *mode;
+        u8 bssid[ETH_ALEN], *pos;
+        int i;
+
+#if 0
+        /* Easier testing, use fixed BSSID. */
+        memset(bssid, 0xfe, ETH_ALEN);
+#else
+        /* Generate random, not broadcast, locally administered BSSID. Mix in
+         * own MAC address to make sure that devices that do not have proper
+         * random number generator get different BSSID. */
+        get_random_bytes(bssid, ETH_ALEN);
+        for (i = 0; i < ETH_ALEN; i++)
+                bssid[i] ^= dev->dev_addr[i];
+        bssid[0] &= ~0x01;
+        bssid[0] |= 0x02;
+#endif
+
+        printk(KERN_DEBUG "%s: Creating new IBSS network, BSSID " MAC_FMT "\n",
+               dev->name, MAC_ARG(bssid));
+
+        bss = ieee80211_rx_bss_add(dev, bssid);
+        if (!bss)
+                return -ENOMEM;
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        mode = local->oper_hw_mode;
+
+        if (local->hw.conf.beacon_int == 0)
+                local->hw.conf.beacon_int = 100;
+        bss->beacon_int = local->hw.conf.beacon_int;
+        bss->hw_mode = local->hw.conf.phymode;
+        bss->channel = local->hw.conf.channel;
+        bss->freq = local->hw.conf.freq;
+        bss->last_update = jiffies;
+        bss->capability = WLAN_CAPABILITY_IBSS;
+        if (sdata->default_key) {
+                bss->capability |= WLAN_CAPABILITY_PRIVACY;
+        } else
+                sdata->drop_unencrypted = 0;
+        bss->supp_rates_len = mode->num_rates;
+        pos = bss->supp_rates;
+        for (i = 0; i < mode->num_rates; i++) {
+                int rate = mode->rates[i].rate;
+                if (mode->mode == MODE_ATHEROS_TURBO)
+                        rate /= 2;
+                *pos++ = (u8) (rate / 5);
+        }
+
+        return ieee80211_sta_join_ibss(dev, ifsta, bss);
+}
+
+
+static int ieee80211_sta_find_ibss(struct net_device *dev,
+                                   struct ieee80211_if_sta *ifsta)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sta_bss *bss;
+        int found = 0;
+        u8 bssid[ETH_ALEN];
+        int active_ibss;
+
+        if (ifsta->ssid_len == 0)
+                return -EINVAL;
+
+        active_ibss = ieee80211_sta_active_ibss(dev);
+#ifdef CONFIG_MAC80211_IBSS_DEBUG
+        printk(KERN_DEBUG "%s: sta_find_ibss (active_ibss=%d)\n",
+               dev->name, active_ibss);
+#endif /* CONFIG_MAC80211_IBSS_DEBUG */
+        spin_lock_bh(&local->sta_bss_lock);
+        list_for_each_entry(bss, &local->sta_bss_list, list) {
+                if (ifsta->ssid_len != bss->ssid_len ||
+                    memcmp(ifsta->ssid, bss->ssid, bss->ssid_len) != 0
+                    || !(bss->capability & WLAN_CAPABILITY_IBSS))
+                        continue;
+#ifdef CONFIG_MAC80211_IBSS_DEBUG
+                printk(KERN_DEBUG "   bssid=" MAC_FMT " found\n",
+                       MAC_ARG(bss->bssid));
+#endif /* CONFIG_MAC80211_IBSS_DEBUG */
+                memcpy(bssid, bss->bssid, ETH_ALEN);
+                found = 1;
+                if (active_ibss || memcmp(bssid, ifsta->bssid, ETH_ALEN) != 0)
+                        break;
+        }
+        spin_unlock_bh(&local->sta_bss_lock);
+
+#ifdef CONFIG_MAC80211_IBSS_DEBUG
+        printk(KERN_DEBUG "   sta_find_ibss: selected " MAC_FMT " current "
+               MAC_FMT "\n", MAC_ARG(bssid), MAC_ARG(ifsta->bssid));
+#endif /* CONFIG_MAC80211_IBSS_DEBUG */
+        if (found && memcmp(ifsta->bssid, bssid, ETH_ALEN) != 0 &&
+            (bss = ieee80211_rx_bss_get(dev, bssid))) {
+                printk(KERN_DEBUG "%s: Selected IBSS BSSID " MAC_FMT
+                       " based on configured SSID\n",
+                       dev->name, MAC_ARG(bssid));
+                return ieee80211_sta_join_ibss(dev, ifsta, bss);
+        }
+#ifdef CONFIG_MAC80211_IBSS_DEBUG
+        printk(KERN_DEBUG "   did not try to join ibss\n");
+#endif /* CONFIG_MAC80211_IBSS_DEBUG */
+
+        /* Selected IBSS not found in current scan results - try to scan */
+        if (ifsta->state == IEEE80211_IBSS_JOINED &&
+            !ieee80211_sta_active_ibss(dev)) {
+                mod_timer(&ifsta->timer, jiffies +
+                                      IEEE80211_IBSS_MERGE_INTERVAL);
+        } else if (time_after(jiffies, local->last_scan_completed +
+                              IEEE80211_SCAN_INTERVAL)) {
+                printk(KERN_DEBUG "%s: Trigger new scan to find an IBSS to "
+                       "join\n", dev->name);
+                return ieee80211_sta_req_scan(dev, ifsta->ssid,
+                                              ifsta->ssid_len);
+        } else if (ifsta->state != IEEE80211_IBSS_JOINED) {
+                int interval = IEEE80211_SCAN_INTERVAL;
+
+                if (time_after(jiffies, ifsta->ibss_join_req +
+                               IEEE80211_IBSS_JOIN_TIMEOUT)) {
+                        if (ifsta->create_ibss &&
+                            local->oper_channel->flag & IEEE80211_CHAN_W_IBSS)
+                                return ieee80211_sta_create_ibss(dev, ifsta);
+                        if (ifsta->create_ibss) {
+                                printk(KERN_DEBUG "%s: IBSS not allowed on the"
+                                       " configured channel %d (%d MHz)\n",
+                                       dev->name, local->hw.conf.channel,
+                                       local->hw.conf.freq);
+                        }
+
+                        /* No IBSS found - decrease scan interval and continue
+                         * scanning. */
+                        interval = IEEE80211_SCAN_INTERVAL_SLOW;
+                }
+
+                ifsta->state = IEEE80211_IBSS_SEARCH;
+                mod_timer(&ifsta->timer, jiffies + interval);
+                return 0;
+        }
+
+        return 0;
+}
+
+
+int ieee80211_sta_set_ssid(struct net_device *dev, char *ssid, size_t len)
+{
+        struct ieee80211_sub_if_data *sdata;
+        struct ieee80211_if_sta *ifsta;
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+
+        if (len > IEEE80211_MAX_SSID_LEN)
+                return -EINVAL;
+
+        /* TODO: This should always be done for IBSS, even if IEEE80211_QOS is
+         * not defined. */
+        if (local->ops->conf_tx) {
+                struct ieee80211_tx_queue_params qparam;
+                int i;
+
+                memset(&qparam, 0, sizeof(qparam));
+                /* TODO: are these ok defaults for all hw_modes? */
+                qparam.aifs = 2;
+                qparam.cw_min =
+                        local->hw.conf.phymode == MODE_IEEE80211B ? 31 : 15;
+                qparam.cw_max = 1023;
+                qparam.burst_time = 0;
+                for (i = IEEE80211_TX_QUEUE_DATA0; i < NUM_TX_DATA_QUEUES; i++)
+                {
+                        local->ops->conf_tx(local_to_hw(local),
+                                           i + IEEE80211_TX_QUEUE_DATA0,
+                                           &qparam);
+                }
+                /* IBSS uses different parameters for Beacon sending */
+                qparam.cw_min++;
+                qparam.cw_min *= 2;
+                qparam.cw_min--;
+                local->ops->conf_tx(local_to_hw(local),
+                                   IEEE80211_TX_QUEUE_BEACON, &qparam);
+        }
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        ifsta = &sdata->u.sta;
+
+        if (ifsta->ssid_len != len || memcmp(ifsta->ssid, ssid, len) != 0)
+                ifsta->prev_bssid_set = 0;
+        memcpy(ifsta->ssid, ssid, len);
+        memset(ifsta->ssid + len, 0, IEEE80211_MAX_SSID_LEN - len);
+        ifsta->ssid_len = len;
+
+        ifsta->ssid_set = len ? 1 : 0;
+        if (sdata->type == IEEE80211_IF_TYPE_IBSS && !ifsta->bssid_set) {
+                ifsta->ibss_join_req = jiffies;
+                ifsta->state = IEEE80211_IBSS_SEARCH;
+                return ieee80211_sta_find_ibss(dev, ifsta);
+        }
+        return 0;
+}
+
+
+int ieee80211_sta_get_ssid(struct net_device *dev, char *ssid, size_t *len)
+{
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+        memcpy(ssid, ifsta->ssid, ifsta->ssid_len);
+        *len = ifsta->ssid_len;
+        return 0;
+}
+
+
+int ieee80211_sta_set_bssid(struct net_device *dev, u8 *bssid)
+{
+        struct ieee80211_sub_if_data *sdata;
+        struct ieee80211_if_sta *ifsta;
+        int res;
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        ifsta = &sdata->u.sta;
+
+        if (memcmp(ifsta->bssid, bssid, ETH_ALEN) != 0) {
+                memcpy(ifsta->bssid, bssid, ETH_ALEN);
+                res = ieee80211_if_config(dev);
+                if (res) {
+                        printk(KERN_DEBUG "%s: Failed to config new BSSID to "
+                               "the low-level driver\n", dev->name);
+                        return res;
+                }
+        }
+
+        if (!is_valid_ether_addr(bssid))
+                ifsta->bssid_set = 0;
+        else
+                ifsta->bssid_set = 1;
+        return 0;
+}
+
+
+static void ieee80211_send_nullfunc(struct ieee80211_local *local,
+                                    struct ieee80211_sub_if_data *sdata,
+                                    int powersave)
+{
+        struct sk_buff *skb;
+        struct ieee80211_hdr *nullfunc;
+        u16 fc;
+
+        skb = dev_alloc_skb(local->hw.extra_tx_headroom + 24);
+        if (!skb) {
+                printk(KERN_DEBUG "%s: failed to allocate buffer for nullfunc "
+                       "frame\n", sdata->dev->name);
+                return;
+        }
+        skb_reserve(skb, local->hw.extra_tx_headroom);
+
+        nullfunc = (struct ieee80211_hdr *) skb_put(skb, 24);
+        memset(nullfunc, 0, 24);
+        fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_NULLFUNC |
+             IEEE80211_FCTL_TODS;
+        if (powersave)
+                fc |= IEEE80211_FCTL_PM;
+        nullfunc->frame_control = cpu_to_le16(fc);
+        memcpy(nullfunc->addr1, sdata->u.sta.bssid, ETH_ALEN);
+        memcpy(nullfunc->addr2, sdata->dev->dev_addr, ETH_ALEN);
+        memcpy(nullfunc->addr3, sdata->u.sta.bssid, ETH_ALEN);
+
+        ieee80211_sta_tx(sdata->dev, skb, 0);
+}
+
+
+void ieee80211_scan_completed(struct ieee80211_hw *hw)
+{
+        struct ieee80211_local *local = hw_to_local(hw);
+        struct net_device *dev = local->scan_dev;
+        struct ieee80211_sub_if_data *sdata;
+        union iwreq_data wrqu;
+
+        local->last_scan_completed = jiffies;
+        wmb();
+        local->sta_scanning = 0;
+
+        if (ieee80211_hw_config(local))
+                printk(KERN_DEBUG "%s: failed to restore operational"
+                       "channel after scan\n", dev->name);
+
+        if (!(local->hw.flags & IEEE80211_HW_NO_PROBE_FILTERING) &&
+            ieee80211_if_config(dev))
+                printk(KERN_DEBUG "%s: failed to restore operational"
+                       "BSSID after scan\n", dev->name);
+
+        memset(&wrqu, 0, sizeof(wrqu));
+        wireless_send_event(dev, SIOCGIWSCAN, &wrqu, NULL);
+
+        read_lock(&local->sub_if_lock);
+        list_for_each_entry(sdata, &local->sub_if_list, list) {
+                if (sdata->type == IEEE80211_IF_TYPE_STA) {
+                        if (sdata->u.sta.associated)
+                                ieee80211_send_nullfunc(local, sdata, 0);
+                        ieee80211_sta_timer((unsigned long)sdata);
+                }
+                netif_wake_queue(sdata->dev);
+        }
+        read_unlock(&local->sub_if_lock);
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        if (sdata->type == IEEE80211_IF_TYPE_IBSS) {
+                struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+                if (!ifsta->bssid_set ||
+                    (!ifsta->state == IEEE80211_IBSS_JOINED &&
+                    !ieee80211_sta_active_ibss(dev)))
+                        ieee80211_sta_find_ibss(dev, ifsta);
+        }
+}
+EXPORT_SYMBOL(ieee80211_scan_completed);
+
+void ieee80211_sta_scan_work(struct work_struct *work)
+{
+        struct ieee80211_local *local =
+                container_of(work, struct ieee80211_local, scan_work.work);
+        struct net_device *dev = local->scan_dev;
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        struct ieee80211_hw_mode *mode;
+        struct ieee80211_channel *chan;
+        int skip;
+        unsigned long next_delay = 0;
+
+        if (!local->sta_scanning)
+                return;
+
+        switch (local->scan_state) {
+        case SCAN_SET_CHANNEL:
+                mode = local->scan_hw_mode;
+                if (local->scan_hw_mode->list.next == &local->modes_list &&
+                    local->scan_channel_idx >= mode->num_channels) {
+                        ieee80211_scan_completed(local_to_hw(local));
+                        return;
+                }
+                skip = !(local->enabled_modes & (1 << mode->mode));
+                chan = &mode->channels[local->scan_channel_idx];
+                if (!(chan->flag & IEEE80211_CHAN_W_SCAN) ||
+                    (sdata->type == IEEE80211_IF_TYPE_IBSS &&
+                     !(chan->flag & IEEE80211_CHAN_W_IBSS)) ||
+                    (local->hw_modes & local->enabled_modes &
+                     (1 << MODE_IEEE80211G) && mode->mode == MODE_IEEE80211B))
+                        skip = 1;
+
+                if (!skip) {
+#if 0
+                        printk(KERN_DEBUG "%s: scan channel %d (%d MHz)\n",
+                               dev->name, chan->chan, chan->freq);
+#endif
+
+                        local->scan_channel = chan;
+                        if (ieee80211_hw_config(local)) {
+                                printk(KERN_DEBUG "%s: failed to set channel "
+                                       "%d (%d MHz) for scan\n", dev->name,
+                                       chan->chan, chan->freq);
+                                skip = 1;
+                        }
+                }
+
+                local->scan_channel_idx++;
+                if (local->scan_channel_idx >= local->scan_hw_mode->num_channels) {
+                        if (local->scan_hw_mode->list.next != &local->modes_list) {
+                                local->scan_hw_mode = list_entry(local->scan_hw_mode->list.next,
+                                                                 struct ieee80211_hw_mode,
+                                                                 list);
+                                local->scan_channel_idx = 0;
+                        }
+                }
+
+                if (skip)
+                        break;
+
+                next_delay = IEEE80211_PROBE_DELAY +
+                             usecs_to_jiffies(local->hw.channel_change_time);
+                local->scan_state = SCAN_SEND_PROBE;
+                break;
+        case SCAN_SEND_PROBE:
+                if (local->scan_channel->flag & IEEE80211_CHAN_W_ACTIVE_SCAN) {
+                        ieee80211_send_probe_req(dev, NULL, local->scan_ssid,
+                                                 local->scan_ssid_len);
+                        next_delay = IEEE80211_CHANNEL_TIME;
+                } else
+                        next_delay = IEEE80211_PASSIVE_CHANNEL_TIME;
+                local->scan_state = SCAN_SET_CHANNEL;
+                break;
+        }
+
+        if (local->sta_scanning)
+                queue_delayed_work(local->hw.workqueue, &local->scan_work,
+                                   next_delay);
+}
+
+
+static int ieee80211_sta_start_scan(struct net_device *dev,
+                                    u8 *ssid, size_t ssid_len)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sub_if_data *sdata;
+
+        if (ssid_len > IEEE80211_MAX_SSID_LEN)
+                return -EINVAL;
+
+        /* MLME-SCAN.request (page 118)  page 144 (11.1.3.1)
+         * BSSType: INFRASTRUCTURE, INDEPENDENT, ANY_BSS
+         * BSSID: MACAddress
+         * SSID
+         * ScanType: ACTIVE, PASSIVE
+         * ProbeDelay: delay (in microseconds) to be used prior to transmitting
+         *    a Probe frame during active scanning
+         * ChannelList
+         * MinChannelTime (>= ProbeDelay), in TU
+         * MaxChannelTime: (>= MinChannelTime), in TU
+         */
+
+         /* MLME-SCAN.confirm
+          * BSSDescriptionSet
+          * ResultCode: SUCCESS, INVALID_PARAMETERS
+         */
+
+        if (local->sta_scanning) {
+                if (local->scan_dev == dev)
+                        return 0;
+                return -EBUSY;
+        }
+
+        if (local->ops->hw_scan) {
+                int rc = local->ops->hw_scan(local_to_hw(local),
+                                            ssid, ssid_len);
+                if (!rc) {
+                        local->sta_scanning = 1;
+                        local->scan_dev = dev;
+                }
+                return rc;
+        }
+
+        local->sta_scanning = 1;
+
+        read_lock(&local->sub_if_lock);
+        list_for_each_entry(sdata, &local->sub_if_list, list) {
+                netif_stop_queue(sdata->dev);
+                if (sdata->type == IEEE80211_IF_TYPE_STA &&
+                    sdata->u.sta.associated)
+                        ieee80211_send_nullfunc(local, sdata, 1);
+        }
+        read_unlock(&local->sub_if_lock);
+
+        if (ssid) {
+                local->scan_ssid_len = ssid_len;
+                memcpy(local->scan_ssid, ssid, ssid_len);
+        } else
+                local->scan_ssid_len = 0;
+        local->scan_state = SCAN_SET_CHANNEL;
+        local->scan_hw_mode = list_entry(local->modes_list.next,
+                                         struct ieee80211_hw_mode,
+                                         list);
+        local->scan_channel_idx = 0;
+        local->scan_dev = dev;
+
+        if (!(local->hw.flags & IEEE80211_HW_NO_PROBE_FILTERING) &&
+            ieee80211_if_config(dev))
+                printk(KERN_DEBUG "%s: failed to set BSSID for scan\n",
+                       dev->name);
+
+        /* TODO: start scan as soon as all nullfunc frames are ACKed */
+        queue_delayed_work(local->hw.workqueue, &local->scan_work,
+                           IEEE80211_CHANNEL_TIME);
+
+        return 0;
+}
+
+
+int ieee80211_sta_req_scan(struct net_device *dev, u8 *ssid, size_t ssid_len)
+{
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+
+        if (sdata->type != IEEE80211_IF_TYPE_STA)
+                return ieee80211_sta_start_scan(dev, ssid, ssid_len);
+
+        if (local->sta_scanning) {
+                if (local->scan_dev == dev)
+                        return 0;
+                return -EBUSY;
+        }
+
+        set_bit(IEEE80211_STA_REQ_SCAN, &ifsta->request);
+        queue_work(local->hw.workqueue, &ifsta->work);
+        return 0;
+}
+
+static char *
+ieee80211_sta_scan_result(struct net_device *dev,
+                          struct ieee80211_sta_bss *bss,
+                          char *current_ev, char *end_buf)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct iw_event iwe;
+
+        if (time_after(jiffies,
+                       bss->last_update + IEEE80211_SCAN_RESULT_EXPIRE))
+                return current_ev;
+
+        if (!(local->enabled_modes & (1 << bss->hw_mode)))
+                return current_ev;
+
+        if (local->scan_flags & IEEE80211_SCAN_WPA_ONLY &&
+            !bss->wpa_ie && !bss->rsn_ie)
+                return current_ev;
+
+        if (local->scan_flags & IEEE80211_SCAN_MATCH_SSID &&
+            (local->scan_ssid_len != bss->ssid_len ||
+             memcmp(local->scan_ssid, bss->ssid, bss->ssid_len) != 0))
+                return current_ev;
+
+        memset(&iwe, 0, sizeof(iwe));
+        iwe.cmd = SIOCGIWAP;
+        iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
+        memcpy(iwe.u.ap_addr.sa_data, bss->bssid, ETH_ALEN);
+        current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
+                                          IW_EV_ADDR_LEN);
+
+        memset(&iwe, 0, sizeof(iwe));
+        iwe.cmd = SIOCGIWESSID;
+        iwe.u.data.length = bss->ssid_len;
+        iwe.u.data.flags = 1;
+        current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
+                                          bss->ssid);
+
+        if (bss->capability & (WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_IBSS)) {
+                memset(&iwe, 0, sizeof(iwe));
+                iwe.cmd = SIOCGIWMODE;
+                if (bss->capability & WLAN_CAPABILITY_ESS)
+                        iwe.u.mode = IW_MODE_MASTER;
+                else
+                        iwe.u.mode = IW_MODE_ADHOC;
+                current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
+                                                  IW_EV_UINT_LEN);
+        }
+
+        memset(&iwe, 0, sizeof(iwe));
+        iwe.cmd = SIOCGIWFREQ;
+        iwe.u.freq.m = bss->channel;
+        iwe.u.freq.e = 0;
+        current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
+                                          IW_EV_FREQ_LEN);
+        iwe.u.freq.m = bss->freq * 100000;
+        iwe.u.freq.e = 1;
+        current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
+                                          IW_EV_FREQ_LEN);
+
+        memset(&iwe, 0, sizeof(iwe));
+        iwe.cmd = IWEVQUAL;
+        iwe.u.qual.qual = bss->signal;
+        iwe.u.qual.level = bss->rssi;
+        iwe.u.qual.noise = bss->noise;
+        iwe.u.qual.updated = local->wstats_flags;
+        current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
+                                          IW_EV_QUAL_LEN);
+
+        memset(&iwe, 0, sizeof(iwe));
+        iwe.cmd = SIOCGIWENCODE;
+        if (bss->capability & WLAN_CAPABILITY_PRIVACY)
+                iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
+        else
+                iwe.u.data.flags = IW_ENCODE_DISABLED;
+        iwe.u.data.length = 0;
+        current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, "");
+
+        if (bss && bss->wpa_ie) {
+                memset(&iwe, 0, sizeof(iwe));
+                iwe.cmd = IWEVGENIE;
+                iwe.u.data.length = bss->wpa_ie_len;
+                current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
+                                                  bss->wpa_ie);
+        }
+
+        if (bss && bss->rsn_ie) {
+                memset(&iwe, 0, sizeof(iwe));
+                iwe.cmd = IWEVGENIE;
+                iwe.u.data.length = bss->rsn_ie_len;
+                current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
+                                                  bss->rsn_ie);
+        }
+
+        if (bss && bss->supp_rates_len > 0) {
+                /* display all supported rates in readable format */
+                char *p = current_ev + IW_EV_LCP_LEN;
+                int i;
+
+                memset(&iwe, 0, sizeof(iwe));
+                iwe.cmd = SIOCGIWRATE;
+                /* Those two flags are ignored... */
+                iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0;
+
+                for (i = 0; i < bss->supp_rates_len; i++) {
+                        iwe.u.bitrate.value = ((bss->supp_rates[i] &
+                                                        0x7f) * 500000);
+                        p = iwe_stream_add_value(current_ev, p,
+                                        end_buf, &iwe, IW_EV_PARAM_LEN);
+                }
+                current_ev = p;
+        }
+
+        if (bss) {
+                char *buf;
+                buf = kmalloc(30, GFP_ATOMIC);
+                if (buf) {
+                        memset(&iwe, 0, sizeof(iwe));
+                        iwe.cmd = IWEVCUSTOM;
+                        sprintf(buf, "tsf=%016llx", (unsigned long long)(bss->timestamp));
+                        iwe.u.data.length = strlen(buf);
+                        current_ev = iwe_stream_add_point(current_ev, end_buf,
+                                                          &iwe, buf);
+                        kfree(buf);
+                }
+        }
+
+        do {
+                char *buf;
+
+                if (!(local->scan_flags & IEEE80211_SCAN_EXTRA_INFO))
+                        break;
+
+                buf = kmalloc(100, GFP_ATOMIC);
+                if (!buf)
+                        break;
+
+                memset(&iwe, 0, sizeof(iwe));
+                iwe.cmd = IWEVCUSTOM;
+                sprintf(buf, "bcn_int=%d", bss->beacon_int);
+                iwe.u.data.length = strlen(buf);
+                current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
+                                                  buf);
+
+                memset(&iwe, 0, sizeof(iwe));
+                iwe.cmd = IWEVCUSTOM;
+                sprintf(buf, "capab=0x%04x", bss->capability);
+                iwe.u.data.length = strlen(buf);
+                current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
+                                                  buf);
+
+                kfree(buf);
+                break;
+        } while (0);
+
+        return current_ev;
+}
+
+
+int ieee80211_sta_scan_results(struct net_device *dev, char *buf, size_t len)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        char *current_ev = buf;
+        char *end_buf = buf + len;
+        struct ieee80211_sta_bss *bss;
+
+        spin_lock_bh(&local->sta_bss_lock);
+        list_for_each_entry(bss, &local->sta_bss_list, list) {
+                if (buf + len - current_ev <= IW_EV_ADDR_LEN) {
+                        spin_unlock_bh(&local->sta_bss_lock);
+                        return -E2BIG;
+                }
+                current_ev = ieee80211_sta_scan_result(dev, bss, current_ev,
+                                                       end_buf);
+        }
+        spin_unlock_bh(&local->sta_bss_lock);
+        return current_ev - buf;
+}
+
+
+int ieee80211_sta_set_extra_ie(struct net_device *dev, char *ie, size_t len)
+{
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+        kfree(ifsta->extra_ie);
+        if (len == 0) {
+                ifsta->extra_ie = NULL;
+                ifsta->extra_ie_len = 0;
+                return 0;
+        }
+        ifsta->extra_ie = kmalloc(len, GFP_KERNEL);
+        if (!ifsta->extra_ie) {
+                ifsta->extra_ie_len = 0;
+                return -ENOMEM;
+        }
+        memcpy(ifsta->extra_ie, ie, len);
+        ifsta->extra_ie_len = len;
+        return 0;
+}
+
+
+struct sta_info * ieee80211_ibss_add_sta(struct net_device *dev,
+                                         struct sk_buff *skb, u8 *bssid,
+                                         u8 *addr)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct sta_info *sta;
+        struct ieee80211_sub_if_data *sdata = NULL;
+
+        /* TODO: Could consider removing the least recently used entry and
+         * allow new one to be added. */
+        if (local->num_sta >= IEEE80211_IBSS_MAX_STA_ENTRIES) {
+                if (net_ratelimit()) {
+                        printk(KERN_DEBUG "%s: No room for a new IBSS STA "
+                               "entry " MAC_FMT "\n", dev->name, MAC_ARG(addr));
+                }
+                return NULL;
+        }
+
+        printk(KERN_DEBUG "%s: Adding new IBSS station " MAC_FMT " (dev=%s)\n",
+               local->mdev->name, MAC_ARG(addr), dev->name);
+
+        sta = sta_info_add(local, dev, addr, GFP_ATOMIC);
+        if (!sta)
+                return NULL;
+
+        sta->supp_rates = sdata->u.sta.supp_rates_bits;
+
+        rate_control_rate_init(sta, local);
+
+        return sta; /* caller will call sta_info_put() */
+}
+
+
+int ieee80211_sta_deauthenticate(struct net_device *dev, u16 reason)
+{
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+
+        printk(KERN_DEBUG "%s: deauthenticate(reason=%d)\n",
+               dev->name, reason);
+
+        if (sdata->type != IEEE80211_IF_TYPE_STA &&
+            sdata->type != IEEE80211_IF_TYPE_IBSS)
+                return -EINVAL;
+
+        ieee80211_send_deauth(dev, ifsta, reason);
+        ieee80211_set_disassoc(dev, ifsta, 1);
+        return 0;
+}
+
+
+int ieee80211_sta_disassociate(struct net_device *dev, u16 reason)
+{
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+
+        printk(KERN_DEBUG "%s: disassociate(reason=%d)\n",
+               dev->name, reason);
+
+        if (sdata->type != IEEE80211_IF_TYPE_STA)
+                return -EINVAL;
+
+        if (!ifsta->associated)
+                return -1;
+
+        ieee80211_send_disassoc(dev, ifsta, reason);
+        ieee80211_set_disassoc(dev, ifsta, 0);
+        return 0;
+}
diff --git a/net/mac80211/michael.c b/net/mac80211/michael.c
new file mode 100644
index 000000000000..0f844f7895f1
--- /dev/null
+++ b/net/mac80211/michael.c
@@ -0,0 +1,104 @@
+/*
+ * Michael MIC implementation - optimized for TKIP MIC operations
+ * Copyright 2002-2003, Instant802 Networks, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/types.h>
+
+#include "michael.h"
+
+static inline u32 rotr(u32 val, int bits)
+{
+        return (val >> bits) | (val << (32 - bits));
+}
+
+
+static inline u32 rotl(u32 val, int bits)
+{
+        return (val << bits) | (val >> (32 - bits));
+}
+
+
+static inline u32 xswap(u32 val)
+{
+        return ((val & 0xff00ff00) >> 8) | ((val & 0x00ff00ff) << 8);
+}
+
+
+#define michael_block(l, r) \
+do { \
+        r ^= rotl(l, 17); \
+        l += r; \
+        r ^= xswap(l); \
+        l += r; \
+        r ^= rotl(l, 3); \
+        l += r; \
+        r ^= rotr(l, 2); \
+        l += r; \
+} while (0)
+
+
+static inline u32 michael_get32(u8 *data)
+{
+        return data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24);
+}
+
+
+static inline void michael_put32(u32 val, u8 *data)
+{
+        data[0] = val & 0xff;
+        data[1] = (val >> 8) & 0xff;
+        data[2] = (val >> 16) & 0xff;
+        data[3] = (val >> 24) & 0xff;
+}
+
+
+void michael_mic(u8 *key, u8 *da, u8 *sa, u8 priority,
+                 u8 *data, size_t data_len, u8 *mic)
+{
+        u32 l, r, val;
+        size_t block, blocks, left;
+
+        l = michael_get32(key);
+        r = michael_get32(key + 4);
+
+        /* A pseudo header (DA, SA, Priority, 0, 0, 0) is used in Michael MIC
+         * calculation, but it is _not_ transmitted */
+        l ^= michael_get32(da);
+        michael_block(l, r);
+        l ^= da[4] | (da[5] << 8) | (sa[0] << 16) | (sa[1] << 24);
+        michael_block(l, r);
+        l ^= michael_get32(&sa[2]);
+        michael_block(l, r);
+        l ^= priority;
+        michael_block(l, r);
+
+        /* Real data */
+        blocks = data_len / 4;
+        left = data_len % 4;
+
+        for (block = 0; block < blocks; block++) {
+                l ^= michael_get32(&data[block * 4]);
+                michael_block(l, r);
+        }
+
+        /* Partial block of 0..3 bytes and padding: 0x5a + 4..7 zeros to make
+         * total length a multiple of 4. */
+        val = 0x5a;
+        while (left > 0) {
+                val <<= 8;
+                left--;
+                val |= data[blocks * 4 + left];
+        }
+        l ^= val;
+        michael_block(l, r);
+        /* last block is zero, so l ^ 0 = l */
+        michael_block(l, r);
+
+        michael_put32(l, mic);
+        michael_put32(r, mic + 4);
+}
diff --git a/net/mac80211/michael.h b/net/mac80211/michael.h
new file mode 100644
index 000000000000..2e6aebabeea1
--- /dev/null
+++ b/net/mac80211/michael.h
@@ -0,0 +1,20 @@
+/*
+ * Michael MIC implementation - optimized for TKIP MIC operations
+ * Copyright 2002-2003, Instant802 Networks, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef MICHAEL_H
+#define MICHAEL_H
+
+#include <linux/types.h>
+
+#define MICHAEL_MIC_LEN 8
+
+void michael_mic(u8 *key, u8 *da, u8 *sa, u8 priority,
+                 u8 *data, size_t data_len, u8 *mic);
+
+#endif /* MICHAEL_H */
diff --git a/net/mac80211/rc80211_simple.c b/net/mac80211/rc80211_simple.c
new file mode 100644
index 000000000000..2048cfd1ca70
--- /dev/null
+++ b/net/mac80211/rc80211_simple.c
@@ -0,0 +1,432 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
+ * Copyright 2005, Devicescape Software, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/netdevice.h>
+#include <linux/types.h>
+#include <linux/slab.h>
+#include <linux/skbuff.h>
+#include <linux/compiler.h>
+
+#include <net/mac80211.h>
+#include "ieee80211_i.h"
+#include "ieee80211_rate.h"
+#include "debugfs.h"
+
+
+/* This is a minimal implementation of TX rate controlling that can be used
+ * as the default when no improved mechanisms are available. */
+
+
+#define RATE_CONTROL_EMERG_DEC 2
+#define RATE_CONTROL_INTERVAL (HZ / 20)
+#define RATE_CONTROL_MIN_TX 10
+
+MODULE_ALIAS("rc80211_default");
+
+static void rate_control_rate_inc(struct ieee80211_local *local,
+                                  struct sta_info *sta)
+{
+        struct ieee80211_sub_if_data *sdata;
+        struct ieee80211_hw_mode *mode;
+        int i = sta->txrate;
+        int maxrate;
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev);
+        if (sdata->bss && sdata->bss->force_unicast_rateidx > -1) {
+                /* forced unicast rate - do not change STA rate */
+                return;
+        }
+
+        mode = local->oper_hw_mode;
+        maxrate = sdata->bss ? sdata->bss->max_ratectrl_rateidx : -1;
+
+        if (i > mode->num_rates)
+                i = mode->num_rates - 2;
+
+        while (i + 1 < mode->num_rates) {
+                i++;
+                if (sta->supp_rates & BIT(i) &&
+                    mode->rates[i].flags & IEEE80211_RATE_SUPPORTED &&
+                    (maxrate < 0 || i <= maxrate)) {
+                        sta->txrate = i;
+                        break;
+                }
+        }
+}
+
+
+static void rate_control_rate_dec(struct ieee80211_local *local,
+                                  struct sta_info *sta)
+{
+        struct ieee80211_sub_if_data *sdata;
+        struct ieee80211_hw_mode *mode;
+        int i = sta->txrate;
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev);
+        if (sdata->bss && sdata->bss->force_unicast_rateidx > -1) {
+                /* forced unicast rate - do not change STA rate */
+                return;
+        }
+
+        mode = local->oper_hw_mode;
+        if (i > mode->num_rates)
+                i = mode->num_rates;
+
+        while (i > 0) {
+                i--;
+                if (sta->supp_rates & BIT(i) &&
+                    mode->rates[i].flags & IEEE80211_RATE_SUPPORTED) {
+                        sta->txrate = i;
+                        break;
+                }
+        }
+}
+
+
+static struct ieee80211_rate *
+rate_control_lowest_rate(struct ieee80211_local *local,
+                         struct ieee80211_hw_mode *mode)
+{
+        int i;
+
+        for (i = 0; i < mode->num_rates; i++) {
+                struct ieee80211_rate *rate = &mode->rates[i];
+
+                if (rate->flags & IEEE80211_RATE_SUPPORTED)
+                        return rate;
+        }
+
+        printk(KERN_DEBUG "rate_control_lowest_rate - no supported rates "
+               "found\n");
+        return &mode->rates[0];
+}
+
+
+struct global_rate_control {
+        int dummy;
+};
+
+struct sta_rate_control {
+        unsigned long last_rate_change;
+        u32 tx_num_failures;
+        u32 tx_num_xmit;
+
+        unsigned long avg_rate_update;
+        u32 tx_avg_rate_sum;
+        u32 tx_avg_rate_num;
+
+#ifdef CONFIG_MAC80211_DEBUGFS
+        struct dentry *tx_avg_rate_sum_dentry;
+        struct dentry *tx_avg_rate_num_dentry;
+#endif
+};
+
+
+static void rate_control_simple_tx_status(void *priv, struct net_device *dev,
+                                          struct sk_buff *skb,
+                                          struct ieee80211_tx_status *status)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+        struct sta_info *sta;
+        struct sta_rate_control *srctrl;
+
+        sta = sta_info_get(local, hdr->addr1);
+
+        if (!sta)
+            return;
+
+        srctrl = sta->rate_ctrl_priv;
+        srctrl->tx_num_xmit++;
+        if (status->excessive_retries) {
+                sta->antenna_sel_tx = sta->antenna_sel_tx == 1 ? 2 : 1;
+                sta->antenna_sel_rx = sta->antenna_sel_rx == 1 ? 2 : 1;
+                if (local->sta_antenna_sel == STA_ANTENNA_SEL_SW_CTRL_DEBUG) {
+                        printk(KERN_DEBUG "%s: " MAC_FMT " TX antenna --> %d "
+                               "RX antenna --> %d (@%lu)\n",
+                               dev->name, MAC_ARG(hdr->addr1),
+                               sta->antenna_sel_tx, sta->antenna_sel_rx, jiffies);
+                }
+                srctrl->tx_num_failures++;
+                sta->tx_retry_failed++;
+                sta->tx_num_consecutive_failures++;
+                sta->tx_num_mpdu_fail++;
+        } else {
+                sta->last_ack_rssi[0] = sta->last_ack_rssi[1];
+                sta->last_ack_rssi[1] = sta->last_ack_rssi[2];
+                sta->last_ack_rssi[2] = status->ack_signal;
+                sta->tx_num_consecutive_failures = 0;
+                sta->tx_num_mpdu_ok++;
+        }
+        sta->tx_retry_count += status->retry_count;
+        sta->tx_num_mpdu_fail += status->retry_count;
+
+        if (time_after(jiffies,
+                       srctrl->last_rate_change + RATE_CONTROL_INTERVAL) &&
+                srctrl->tx_num_xmit > RATE_CONTROL_MIN_TX) {
+                u32 per_failed;
+                srctrl->last_rate_change = jiffies;
+
+                per_failed = (100 * sta->tx_num_mpdu_fail) /
+                        (sta->tx_num_mpdu_fail + sta->tx_num_mpdu_ok);
+                /* TODO: calculate average per_failed to make adjusting
+                 * parameters easier */
+#if 0
+                if (net_ratelimit()) {
+                        printk(KERN_DEBUG "MPDU fail=%d ok=%d per_failed=%d\n",
+                               sta->tx_num_mpdu_fail, sta->tx_num_mpdu_ok,
+                               per_failed);
+                }
+#endif
+
+                if (per_failed > local->rate_ctrl_num_down) {
+                        rate_control_rate_dec(local, sta);
+                } else if (per_failed < local->rate_ctrl_num_up) {
+                        rate_control_rate_inc(local, sta);
+                }
+                srctrl->tx_avg_rate_sum += status->control.rate->rate;
+                srctrl->tx_avg_rate_num++;
+                srctrl->tx_num_failures = 0;
+                srctrl->tx_num_xmit = 0;
+        } else if (sta->tx_num_consecutive_failures >=
+                   RATE_CONTROL_EMERG_DEC) {
+                rate_control_rate_dec(local, sta);
+        }
+
+        if (srctrl->avg_rate_update + 60 * HZ < jiffies) {
+                srctrl->avg_rate_update = jiffies;
+                if (srctrl->tx_avg_rate_num > 0) {
+#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
+                        printk(KERN_DEBUG "%s: STA " MAC_FMT " Average rate: "
+                               "%d (%d/%d)\n",
+                               dev->name, MAC_ARG(sta->addr),
+                               srctrl->tx_avg_rate_sum /
+                               srctrl->tx_avg_rate_num,
+                               srctrl->tx_avg_rate_sum,
+                               srctrl->tx_avg_rate_num);
+#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
+                        srctrl->tx_avg_rate_sum = 0;
+                        srctrl->tx_avg_rate_num = 0;
+                }
+        }
+
+        sta_info_put(sta);
+}
+
+
+static struct ieee80211_rate *
+rate_control_simple_get_rate(void *priv, struct net_device *dev,
+                             struct sk_buff *skb,
+                             struct rate_control_extra *extra)
+{
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_sub_if_data *sdata;
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+        struct ieee80211_hw_mode *mode = extra->mode;
+        struct sta_info *sta;
+        int rateidx, nonerp_idx;
+        u16 fc;
+
+        memset(extra, 0, sizeof(*extra));
+
+        fc = le16_to_cpu(hdr->frame_control);
+        if ((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA ||
+            (hdr->addr1[0] & 0x01)) {
+                /* Send management frames and broadcast/multicast data using
+                 * lowest rate. */
+                /* TODO: this could probably be improved.. */
+                return rate_control_lowest_rate(local, mode);
+        }
+
+        sta = sta_info_get(local, hdr->addr1);
+
+        if (!sta)
+                return rate_control_lowest_rate(local, mode);
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        if (sdata->bss && sdata->bss->force_unicast_rateidx > -1)
+                sta->txrate = sdata->bss->force_unicast_rateidx;
+
+        rateidx = sta->txrate;
+
+        if (rateidx >= mode->num_rates)
+                rateidx = mode->num_rates - 1;
+
+        sta->last_txrate = rateidx;
+        nonerp_idx = rateidx;
+        while (nonerp_idx > 0 &&
+               ((mode->rates[nonerp_idx].flags & IEEE80211_RATE_ERP) ||
+                !(mode->rates[nonerp_idx].flags & IEEE80211_RATE_SUPPORTED) ||
+                !(sta->supp_rates & BIT(nonerp_idx))))
+                nonerp_idx--;
+        extra->nonerp = &mode->rates[nonerp_idx];
+
+        sta_info_put(sta);
+
+        return &mode->rates[rateidx];
+}
+
+
+static void rate_control_simple_rate_init(void *priv, void *priv_sta,
+                                          struct ieee80211_local *local,
+                                          struct sta_info *sta)
+{
+        struct ieee80211_hw_mode *mode;
+        int i;
+        sta->txrate = 0;
+        mode = local->oper_hw_mode;
+        /* TODO: what is a good starting rate for STA? About middle? Maybe not
+         * the lowest or the highest rate.. Could consider using RSSI from
+         * previous packets? Need to have IEEE 802.1X auth succeed immediately
+         * after assoc.. */
+        for (i = 0; i < mode->num_rates; i++) {
+                if ((sta->supp_rates & BIT(i)) &&
+                    (mode->rates[i].flags & IEEE80211_RATE_SUPPORTED))
+                        sta->txrate = i;
+        }
+}
+
+
+static void * rate_control_simple_alloc(struct ieee80211_local *local)
+{
+        struct global_rate_control *rctrl;
+
+        rctrl = kzalloc(sizeof(*rctrl), GFP_ATOMIC);
+
+        return rctrl;
+}
+
+
+static void rate_control_simple_free(void *priv)
+{
+        struct global_rate_control *rctrl = priv;
+        kfree(rctrl);
+}
+
+
+static void rate_control_simple_clear(void *priv)
+{
+}
+
+
+static void * rate_control_simple_alloc_sta(void *priv, gfp_t gfp)
+{
+        struct sta_rate_control *rctrl;
+
+        rctrl = kzalloc(sizeof(*rctrl), gfp);
+
+        return rctrl;
+}
+
+
+static void rate_control_simple_free_sta(void *priv, void *priv_sta)
+{
+        struct sta_rate_control *rctrl = priv_sta;
+        kfree(rctrl);
+}
+
+#ifdef CONFIG_MAC80211_DEBUGFS
+
+static int open_file_generic(struct inode *inode, struct file *file)
+{
+        file->private_data = inode->i_private;
+        return 0;
+}
+
+static ssize_t sta_tx_avg_rate_sum_read(struct file *file,
+                                        char __user *userbuf,
+                                        size_t count, loff_t *ppos)
+{
+        struct sta_rate_control *srctrl = file->private_data;
+        char buf[20];
+
+        sprintf(buf, "%d\n", srctrl->tx_avg_rate_sum);
+        return simple_read_from_buffer(userbuf, count, ppos, buf, strlen(buf));
+}
+
+static const struct file_operations sta_tx_avg_rate_sum_ops = {
+        .read = sta_tx_avg_rate_sum_read,
+        .open = open_file_generic,
+};
+
+static ssize_t sta_tx_avg_rate_num_read(struct file *file,
+                                        char __user *userbuf,
+                                        size_t count, loff_t *ppos)
+{
+        struct sta_rate_control *srctrl = file->private_data;
+        char buf[20];
+
+        sprintf(buf, "%d\n", srctrl->tx_avg_rate_num);
+        return simple_read_from_buffer(userbuf, count, ppos, buf, strlen(buf));
+}
+
+static const struct file_operations sta_tx_avg_rate_num_ops = {
+        .read = sta_tx_avg_rate_num_read,
+        .open = open_file_generic,
+};
+
+static void rate_control_simple_add_sta_debugfs(void *priv, void *priv_sta,
+                                                struct dentry *dir)
+{
+        struct sta_rate_control *srctrl = priv_sta;
+
+        srctrl->tx_avg_rate_num_dentry =
+                debugfs_create_file("rc_simple_sta_tx_avg_rate_num", 0400,
+                                    dir, srctrl, &sta_tx_avg_rate_num_ops);
+        srctrl->tx_avg_rate_sum_dentry =
+                debugfs_create_file("rc_simple_sta_tx_avg_rate_sum", 0400,
+                                    dir, srctrl, &sta_tx_avg_rate_sum_ops);
+}
+
+static void rate_control_simple_remove_sta_debugfs(void *priv, void *priv_sta)
+{
+        struct sta_rate_control *srctrl = priv_sta;
+
+        debugfs_remove(srctrl->tx_avg_rate_sum_dentry);
+        debugfs_remove(srctrl->tx_avg_rate_num_dentry);
+}
+#endif
+
+static struct rate_control_ops rate_control_simple = {
+        .module = THIS_MODULE,
+        .name = "simple",
+        .tx_status = rate_control_simple_tx_status,
+        .get_rate = rate_control_simple_get_rate,
+        .rate_init = rate_control_simple_rate_init,
+        .clear = rate_control_simple_clear,
+        .alloc = rate_control_simple_alloc,
+        .free = rate_control_simple_free,
+        .alloc_sta = rate_control_simple_alloc_sta,
+        .free_sta = rate_control_simple_free_sta,
+#ifdef CONFIG_MAC80211_DEBUGFS
+        .add_sta_debugfs = rate_control_simple_add_sta_debugfs,
+        .remove_sta_debugfs = rate_control_simple_remove_sta_debugfs,
+#endif
+};
+
+
+static int __init rate_control_simple_init(void)
+{
+        return ieee80211_rate_control_register(&rate_control_simple);
+}
+
+
+static void __exit rate_control_simple_exit(void)
+{
+        ieee80211_rate_control_unregister(&rate_control_simple);
+}
+
+
+module_init(rate_control_simple_init);
+module_exit(rate_control_simple_exit);
+
+MODULE_DESCRIPTION("Simple rate control algorithm for ieee80211");
+MODULE_LICENSE("GPL");
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
new file mode 100644
index 000000000000..ab7b1f067c6e
--- /dev/null
+++ b/net/mac80211/sta_info.c
@@ -0,0 +1,470 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
+ * Copyright 2006-2007  Jiri Benc <jbenc@suse.cz>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/netdevice.h>
+#include <linux/types.h>
+#include <linux/slab.h>
+#include <linux/skbuff.h>
+#include <linux/if_arp.h>
+
+#include <net/mac80211.h>
+#include "ieee80211_i.h"
+#include "ieee80211_rate.h"
+#include "sta_info.h"
+#include "debugfs_key.h"
+#include "debugfs_sta.h"
+
+/* Caller must hold local->sta_lock */
+static void sta_info_hash_add(struct ieee80211_local *local,
+                              struct sta_info *sta)
+{
+        sta->hnext = local->sta_hash[STA_HASH(sta->addr)];
+        local->sta_hash[STA_HASH(sta->addr)] = sta;
+}
+
+
+/* Caller must hold local->sta_lock */
+static void sta_info_hash_del(struct ieee80211_local *local,
+                              struct sta_info *sta)
+{
+        struct sta_info *s;
+
+        s = local->sta_hash[STA_HASH(sta->addr)];
+        if (!s)
+                return;
+        if (memcmp(s->addr, sta->addr, ETH_ALEN) == 0) {
+                local->sta_hash[STA_HASH(sta->addr)] = s->hnext;
+                return;
+        }
+
+        while (s->hnext && memcmp(s->hnext->addr, sta->addr, ETH_ALEN) != 0)
+                s = s->hnext;
+        if (s->hnext)
+                s->hnext = s->hnext->hnext;
+        else
+                printk(KERN_ERR "%s: could not remove STA " MAC_FMT " from "
+                       "hash table\n", local->mdev->name, MAC_ARG(sta->addr));
+}
+
+static inline void __sta_info_get(struct sta_info *sta)
+{
+        kref_get(&sta->kref);
+}
+
+struct sta_info *sta_info_get(struct ieee80211_local *local, u8 *addr)
+{
+        struct sta_info *sta;
+
+        spin_lock_bh(&local->sta_lock);
+        sta = local->sta_hash[STA_HASH(addr)];
+        while (sta) {
+                if (memcmp(sta->addr, addr, ETH_ALEN) == 0) {
+                        __sta_info_get(sta);
+                        break;
+                }
+                sta = sta->hnext;
+        }
+        spin_unlock_bh(&local->sta_lock);
+
+        return sta;
+}
+EXPORT_SYMBOL(sta_info_get);
+
+int sta_info_min_txrate_get(struct ieee80211_local *local)
+{
+        struct sta_info *sta;
+        struct ieee80211_hw_mode *mode;
+        int min_txrate = 9999999;
+        int i;
+
+        spin_lock_bh(&local->sta_lock);
+        mode = local->oper_hw_mode;
+        for (i = 0; i < STA_HASH_SIZE; i++) {
+                sta = local->sta_hash[i];
+                while (sta) {
+                        if (sta->txrate < min_txrate)
+                                min_txrate = sta->txrate;
+                        sta = sta->hnext;
+                }
+        }
+        spin_unlock_bh(&local->sta_lock);
+        if (min_txrate == 9999999)
+                min_txrate = 0;
+
+        return mode->rates[min_txrate].rate;
+}
+
+
+static void sta_info_release(struct kref *kref)
+{
+        struct sta_info *sta = container_of(kref, struct sta_info, kref);
+        struct ieee80211_local *local = sta->local;
+        struct sk_buff *skb;
+
+        /* free sta structure; it has already been removed from
+         * hash table etc. external structures. Make sure that all
+         * buffered frames are release (one might have been added
+         * after sta_info_free() was called). */
+        while ((skb = skb_dequeue(&sta->ps_tx_buf)) != NULL) {
+                local->total_ps_buffered--;
+                dev_kfree_skb_any(skb);
+        }
+        while ((skb = skb_dequeue(&sta->tx_filtered)) != NULL) {
+                dev_kfree_skb_any(skb);
+        }
+        rate_control_free_sta(sta->rate_ctrl, sta->rate_ctrl_priv);
+        rate_control_put(sta->rate_ctrl);
+        if (sta->key)
+                ieee80211_debugfs_key_sta_del(sta->key, sta);
+        kfree(sta);
+}
+
+
+void sta_info_put(struct sta_info *sta)
+{
+        kref_put(&sta->kref, sta_info_release);
+}
+EXPORT_SYMBOL(sta_info_put);
+
+
+struct sta_info * sta_info_add(struct ieee80211_local *local,
+                               struct net_device *dev, u8 *addr, gfp_t gfp)
+{
+        struct sta_info *sta;
+
+        sta = kzalloc(sizeof(*sta), gfp);
+        if (!sta)
+                return NULL;
+
+        kref_init(&sta->kref);
+
+        sta->rate_ctrl = rate_control_get(local->rate_ctrl);
+        sta->rate_ctrl_priv = rate_control_alloc_sta(sta->rate_ctrl, gfp);
+        if (!sta->rate_ctrl_priv) {
+                rate_control_put(sta->rate_ctrl);
+                kref_put(&sta->kref, sta_info_release);
+                kfree(sta);
+                return NULL;
+        }
+
+        memcpy(sta->addr, addr, ETH_ALEN);
+        sta->local = local;
+        sta->dev = dev;
+        skb_queue_head_init(&sta->ps_tx_buf);
+        skb_queue_head_init(&sta->tx_filtered);
+        __sta_info_get(sta);    /* sta used by caller, decremented by
+                                 * sta_info_put() */
+        spin_lock_bh(&local->sta_lock);
+        list_add(&sta->list, &local->sta_list);
+        local->num_sta++;
+        sta_info_hash_add(local, sta);
+        spin_unlock_bh(&local->sta_lock);
+        if (local->ops->sta_table_notification)
+                local->ops->sta_table_notification(local_to_hw(local),
+                                                  local->num_sta);
+        sta->key_idx_compression = HW_KEY_IDX_INVALID;
+
+#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
+        printk(KERN_DEBUG "%s: Added STA " MAC_FMT "\n",
+               local->mdev->name, MAC_ARG(addr));
+#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
+
+#ifdef CONFIG_MAC80211_DEBUGFS
+        if (!in_interrupt()) {
+                sta->debugfs_registered = 1;
+                ieee80211_sta_debugfs_add(sta);
+                rate_control_add_sta_debugfs(sta);
+        } else {
+                /* debugfs entry adding might sleep, so schedule process
+                 * context task for adding entry for STAs that do not yet
+                 * have one. */
+                queue_work(local->hw.workqueue, &local->sta_debugfs_add);
+        }
+#endif
+
+        return sta;
+}
+
+static void finish_sta_info_free(struct ieee80211_local *local,
+                                 struct sta_info *sta)
+{
+#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
+        printk(KERN_DEBUG "%s: Removed STA " MAC_FMT "\n",
+               local->mdev->name, MAC_ARG(sta->addr));
+#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
+
+        if (sta->key) {
+                ieee80211_debugfs_key_remove(sta->key);
+                ieee80211_key_free(sta->key);
+                sta->key = NULL;
+        }
+
+        rate_control_remove_sta_debugfs(sta);
+        ieee80211_sta_debugfs_remove(sta);
+
+        sta_info_put(sta);
+}
+
+static void sta_info_remove(struct sta_info *sta)
+{
+        struct ieee80211_local *local = sta->local;
+        struct ieee80211_sub_if_data *sdata;
+
+        sta_info_hash_del(local, sta);
+        list_del(&sta->list);
+        sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev);
+        if (sta->flags & WLAN_STA_PS) {
+                sta->flags &= ~WLAN_STA_PS;
+                if (sdata->bss)
+                        atomic_dec(&sdata->bss->num_sta_ps);
+        }
+        local->num_sta--;
+        sta_info_remove_aid_ptr(sta);
+}
+
+void sta_info_free(struct sta_info *sta, int locked)
+{
+        struct sk_buff *skb;
+        struct ieee80211_local *local = sta->local;
+
+        if (!locked) {
+                spin_lock_bh(&local->sta_lock);
+                sta_info_remove(sta);
+                spin_unlock_bh(&local->sta_lock);
+        } else {
+                sta_info_remove(sta);
+        }
+        if (local->ops->sta_table_notification)
+                local->ops->sta_table_notification(local_to_hw(local),
+                                                  local->num_sta);
+
+        while ((skb = skb_dequeue(&sta->ps_tx_buf)) != NULL) {
+                local->total_ps_buffered--;
+                dev_kfree_skb_any(skb);
+        }
+        while ((skb = skb_dequeue(&sta->tx_filtered)) != NULL) {
+                dev_kfree_skb_any(skb);
+        }
+
+        if (sta->key) {
+                if (local->ops->set_key) {
+                        struct ieee80211_key_conf *key;
+                        key = ieee80211_key_data2conf(local, sta->key);
+                        if (key) {
+                                local->ops->set_key(local_to_hw(local),
+                                                   DISABLE_KEY,
+                                                   sta->addr, key, sta->aid);
+                                kfree(key);
+                        }
+                }
+        } else if (sta->key_idx_compression != HW_KEY_IDX_INVALID) {
+                struct ieee80211_key_conf conf;
+                memset(&conf, 0, sizeof(conf));
+                conf.hw_key_idx = sta->key_idx_compression;
+                conf.alg = ALG_NULL;
+                conf.flags |= IEEE80211_KEY_FORCE_SW_ENCRYPT;
+                local->ops->set_key(local_to_hw(local), DISABLE_KEY,
+                                   sta->addr, &conf, sta->aid);
+                sta->key_idx_compression = HW_KEY_IDX_INVALID;
+        }
+
+#ifdef CONFIG_MAC80211_DEBUGFS
+        if (in_atomic()) {
+                list_add(&sta->list, &local->deleted_sta_list);
+                queue_work(local->hw.workqueue, &local->sta_debugfs_add);
+        } else
+#endif
+                finish_sta_info_free(local, sta);
+}
+
+
+static inline int sta_info_buffer_expired(struct ieee80211_local *local,
+                                          struct sta_info *sta,
+                                          struct sk_buff *skb)
+{
+        struct ieee80211_tx_packet_data *pkt_data;
+        int timeout;
+
+        if (!skb)
+                return 0;
+
+        pkt_data = (struct ieee80211_tx_packet_data *) skb->cb;
+
+        /* Timeout: (2 * listen_interval * beacon_int * 1024 / 1000000) sec */
+        timeout = (sta->listen_interval * local->hw.conf.beacon_int * 32 /
+                   15625) * HZ;
+        if (timeout < STA_TX_BUFFER_EXPIRE)
+                timeout = STA_TX_BUFFER_EXPIRE;
+        return time_after(jiffies, pkt_data->jiffies + timeout);
+}
+
+
+static void sta_info_cleanup_expire_buffered(struct ieee80211_local *local,
+                                             struct sta_info *sta)
+{
+        unsigned long flags;
+        struct sk_buff *skb;
+
+        if (skb_queue_empty(&sta->ps_tx_buf))
+                return;
+
+        for (;;) {
+                spin_lock_irqsave(&sta->ps_tx_buf.lock, flags);
+                skb = skb_peek(&sta->ps_tx_buf);
+                if (sta_info_buffer_expired(local, sta, skb)) {
+                        skb = __skb_dequeue(&sta->ps_tx_buf);
+                        if (skb_queue_empty(&sta->ps_tx_buf))
+                                sta->flags &= ~WLAN_STA_TIM;
+                } else
+                        skb = NULL;
+                spin_unlock_irqrestore(&sta->ps_tx_buf.lock, flags);
+
+                if (skb) {
+                        local->total_ps_buffered--;
+                        printk(KERN_DEBUG "Buffered frame expired (STA "
+                               MAC_FMT ")\n", MAC_ARG(sta->addr));
+                        dev_kfree_skb(skb);
+                } else
+                        break;
+        }
+}
+
+
+static void sta_info_cleanup(unsigned long data)
+{
+        struct ieee80211_local *local = (struct ieee80211_local *) data;
+        struct sta_info *sta;
+
+        spin_lock_bh(&local->sta_lock);
+        list_for_each_entry(sta, &local->sta_list, list) {
+                __sta_info_get(sta);
+                sta_info_cleanup_expire_buffered(local, sta);
+                sta_info_put(sta);
+        }
+        spin_unlock_bh(&local->sta_lock);
+
+        local->sta_cleanup.expires = jiffies + STA_INFO_CLEANUP_INTERVAL;
+        add_timer(&local->sta_cleanup);
+}
+
+#ifdef CONFIG_MAC80211_DEBUGFS
+static void sta_info_debugfs_add_task(struct work_struct *work)
+{
+        struct ieee80211_local *local =
+                container_of(work, struct ieee80211_local, sta_debugfs_add);
+        struct sta_info *sta, *tmp;
+
+        while (1) {
+                spin_lock_bh(&local->sta_lock);
+                if (!list_empty(&local->deleted_sta_list)) {
+                        sta = list_entry(local->deleted_sta_list.next,
+                                         struct sta_info, list);
+                        list_del(local->deleted_sta_list.next);
+                } else
+                        sta = NULL;
+                spin_unlock_bh(&local->sta_lock);
+                if (!sta)
+                        break;
+                finish_sta_info_free(local, sta);
+        }
+
+        while (1) {
+                sta = NULL;
+                spin_lock_bh(&local->sta_lock);
+                list_for_each_entry(tmp, &local->sta_list, list) {
+                        if (!tmp->debugfs_registered) {
+                                sta = tmp;
+                                __sta_info_get(sta);
+                                break;
+                        }
+                }
+                spin_unlock_bh(&local->sta_lock);
+
+                if (!sta)
+                        break;
+
+                sta->debugfs_registered = 1;
+                ieee80211_sta_debugfs_add(sta);
+                rate_control_add_sta_debugfs(sta);
+                sta_info_put(sta);
+        }
+}
+#endif
+
+void sta_info_init(struct ieee80211_local *local)
+{
+        spin_lock_init(&local->sta_lock);
+        INIT_LIST_HEAD(&local->sta_list);
+        INIT_LIST_HEAD(&local->deleted_sta_list);
+
+        init_timer(&local->sta_cleanup);
+        local->sta_cleanup.expires = jiffies + STA_INFO_CLEANUP_INTERVAL;
+        local->sta_cleanup.data = (unsigned long) local;
+        local->sta_cleanup.function = sta_info_cleanup;
+
+#ifdef CONFIG_MAC80211_DEBUGFS
+        INIT_WORK(&local->sta_debugfs_add, sta_info_debugfs_add_task);
+#endif
+}
+
+int sta_info_start(struct ieee80211_local *local)
+{
+        add_timer(&local->sta_cleanup);
+        return 0;
+}
+
+void sta_info_stop(struct ieee80211_local *local)
+{
+        struct sta_info *sta, *tmp;
+
+        del_timer(&local->sta_cleanup);
+
+        list_for_each_entry_safe(sta, tmp, &local->sta_list, list) {
+                /* sta_info_free must be called with 0 as the last
+                 * parameter to ensure all debugfs sta entries are
+                 * unregistered. We don't need locking at this
+                 * point. */
+                sta_info_free(sta, 0);
+        }
+}
+
+void sta_info_remove_aid_ptr(struct sta_info *sta)
+{
+        struct ieee80211_sub_if_data *sdata;
+
+        if (sta->aid <= 0)
+                return;
+
+        sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev);
+
+        if (sdata->local->ops->set_tim)
+                sdata->local->ops->set_tim(local_to_hw(sdata->local),
+                                          sta->aid, 0);
+        if (sdata->bss)
+                __bss_tim_clear(sdata->bss, sta->aid);
+}
+
+
+/**
+ * sta_info_flush - flush matching STA entries from the STA table
+ * @local: local interface data
+ * @dev: matching rule for the net device (sta->dev) or %NULL to match all STAs
+ */
+void sta_info_flush(struct ieee80211_local *local, struct net_device *dev)
+{
+        struct sta_info *sta, *tmp;
+
+        spin_lock_bh(&local->sta_lock);
+        list_for_each_entry_safe(sta, tmp, &local->sta_list, list)
+                if (!dev || dev == sta->dev)
+                        sta_info_free(sta, 1);
+        spin_unlock_bh(&local->sta_lock);
+}
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
new file mode 100644
index 000000000000..b5591d2f60a4
--- /dev/null
+++ b/net/mac80211/sta_info.h
@@ -0,0 +1,164 @@
+/*
+ * Copyright 2002-2005, Devicescape Software, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef STA_INFO_H
+#define STA_INFO_H
+
+#include <linux/list.h>
+#include <linux/types.h>
+#include <linux/if_ether.h>
+#include <linux/kref.h>
+#include "ieee80211_key.h"
+
+/* Stations flags (struct sta_info::flags) */
+#define WLAN_STA_AUTH BIT(0)
+#define WLAN_STA_ASSOC BIT(1)
+#define WLAN_STA_PS BIT(2)
+#define WLAN_STA_TIM BIT(3) /* TIM bit is on for PS stations */
+#define WLAN_STA_PERM BIT(4) /* permanent; do not remove entry on expiration */
+#define WLAN_STA_AUTHORIZED BIT(5) /* If 802.1X is used, this flag is
+                                    * controlling whether STA is authorized to
+                                    * send and receive non-IEEE 802.1X frames
+                                    */
+#define WLAN_STA_SHORT_PREAMBLE BIT(7)
+#define WLAN_STA_WME BIT(9)
+#define WLAN_STA_WDS BIT(27)
+
+
+struct sta_info {
+        struct kref kref;
+        struct list_head list;
+        struct sta_info *hnext; /* next entry in hash table list */
+
+        struct ieee80211_local *local;
+
+        u8 addr[ETH_ALEN];
+        u16 aid; /* STA's unique AID (1..2007), 0 = not yet assigned */
+        u32 flags; /* WLAN_STA_ */
+
+        struct sk_buff_head ps_tx_buf; /* buffer of TX frames for station in
+                                        * power saving state */
+        int pspoll; /* whether STA has send a PS Poll frame */
+        struct sk_buff_head tx_filtered; /* buffer of TX frames that were
+                                          * already given to low-level driver,
+                                          * but were filtered */
+        int clear_dst_mask;
+
+        unsigned long rx_packets, tx_packets; /* number of RX/TX MSDUs */
+        unsigned long rx_bytes, tx_bytes;
+        unsigned long tx_retry_failed, tx_retry_count;
+        unsigned long tx_filtered_count;
+
+        unsigned int wep_weak_iv_count; /* number of RX frames with weak IV */
+
+        unsigned long last_rx;
+        u32 supp_rates; /* bitmap of supported rates in local->curr_rates */
+        int txrate; /* index in local->curr_rates */
+        int last_txrate; /* last rate used to send a frame to this STA */
+        int last_nonerp_idx;
+
+        struct net_device *dev; /* which net device is this station associated
+                                 * to */
+
+        struct ieee80211_key *key;
+
+        u32 tx_num_consecutive_failures;
+        u32 tx_num_mpdu_ok;
+        u32 tx_num_mpdu_fail;
+
+        struct rate_control_ref *rate_ctrl;
+        void *rate_ctrl_priv;
+
+        /* last received seq/frag number from this STA (per RX queue) */
+        __le16 last_seq_ctrl[NUM_RX_DATA_QUEUES];
+        unsigned long num_duplicates; /* number of duplicate frames received
+                                       * from this STA */
+        unsigned long tx_fragments; /* number of transmitted MPDUs */
+        unsigned long rx_fragments; /* number of received MPDUs */
+        unsigned long rx_dropped; /* number of dropped MPDUs from this STA */
+
+        int last_rssi; /* RSSI of last received frame from this STA */
+        int last_signal; /* signal of last received frame from this STA */
+        int last_noise; /* noise of last received frame from this STA */
+        int last_ack_rssi[3]; /* RSSI of last received ACKs from this STA */
+        unsigned long last_ack;
+        int channel_use;
+        int channel_use_raw;
+
+        u8 antenna_sel_tx;
+        u8 antenna_sel_rx;
+
+
+        int key_idx_compression; /* key table index for compression and TX
+                                  * filtering; used only if sta->key is not
+                                  * set */
+
+#ifdef CONFIG_MAC80211_DEBUGFS
+        int debugfs_registered;
+#endif
+        int assoc_ap; /* whether this is an AP that we are
+                       * associated with as a client */
+
+#ifdef CONFIG_MAC80211_DEBUG_COUNTERS
+        unsigned int wme_rx_queue[NUM_RX_DATA_QUEUES];
+        unsigned int wme_tx_queue[NUM_RX_DATA_QUEUES];
+#endif /* CONFIG_MAC80211_DEBUG_COUNTERS */
+
+        int vlan_id;
+
+        u16 listen_interval;
+
+#ifdef CONFIG_MAC80211_DEBUGFS
+        struct sta_info_debugfsdentries {
+                struct dentry *dir;
+                struct dentry *flags;
+                struct dentry *num_ps_buf_frames;
+                struct dentry *last_ack_rssi;
+                struct dentry *last_ack_ms;
+                struct dentry *inactive_ms;
+                struct dentry *last_seq_ctrl;
+#ifdef CONFIG_MAC80211_DEBUG_COUNTERS
+                struct dentry *wme_rx_queue;
+                struct dentry *wme_tx_queue;
+#endif
+        } debugfs;
+#endif
+};
+
+
+/* Maximum number of concurrently registered stations */
+#define MAX_STA_COUNT 2007
+
+#define STA_HASH_SIZE 256
+#define STA_HASH(sta) (sta[5])
+
+
+/* Maximum number of frames to buffer per power saving station */
+#define STA_MAX_TX_BUFFER 128
+
+/* Minimum buffered frame expiry time. If STA uses listen interval that is
+ * smaller than this value, the minimum value here is used instead. */
+#define STA_TX_BUFFER_EXPIRE (10 * HZ)
+
+/* How often station data is cleaned up (e.g., expiration of buffered frames)
+ */
+#define STA_INFO_CLEANUP_INTERVAL (10 * HZ)
+
+struct sta_info * sta_info_get(struct ieee80211_local *local, u8 *addr);
+int sta_info_min_txrate_get(struct ieee80211_local *local);
+void sta_info_put(struct sta_info *sta);
+struct sta_info * sta_info_add(struct ieee80211_local *local,
+                               struct net_device *dev, u8 *addr, gfp_t gfp);
+void sta_info_free(struct sta_info *sta, int locked);
+void sta_info_init(struct ieee80211_local *local);
+int sta_info_start(struct ieee80211_local *local);
+void sta_info_stop(struct ieee80211_local *local);
+void sta_info_remove_aid_ptr(struct sta_info *sta);
+void sta_info_flush(struct ieee80211_local *local, struct net_device *dev);
+
+#endif /* STA_INFO_H */
diff --git a/net/mac80211/tkip.c b/net/mac80211/tkip.c
new file mode 100644
index 000000000000..41621720e560
--- /dev/null
+++ b/net/mac80211/tkip.c
@@ -0,0 +1,341 @@
+/*
+ * Copyright 2002-2004, Instant802 Networks, Inc.
+ * Copyright 2005, Devicescape Software, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/netdevice.h>
+
+#include <net/mac80211.h>
+#include "ieee80211_key.h"
+#include "tkip.h"
+#include "wep.h"
+
+
+/* TKIP key mixing functions */
+
+
+#define PHASE1_LOOP_COUNT 8
+
+
+/* 2-byte by 2-byte subset of the full AES S-box table; second part of this
+ * table is identical to first part but byte-swapped */
+static const u16 tkip_sbox[256] =
+{
+        0xC6A5, 0xF884, 0xEE99, 0xF68D, 0xFF0D, 0xD6BD, 0xDEB1, 0x9154,
+        0x6050, 0x0203, 0xCEA9, 0x567D, 0xE719, 0xB562, 0x4DE6, 0xEC9A,
+        0x8F45, 0x1F9D, 0x8940, 0xFA87, 0xEF15, 0xB2EB, 0x8EC9, 0xFB0B,
+        0x41EC, 0xB367, 0x5FFD, 0x45EA, 0x23BF, 0x53F7, 0xE496, 0x9B5B,
+        0x75C2, 0xE11C, 0x3DAE, 0x4C6A, 0x6C5A, 0x7E41, 0xF502, 0x834F,
+        0x685C, 0x51F4, 0xD134, 0xF908, 0xE293, 0xAB73, 0x6253, 0x2A3F,
+        0x080C, 0x9552, 0x4665, 0x9D5E, 0x3028, 0x37A1, 0x0A0F, 0x2FB5,
+        0x0E09, 0x2436, 0x1B9B, 0xDF3D, 0xCD26, 0x4E69, 0x7FCD, 0xEA9F,
+        0x121B, 0x1D9E, 0x5874, 0x342E, 0x362D, 0xDCB2, 0xB4EE, 0x5BFB,
+        0xA4F6, 0x764D, 0xB761, 0x7DCE, 0x527B, 0xDD3E, 0x5E71, 0x1397,
+        0xA6F5, 0xB968, 0x0000, 0xC12C, 0x4060, 0xE31F, 0x79C8, 0xB6ED,
+        0xD4BE, 0x8D46, 0x67D9, 0x724B, 0x94DE, 0x98D4, 0xB0E8, 0x854A,
+        0xBB6B, 0xC52A, 0x4FE5, 0xED16, 0x86C5, 0x9AD7, 0x6655, 0x1194,
+        0x8ACF, 0xE910, 0x0406, 0xFE81, 0xA0F0, 0x7844, 0x25BA, 0x4BE3,
+        0xA2F3, 0x5DFE, 0x80C0, 0x058A, 0x3FAD, 0x21BC, 0x7048, 0xF104,
+        0x63DF, 0x77C1, 0xAF75, 0x4263, 0x2030, 0xE51A, 0xFD0E, 0xBF6D,
+        0x814C, 0x1814, 0x2635, 0xC32F, 0xBEE1, 0x35A2, 0x88CC, 0x2E39,
+        0x9357, 0x55F2, 0xFC82, 0x7A47, 0xC8AC, 0xBAE7, 0x322B, 0xE695,
+        0xC0A0, 0x1998, 0x9ED1, 0xA37F, 0x4466, 0x547E, 0x3BAB, 0x0B83,
+        0x8CCA, 0xC729, 0x6BD3, 0x283C, 0xA779, 0xBCE2, 0x161D, 0xAD76,
+        0xDB3B, 0x6456, 0x744E, 0x141E, 0x92DB, 0x0C0A, 0x486C, 0xB8E4,
+        0x9F5D, 0xBD6E, 0x43EF, 0xC4A6, 0x39A8, 0x31A4, 0xD337, 0xF28B,
+        0xD532, 0x8B43, 0x6E59, 0xDAB7, 0x018C, 0xB164, 0x9CD2, 0x49E0,
+        0xD8B4, 0xACFA, 0xF307, 0xCF25, 0xCAAF, 0xF48E, 0x47E9, 0x1018,
+        0x6FD5, 0xF088, 0x4A6F, 0x5C72, 0x3824, 0x57F1, 0x73C7, 0x9751,
+        0xCB23, 0xA17C, 0xE89C, 0x3E21, 0x96DD, 0x61DC, 0x0D86, 0x0F85,
+        0xE090, 0x7C42, 0x71C4, 0xCCAA, 0x90D8, 0x0605, 0xF701, 0x1C12,
+        0xC2A3, 0x6A5F, 0xAEF9, 0x69D0, 0x1791, 0x9958, 0x3A27, 0x27B9,
+        0xD938, 0xEB13, 0x2BB3, 0x2233, 0xD2BB, 0xA970, 0x0789, 0x33A7,
+        0x2DB6, 0x3C22, 0x1592, 0xC920, 0x8749, 0xAAFF, 0x5078, 0xA57A,
+        0x038F, 0x59F8, 0x0980, 0x1A17, 0x65DA, 0xD731, 0x84C6, 0xD0B8,
+        0x82C3, 0x29B0, 0x5A77, 0x1E11, 0x7BCB, 0xA8FC, 0x6DD6, 0x2C3A,
+};
+
+
+static inline u16 Mk16(u8 x, u8 y)
+{
+        return ((u16) x << 8) | (u16) y;
+}
+
+
+static inline u8 Hi8(u16 v)
+{
+        return v >> 8;
+}
+
+
+static inline u8 Lo8(u16 v)
+{
+        return v & 0xff;
+}
+
+
+static inline u16 Hi16(u32 v)
+{
+        return v >> 16;
+}
+
+
+static inline u16 Lo16(u32 v)
+{
+        return v & 0xffff;
+}
+
+
+static inline u16 RotR1(u16 v)
+{
+        return (v >> 1) | ((v & 0x0001) << 15);
+}
+
+
+static inline u16 tkip_S(u16 val)
+{
+        u16 a = tkip_sbox[Hi8(val)];
+
+        return tkip_sbox[Lo8(val)] ^ Hi8(a) ^ (Lo8(a) << 8);
+}
+
+
+
+/* P1K := Phase1(TA, TK, TSC)
+ * TA = transmitter address (48 bits)
+ * TK = dot11DefaultKeyValue or dot11KeyMappingValue (128 bits)
+ * TSC = TKIP sequence counter (48 bits, only 32 msb bits used)
+ * P1K: 80 bits
+ */
+static void tkip_mixing_phase1(const u8 *ta, const u8 *tk, u32 tsc_IV32,
+                               u16 *p1k)
+{
+        int i, j;
+
+        p1k[0] = Lo16(tsc_IV32);
+        p1k[1] = Hi16(tsc_IV32);
+        p1k[2] = Mk16(ta[1], ta[0]);
+        p1k[3] = Mk16(ta[3], ta[2]);
+        p1k[4] = Mk16(ta[5], ta[4]);
+
+        for (i = 0; i < PHASE1_LOOP_COUNT; i++) {
+                j = 2 * (i & 1);
+                p1k[0] += tkip_S(p1k[4] ^ Mk16(tk[ 1 + j], tk[ 0 + j]));
+                p1k[1] += tkip_S(p1k[0] ^ Mk16(tk[ 5 + j], tk[ 4 + j]));
+                p1k[2] += tkip_S(p1k[1] ^ Mk16(tk[ 9 + j], tk[ 8 + j]));
+                p1k[3] += tkip_S(p1k[2] ^ Mk16(tk[13 + j], tk[12 + j]));
+                p1k[4] += tkip_S(p1k[3] ^ Mk16(tk[ 1 + j], tk[ 0 + j])) + i;
+        }
+}
+
+
+static void tkip_mixing_phase2(const u16 *p1k, const u8 *tk, u16 tsc_IV16,
+                               u8 *rc4key)
+{
+        u16 ppk[6];
+        int i;
+
+        ppk[0] = p1k[0];
+        ppk[1] = p1k[1];
+        ppk[2] = p1k[2];
+        ppk[3] = p1k[3];
+        ppk[4] = p1k[4];
+        ppk[5] = p1k[4] + tsc_IV16;
+
+        ppk[0] += tkip_S(ppk[5] ^ Mk16(tk[ 1], tk[ 0]));
+        ppk[1] += tkip_S(ppk[0] ^ Mk16(tk[ 3], tk[ 2]));
+        ppk[2] += tkip_S(ppk[1] ^ Mk16(tk[ 5], tk[ 4]));
+        ppk[3] += tkip_S(ppk[2] ^ Mk16(tk[ 7], tk[ 6]));
+        ppk[4] += tkip_S(ppk[3] ^ Mk16(tk[ 9], tk[ 8]));
+        ppk[5] += tkip_S(ppk[4] ^ Mk16(tk[11], tk[10]));
+        ppk[0] +=  RotR1(ppk[5] ^ Mk16(tk[13], tk[12]));
+        ppk[1] +=  RotR1(ppk[0] ^ Mk16(tk[15], tk[14]));
+        ppk[2] +=  RotR1(ppk[1]);
+        ppk[3] +=  RotR1(ppk[2]);
+        ppk[4] +=  RotR1(ppk[3]);
+        ppk[5] +=  RotR1(ppk[4]);
+
+        rc4key[0] = Hi8(tsc_IV16);
+        rc4key[1] = (Hi8(tsc_IV16) | 0x20) & 0x7f;
+        rc4key[2] = Lo8(tsc_IV16);
+        rc4key[3] = Lo8((ppk[5] ^ Mk16(tk[1], tk[0])) >> 1);
+
+        for (i = 0; i < 6; i++) {
+                rc4key[4 + 2 * i] = Lo8(ppk[i]);
+                rc4key[5 + 2 * i] = Hi8(ppk[i]);
+        }
+}
+
+
+/* Add TKIP IV and Ext. IV at @pos. @iv0, @iv1, and @iv2 are the first octets
+ * of the IV. Returns pointer to the octet following IVs (i.e., beginning of
+ * the packet payload). */
+u8 * ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key,
+                           u8 iv0, u8 iv1, u8 iv2)
+{
+        *pos++ = iv0;
+        *pos++ = iv1;
+        *pos++ = iv2;
+        *pos++ = (key->keyidx << 6) | (1 << 5) /* Ext IV */;
+        *pos++ = key->u.tkip.iv32 & 0xff;
+        *pos++ = (key->u.tkip.iv32 >> 8) & 0xff;
+        *pos++ = (key->u.tkip.iv32 >> 16) & 0xff;
+        *pos++ = (key->u.tkip.iv32 >> 24) & 0xff;
+        return pos;
+}
+
+
+void ieee80211_tkip_gen_phase1key(struct ieee80211_key *key, u8 *ta,
+                                  u16 *phase1key)
+{
+        tkip_mixing_phase1(ta, &key->key[ALG_TKIP_TEMP_ENCR_KEY],
+                           key->u.tkip.iv32, phase1key);
+}
+
+void ieee80211_tkip_gen_rc4key(struct ieee80211_key *key, u8 *ta,
+                               u8 *rc4key)
+{
+        /* Calculate per-packet key */
+        if (key->u.tkip.iv16 == 0 || !key->u.tkip.tx_initialized) {
+                /* IV16 wrapped around - perform TKIP phase 1 */
+                tkip_mixing_phase1(ta, &key->key[ALG_TKIP_TEMP_ENCR_KEY],
+                                   key->u.tkip.iv32, key->u.tkip.p1k);
+                key->u.tkip.tx_initialized = 1;
+        }
+
+        tkip_mixing_phase2(key->u.tkip.p1k, &key->key[ALG_TKIP_TEMP_ENCR_KEY],
+                           key->u.tkip.iv16, rc4key);
+}
+
+/* Encrypt packet payload with TKIP using @key. @pos is a pointer to the
+ * beginning of the buffer containing payload. This payload must include
+ * headroom of eight octets for IV and Ext. IV and taildroom of four octets
+ * for ICV. @payload_len is the length of payload (_not_ including extra
+ * headroom and tailroom). @ta is the transmitter addresses. */
+void ieee80211_tkip_encrypt_data(struct crypto_blkcipher *tfm,
+                                 struct ieee80211_key *key,
+                                 u8 *pos, size_t payload_len, u8 *ta)
+{
+        u8 rc4key[16];
+
+        ieee80211_tkip_gen_rc4key(key, ta, rc4key);
+        pos = ieee80211_tkip_add_iv(pos, key, rc4key[0], rc4key[1], rc4key[2]);
+        ieee80211_wep_encrypt_data(tfm, rc4key, 16, pos, payload_len);
+}
+
+
+/* Decrypt packet payload with TKIP using @key. @pos is a pointer to the
+ * beginning of the buffer containing IEEE 802.11 header payload, i.e.,
+ * including IV, Ext. IV, real data, Michael MIC, ICV. @payload_len is the
+ * length of payload, including IV, Ext. IV, MIC, ICV.  */
+int ieee80211_tkip_decrypt_data(struct crypto_blkcipher *tfm,
+                                struct ieee80211_key *key,
+                                u8 *payload, size_t payload_len, u8 *ta,
+                                int only_iv, int queue)
+{
+        u32 iv32;
+        u32 iv16;
+        u8 rc4key[16], keyid, *pos = payload;
+        int res;
+
+        if (payload_len < 12)
+                return -1;
+
+        iv16 = (pos[0] << 8) | pos[2];
+        keyid = pos[3];
+        iv32 = pos[4] | (pos[5] << 8) | (pos[6] << 16) | (pos[7] << 24);
+        pos += 8;
+#ifdef CONFIG_TKIP_DEBUG
+        {
+                int i;
+                printk(KERN_DEBUG "TKIP decrypt: data(len=%zd)", payload_len);
+                for (i = 0; i < payload_len; i++)
+                        printk(" %02x", payload[i]);
+                printk("\n");
+                printk(KERN_DEBUG "TKIP decrypt: iv16=%04x iv32=%08x\n",
+                       iv16, iv32);
+        }
+#endif /* CONFIG_TKIP_DEBUG */
+
+        if (!(keyid & (1 << 5)))
+                return TKIP_DECRYPT_NO_EXT_IV;
+
+        if ((keyid >> 6) != key->keyidx)
+                return TKIP_DECRYPT_INVALID_KEYIDX;
+
+        if (key->u.tkip.rx_initialized[queue] &&
+            (iv32 < key->u.tkip.iv32_rx[queue] ||
+             (iv32 == key->u.tkip.iv32_rx[queue] &&
+              iv16 <= key->u.tkip.iv16_rx[queue]))) {
+#ifdef CONFIG_TKIP_DEBUG
+                printk(KERN_DEBUG "TKIP replay detected for RX frame from "
+                       MAC_FMT " (RX IV (%04x,%02x) <= prev. IV (%04x,%02x)\n",
+                       MAC_ARG(ta),
+                       iv32, iv16, key->u.tkip.iv32_rx[queue],
+                       key->u.tkip.iv16_rx[queue]);
+#endif /* CONFIG_TKIP_DEBUG */
+                return TKIP_DECRYPT_REPLAY;
+        }
+
+        if (only_iv) {
+                res = TKIP_DECRYPT_OK;
+                key->u.tkip.rx_initialized[queue] = 1;
+                goto done;
+        }
+
+        if (!key->u.tkip.rx_initialized[queue] ||
+            key->u.tkip.iv32_rx[queue] != iv32) {
+                key->u.tkip.rx_initialized[queue] = 1;
+                /* IV16 wrapped around - perform TKIP phase 1 */
+                tkip_mixing_phase1(ta, &key->key[ALG_TKIP_TEMP_ENCR_KEY],
+                                   iv32, key->u.tkip.p1k_rx[queue]);
+#ifdef CONFIG_TKIP_DEBUG
+                {
+                        int i;
+                        printk(KERN_DEBUG "TKIP decrypt: Phase1 TA=" MAC_FMT
+                               " TK=", MAC_ARG(ta));
+                        for (i = 0; i < 16; i++)
+                                printk("%02x ",
+                                       key->key[ALG_TKIP_TEMP_ENCR_KEY + i]);
+                        printk("\n");
+                        printk(KERN_DEBUG "TKIP decrypt: P1K=");
+                        for (i = 0; i < 5; i++)
+                                printk("%04x ", key->u.tkip.p1k_rx[queue][i]);
+                        printk("\n");
+                }
+#endif /* CONFIG_TKIP_DEBUG */
+        }
+
+        tkip_mixing_phase2(key->u.tkip.p1k_rx[queue],
+                           &key->key[ALG_TKIP_TEMP_ENCR_KEY],
+                           iv16, rc4key);
+#ifdef CONFIG_TKIP_DEBUG
+        {
+                int i;
+                printk(KERN_DEBUG "TKIP decrypt: Phase2 rc4key=");
+                for (i = 0; i < 16; i++)
+                        printk("%02x ", rc4key[i]);
+                printk("\n");
+        }
+#endif /* CONFIG_TKIP_DEBUG */
+
+        res = ieee80211_wep_decrypt_data(tfm, rc4key, 16, pos, payload_len - 12);
+ done:
+        if (res == TKIP_DECRYPT_OK) {
+                /* FIX: these should be updated only after Michael MIC has been
+                 * verified */
+                /* Record previously received IV */
+                key->u.tkip.iv32_rx[queue] = iv32;
+                key->u.tkip.iv16_rx[queue] = iv16;
+        }
+
+        return res;
+}
+
+
diff --git a/net/mac80211/tkip.h b/net/mac80211/tkip.h
new file mode 100644
index 000000000000..a0d181a18049
--- /dev/null
+++ b/net/mac80211/tkip.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2002-2004, Instant802 Networks, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef TKIP_H
+#define TKIP_H
+
+#include <linux/types.h>
+#include <linux/crypto.h>
+#include "ieee80211_key.h"
+
+u8 * ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key,
+                           u8 iv0, u8 iv1, u8 iv2);
+void ieee80211_tkip_gen_phase1key(struct ieee80211_key *key, u8 *ta,
+                                  u16 *phase1key);
+void ieee80211_tkip_gen_rc4key(struct ieee80211_key *key, u8 *ta,
+                               u8 *rc4key);
+void ieee80211_tkip_encrypt_data(struct crypto_blkcipher *tfm,
+                                 struct ieee80211_key *key,
+                                 u8 *pos, size_t payload_len, u8 *ta);
+enum {
+        TKIP_DECRYPT_OK = 0,
+        TKIP_DECRYPT_NO_EXT_IV = -1,
+        TKIP_DECRYPT_INVALID_KEYIDX = -2,
+        TKIP_DECRYPT_REPLAY = -3,
+};
+int ieee80211_tkip_decrypt_data(struct crypto_blkcipher *tfm,
+                                struct ieee80211_key *key,
+                                u8 *payload, size_t payload_len, u8 *ta,
+                                int only_iv, int queue);
+
+#endif /* TKIP_H */
diff --git a/net/mac80211/wep.c b/net/mac80211/wep.c
new file mode 100644
index 000000000000..1ad3d75281cc
--- /dev/null
+++ b/net/mac80211/wep.c
@@ -0,0 +1,328 @@
+/*
+ * Software WEP encryption implementation
+ * Copyright 2002, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright 2003, Instant802 Networks, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/netdevice.h>
+#include <linux/types.h>
+#include <linux/random.h>
+#include <linux/compiler.h>
+#include <linux/crc32.h>
+#include <linux/crypto.h>
+#include <linux/err.h>
+#include <linux/mm.h>
+#include <asm/scatterlist.h>
+
+#include <net/mac80211.h>
+#include "ieee80211_i.h"
+#include "wep.h"
+
+
+int ieee80211_wep_init(struct ieee80211_local *local)
+{
+        /* start WEP IV from a random value */
+        get_random_bytes(&local->wep_iv, WEP_IV_LEN);
+
+        local->wep_tx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0,
+                                                CRYPTO_ALG_ASYNC);
+        if (IS_ERR(local->wep_tx_tfm))
+                return -ENOMEM;
+
+        local->wep_rx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0,
+                                                CRYPTO_ALG_ASYNC);
+        if (IS_ERR(local->wep_rx_tfm)) {
+                crypto_free_blkcipher(local->wep_tx_tfm);
+                return -ENOMEM;
+        }
+
+        return 0;
+}
+
+void ieee80211_wep_free(struct ieee80211_local *local)
+{
+        crypto_free_blkcipher(local->wep_tx_tfm);
+        crypto_free_blkcipher(local->wep_rx_tfm);
+}
+
+static inline int ieee80211_wep_weak_iv(u32 iv, int keylen)
+{
+        /* Fluhrer, Mantin, and Shamir have reported weaknesses in the
+         * key scheduling algorithm of RC4. At least IVs (KeyByte + 3,
+         * 0xff, N) can be used to speedup attacks, so avoid using them. */
+        if ((iv & 0xff00) == 0xff00) {
+                u8 B = (iv >> 16) & 0xff;
+                if (B >= 3 && B < 3 + keylen)
+                        return 1;
+        }
+        return 0;
+}
+
+
+void ieee80211_wep_get_iv(struct ieee80211_local *local,
+                          struct ieee80211_key *key, u8 *iv)
+{
+        local->wep_iv++;
+        if (ieee80211_wep_weak_iv(local->wep_iv, key->keylen))
+                local->wep_iv += 0x0100;
+
+        if (!iv)
+                return;
+
+        *iv++ = (local->wep_iv >> 16) & 0xff;
+        *iv++ = (local->wep_iv >> 8) & 0xff;
+        *iv++ = local->wep_iv & 0xff;
+        *iv++ = key->keyidx << 6;
+}
+
+
+u8 * ieee80211_wep_add_iv(struct ieee80211_local *local,
+                          struct sk_buff *skb,
+                          struct ieee80211_key *key)
+{
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+        u16 fc;
+        int hdrlen;
+        u8 *newhdr;
+
+        fc = le16_to_cpu(hdr->frame_control);
+        fc |= IEEE80211_FCTL_PROTECTED;
+        hdr->frame_control = cpu_to_le16(fc);
+
+        if ((skb_headroom(skb) < WEP_IV_LEN ||
+             skb_tailroom(skb) < WEP_ICV_LEN)) {
+                I802_DEBUG_INC(local->tx_expand_skb_head);
+                if (unlikely(pskb_expand_head(skb, WEP_IV_LEN, WEP_ICV_LEN,
+                                              GFP_ATOMIC)))
+                        return NULL;
+        }
+
+        hdrlen = ieee80211_get_hdrlen(fc);
+        newhdr = skb_push(skb, WEP_IV_LEN);
+        memmove(newhdr, newhdr + WEP_IV_LEN, hdrlen);
+        ieee80211_wep_get_iv(local, key, newhdr + hdrlen);
+        return newhdr + hdrlen;
+}
+
+
+void ieee80211_wep_remove_iv(struct ieee80211_local *local,
+                             struct sk_buff *skb,
+                             struct ieee80211_key *key)
+{
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+        u16 fc;
+        int hdrlen;
+
+        fc = le16_to_cpu(hdr->frame_control);
+        hdrlen = ieee80211_get_hdrlen(fc);
+        memmove(skb->data + WEP_IV_LEN, skb->data, hdrlen);
+        skb_pull(skb, WEP_IV_LEN);
+}
+
+
+/* Perform WEP encryption using given key. data buffer must have tailroom
+ * for 4-byte ICV. data_len must not include this ICV. Note: this function
+ * does _not_ add IV. data = RC4(data | CRC32(data)) */
+void ieee80211_wep_encrypt_data(struct crypto_blkcipher *tfm, u8 *rc4key,
+                                size_t klen, u8 *data, size_t data_len)
+{
+        struct blkcipher_desc desc = { .tfm = tfm };
+        struct scatterlist sg;
+        __le32 *icv;
+
+        icv = (__le32 *)(data + data_len);
+        *icv = cpu_to_le32(~crc32_le(~0, data, data_len));
+
+        crypto_blkcipher_setkey(tfm, rc4key, klen);
+        sg.page = virt_to_page(data);
+        sg.offset = offset_in_page(data);
+        sg.length = data_len + WEP_ICV_LEN;
+        crypto_blkcipher_encrypt(&desc, &sg, &sg, sg.length);
+}
+
+
+/* Perform WEP encryption on given skb. 4 bytes of extra space (IV) in the
+ * beginning of the buffer 4 bytes of extra space (ICV) in the end of the
+ * buffer will be added. Both IV and ICV will be transmitted, so the
+ * payload length increases with 8 bytes.
+ *
+ * WEP frame payload: IV + TX key idx, RC4(data), ICV = RC4(CRC32(data))
+ */
+int ieee80211_wep_encrypt(struct ieee80211_local *local, struct sk_buff *skb,
+                          struct ieee80211_key *key)
+{
+        u32 klen;
+        u8 *rc4key, *iv;
+        size_t len;
+
+        if (!key || key->alg != ALG_WEP)
+                return -1;
+
+        klen = 3 + key->keylen;
+        rc4key = kmalloc(klen, GFP_ATOMIC);
+        if (!rc4key)
+                return -1;
+
+        iv = ieee80211_wep_add_iv(local, skb, key);
+        if (!iv) {
+                kfree(rc4key);
+                return -1;
+        }
+
+        len = skb->len - (iv + WEP_IV_LEN - skb->data);
+
+        /* Prepend 24-bit IV to RC4 key */
+        memcpy(rc4key, iv, 3);
+
+        /* Copy rest of the WEP key (the secret part) */
+        memcpy(rc4key + 3, key->key, key->keylen);
+
+        /* Add room for ICV */
+        skb_put(skb, WEP_ICV_LEN);
+
+        ieee80211_wep_encrypt_data(local->wep_tx_tfm, rc4key, klen,
+                                   iv + WEP_IV_LEN, len);
+
+        kfree(rc4key);
+
+        return 0;
+}
+
+
+/* Perform WEP decryption using given key. data buffer includes encrypted
+ * payload, including 4-byte ICV, but _not_ IV. data_len must not include ICV.
+ * Return 0 on success and -1 on ICV mismatch. */
+int ieee80211_wep_decrypt_data(struct crypto_blkcipher *tfm, u8 *rc4key,
+                               size_t klen, u8 *data, size_t data_len)
+{
+        struct blkcipher_desc desc = { .tfm = tfm };
+        struct scatterlist sg;
+        __le32 crc;
+
+        crypto_blkcipher_setkey(tfm, rc4key, klen);
+        sg.page = virt_to_page(data);
+        sg.offset = offset_in_page(data);
+        sg.length = data_len + WEP_ICV_LEN;
+        crypto_blkcipher_decrypt(&desc, &sg, &sg, sg.length);
+
+        crc = cpu_to_le32(~crc32_le(~0, data, data_len));
+        if (memcmp(&crc, data + data_len, WEP_ICV_LEN) != 0)
+                /* ICV mismatch */
+                return -1;
+
+        return 0;
+}
+
+
+/* Perform WEP decryption on given skb. Buffer includes whole WEP part of
+ * the frame: IV (4 bytes), encrypted payload (including SNAP header),
+ * ICV (4 bytes). skb->len includes both IV and ICV.
+ *
+ * Returns 0 if frame was decrypted successfully and ICV was correct and -1 on
+ * failure. If frame is OK, IV and ICV will be removed, i.e., decrypted payload
+ * is moved to the beginning of the skb and skb length will be reduced.
+ */
+int ieee80211_wep_decrypt(struct ieee80211_local *local, struct sk_buff *skb,
+                          struct ieee80211_key *key)
+{
+        u32 klen;
+        u8 *rc4key;
+        u8 keyidx;
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+        u16 fc;
+        int hdrlen;
+        size_t len;
+        int ret = 0;
+
+        fc = le16_to_cpu(hdr->frame_control);
+        if (!(fc & IEEE80211_FCTL_PROTECTED))
+                return -1;
+
+        hdrlen = ieee80211_get_hdrlen(fc);
+
+        if (skb->len < 8 + hdrlen)
+                return -1;
+
+        len = skb->len - hdrlen - 8;
+
+        keyidx = skb->data[hdrlen + 3] >> 6;
+
+        if (!key || keyidx != key->keyidx || key->alg != ALG_WEP)
+                return -1;
+
+        klen = 3 + key->keylen;
+
+        rc4key = kmalloc(klen, GFP_ATOMIC);
+        if (!rc4key)
+                return -1;
+
+        /* Prepend 24-bit IV to RC4 key */
+        memcpy(rc4key, skb->data + hdrlen, 3);
+
+        /* Copy rest of the WEP key (the secret part) */
+        memcpy(rc4key + 3, key->key, key->keylen);
+
+        if (ieee80211_wep_decrypt_data(local->wep_rx_tfm, rc4key, klen,
+                                       skb->data + hdrlen + WEP_IV_LEN,
+                                       len)) {
+                printk(KERN_DEBUG "WEP decrypt failed (ICV)\n");
+                ret = -1;
+        }
+
+        kfree(rc4key);
+
+        /* Trim ICV */
+        skb_trim(skb, skb->len - WEP_ICV_LEN);
+
+        /* Remove IV */
+        memmove(skb->data + WEP_IV_LEN, skb->data, hdrlen);
+        skb_pull(skb, WEP_IV_LEN);
+
+        return ret;
+}
+
+
+int ieee80211_wep_get_keyidx(struct sk_buff *skb)
+{
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+        u16 fc;
+        int hdrlen;
+
+        fc = le16_to_cpu(hdr->frame_control);
+        if (!(fc & IEEE80211_FCTL_PROTECTED))
+                return -1;
+
+        hdrlen = ieee80211_get_hdrlen(fc);
+
+        if (skb->len < 8 + hdrlen)
+                return -1;
+
+        return skb->data[hdrlen + 3] >> 6;
+}
+
+
+u8 * ieee80211_wep_is_weak_iv(struct sk_buff *skb, struct ieee80211_key *key)
+{
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+        u16 fc;
+        int hdrlen;
+        u8 *ivpos;
+        u32 iv;
+
+        fc = le16_to_cpu(hdr->frame_control);
+        if (!(fc & IEEE80211_FCTL_PROTECTED))
+                return NULL;
+
+        hdrlen = ieee80211_get_hdrlen(fc);
+        ivpos = skb->data + hdrlen;
+        iv = (ivpos[0] << 16) | (ivpos[1] << 8) | ivpos[2];
+
+        if (ieee80211_wep_weak_iv(iv, key->keylen))
+                return ivpos;
+
+        return NULL;
+}
diff --git a/net/mac80211/wep.h b/net/mac80211/wep.h
new file mode 100644
index 000000000000..bfe29e8e10aa
--- /dev/null
+++ b/net/mac80211/wep.h
@@ -0,0 +1,40 @@
+/*
+ * Software WEP encryption implementation
+ * Copyright 2002, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright 2003, Instant802 Networks, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef WEP_H
+#define WEP_H
+
+#include <linux/skbuff.h>
+#include <linux/types.h>
+#include "ieee80211_i.h"
+#include "ieee80211_key.h"
+
+int ieee80211_wep_init(struct ieee80211_local *local);
+void ieee80211_wep_free(struct ieee80211_local *local);
+void ieee80211_wep_get_iv(struct ieee80211_local *local,
+                          struct ieee80211_key *key, u8 *iv);
+u8 * ieee80211_wep_add_iv(struct ieee80211_local *local,
+                          struct sk_buff *skb,
+                          struct ieee80211_key *key);
+void ieee80211_wep_remove_iv(struct ieee80211_local *local,
+                             struct sk_buff *skb,
+                             struct ieee80211_key *key);
+void ieee80211_wep_encrypt_data(struct crypto_blkcipher *tfm, u8 *rc4key,
+                                size_t klen, u8 *data, size_t data_len);
+int ieee80211_wep_decrypt_data(struct crypto_blkcipher *tfm, u8 *rc4key,
+                               size_t klen, u8 *data, size_t data_len);
+int ieee80211_wep_encrypt(struct ieee80211_local *local, struct sk_buff *skb,
+                          struct ieee80211_key *key);
+int ieee80211_wep_decrypt(struct ieee80211_local *local, struct sk_buff *skb,
+                          struct ieee80211_key *key);
+int ieee80211_wep_get_keyidx(struct sk_buff *skb);
+u8 * ieee80211_wep_is_weak_iv(struct sk_buff *skb, struct ieee80211_key *key);
+
+#endif /* WEP_H */
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c
new file mode 100644
index 000000000000..89ce81529694
--- /dev/null
+++ b/net/mac80211/wme.c
@@ -0,0 +1,678 @@
+/*
+ * Copyright 2004, Instant802 Networks, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/netdevice.h>
+#include <linux/skbuff.h>
+#include <linux/module.h>
+#include <linux/if_arp.h>
+#include <linux/types.h>
+#include <net/ip.h>
+#include <net/pkt_sched.h>
+
+#include <net/mac80211.h>
+#include "ieee80211_i.h"
+#include "wme.h"
+
+static inline int WLAN_FC_IS_QOS_DATA(u16 fc)
+{
+        return (fc & 0x8C) == 0x88;
+}
+
+
+ieee80211_txrx_result
+ieee80211_rx_h_parse_qos(struct ieee80211_txrx_data *rx)
+{
+        u8 *data = rx->skb->data;
+        int tid;
+
+        /* does the frame have a qos control field? */
+        if (WLAN_FC_IS_QOS_DATA(rx->fc)) {
+                u8 *qc = data + ieee80211_get_hdrlen(rx->fc) - QOS_CONTROL_LEN;
+                /* frame has qos control */
+                tid = qc[0] & QOS_CONTROL_TID_MASK;
+        } else {
+                if (unlikely((rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT)) {
+                        /* Separate TID for management frames */
+                        tid = NUM_RX_DATA_QUEUES - 1;
+                } else {
+                        /* no qos control present */
+                        tid = 0; /* 802.1d - Best Effort */
+                }
+        }
+#ifdef CONFIG_MAC80211_DEBUG_COUNTERS
+        I802_DEBUG_INC(rx->local->wme_rx_queue[tid]);
+        if (rx->sta) {
+                I802_DEBUG_INC(rx->sta->wme_rx_queue[tid]);
+        }
+#endif /* CONFIG_MAC80211_DEBUG_COUNTERS */
+
+        rx->u.rx.queue = tid;
+        /* Set skb->priority to 1d tag if highest order bit of TID is not set.
+         * For now, set skb->priority to 0 for other cases. */
+        rx->skb->priority = (tid > 7) ? 0 : tid;
+
+        return TXRX_CONTINUE;
+}
+
+
+ieee80211_txrx_result
+ieee80211_rx_h_remove_qos_control(struct ieee80211_txrx_data *rx)
+{
+        u16 fc = rx->fc;
+        u8 *data = rx->skb->data;
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) data;
+
+        if (!WLAN_FC_IS_QOS_DATA(fc))
+                return TXRX_CONTINUE;
+
+        /* remove the qos control field, update frame type and meta-data */
+        memmove(data + 2, data, ieee80211_get_hdrlen(fc) - 2);
+        hdr = (struct ieee80211_hdr *) skb_pull(rx->skb, 2);
+        /* change frame type to non QOS */
+        rx->fc = fc &= ~IEEE80211_STYPE_QOS_DATA;
+        hdr->frame_control = cpu_to_le16(fc);
+
+        return TXRX_CONTINUE;
+}
+
+
+#ifdef CONFIG_NET_SCHED
+/* maximum number of hardware queues we support. */
+#define TC_80211_MAX_QUEUES 8
+
+struct ieee80211_sched_data
+{
+        struct tcf_proto *filter_list;
+        struct Qdisc *queues[TC_80211_MAX_QUEUES];
+        struct sk_buff_head requeued[TC_80211_MAX_QUEUES];
+};
+
+
+/* given a data frame determine the 802.1p/1d tag to use */
+static inline unsigned classify_1d(struct sk_buff *skb, struct Qdisc *qd)
+{
+        struct iphdr *ip;
+        int dscp;
+        int offset;
+
+        struct ieee80211_sched_data *q = qdisc_priv(qd);
+        struct tcf_result res = { -1, 0 };
+
+        /* if there is a user set filter list, call out to that */
+        if (q->filter_list) {
+                tc_classify(skb, q->filter_list, &res);
+                if (res.class != -1)
+                        return res.class;
+        }
+
+        /* skb->priority values from 256->263 are magic values to
+         * directly indicate a specific 802.1d priority.
+         * This is used to allow 802.1d priority to be passed directly in
+         * from VLAN tags, etc. */
+        if (skb->priority >= 256 && skb->priority <= 263)
+                return skb->priority - 256;
+
+        /* check there is a valid IP header present */
+        offset = ieee80211_get_hdrlen_from_skb(skb) + 8 /* LLC + proto */;
+        if (skb->protocol != __constant_htons(ETH_P_IP) ||
+            skb->len < offset + sizeof(*ip))
+                return 0;
+
+        ip = (struct iphdr *) (skb->data + offset);
+
+        dscp = ip->tos & 0xfc;
+        if (dscp & 0x1c)
+                return 0;
+        return dscp >> 5;
+}
+
+
+static inline int wme_downgrade_ac(struct sk_buff *skb)
+{
+        switch (skb->priority) {
+        case 6:
+        case 7:
+                skb->priority = 5; /* VO -> VI */
+                return 0;
+        case 4:
+        case 5:
+                skb->priority = 3; /* VI -> BE */
+                return 0;
+        case 0:
+        case 3:
+                skb->priority = 2; /* BE -> BK */
+                return 0;
+        default:
+                return -1;
+        }
+}
+
+
+/* positive return value indicates which queue to use
+ * negative return value indicates to drop the frame */
+static inline int classify80211(struct sk_buff *skb, struct Qdisc *qd)
+{
+        struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr);
+        struct ieee80211_tx_packet_data *pkt_data =
+                (struct ieee80211_tx_packet_data *) skb->cb;
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+        unsigned short fc = le16_to_cpu(hdr->frame_control);
+        int qos;
+        const int ieee802_1d_to_ac[8] = { 2, 3, 3, 2, 1, 1, 0, 0 };
+
+        /* see if frame is data or non data frame */
+        if (unlikely((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA)) {
+                /* management frames go on AC_VO queue, but are sent
+                * without QoS control fields */
+                return IEEE80211_TX_QUEUE_DATA0;
+        }
+
+        if (unlikely(pkt_data->mgmt_iface)) {
+                /* Data frames from hostapd (mainly, EAPOL) use AC_VO
+                * and they will include QoS control fields if
+                * the target STA is using WME. */
+                skb->priority = 7;
+                return ieee802_1d_to_ac[skb->priority];
+        }
+
+        /* is this a QoS frame? */
+        qos = fc & IEEE80211_STYPE_QOS_DATA;
+
+        if (!qos) {
+                skb->priority = 0; /* required for correct WPA/11i MIC */
+                return ieee802_1d_to_ac[skb->priority];
+        }
+
+        /* use the data classifier to determine what 802.1d tag the
+        * data frame has */
+        skb->priority = classify_1d(skb, qd);
+
+        /* incase we are a client verify acm is not set for this ac */
+        while (unlikely(local->wmm_acm & BIT(skb->priority))) {
+                if (wme_downgrade_ac(skb)) {
+                        /* No AC with lower priority has acm=0,
+                        * drop packet. */
+                        return -1;
+                }
+        }
+
+        /* look up which queue to use for frames with this 1d tag */
+        return ieee802_1d_to_ac[skb->priority];
+}
+
+
+static int wme_qdiscop_enqueue(struct sk_buff *skb, struct Qdisc* qd)
+{
+        struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr);
+        struct ieee80211_sched_data *q = qdisc_priv(qd);
+        struct ieee80211_tx_packet_data *pkt_data =
+                (struct ieee80211_tx_packet_data *) skb->cb;
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+        unsigned short fc = le16_to_cpu(hdr->frame_control);
+        struct Qdisc *qdisc;
+        int err, queue;
+
+        if (pkt_data->requeue) {
+                skb_queue_tail(&q->requeued[pkt_data->queue], skb);
+                qd->q.qlen++;
+                return 0;
+        }
+
+        queue = classify80211(skb, qd);
+
+        /* now we know the 1d priority, fill in the QoS header if there is one
+         */
+        if (WLAN_FC_IS_QOS_DATA(fc)) {
+                u8 *p = skb->data + ieee80211_get_hdrlen(fc) - 2;
+                u8 qos_hdr = skb->priority & QOS_CONTROL_TAG1D_MASK;
+                if (local->wifi_wme_noack_test)
+                        qos_hdr |= QOS_CONTROL_ACK_POLICY_NOACK <<
+                                        QOS_CONTROL_ACK_POLICY_SHIFT;
+                /* qos header is 2 bytes, second reserved */
+                *p = qos_hdr;
+                p++;
+                *p = 0;
+        }
+
+        if (unlikely(queue >= local->hw.queues)) {
+#if 0
+                if (net_ratelimit()) {
+                        printk(KERN_DEBUG "%s - queue=%d (hw does not "
+                               "support) -> %d\n",
+                               __func__, queue, local->hw.queues - 1);
+                }
+#endif
+                queue = local->hw.queues - 1;
+        }
+
+        if (unlikely(queue < 0)) {
+                        kfree_skb(skb);
+                        err = NET_XMIT_DROP;
+        } else {
+                pkt_data->queue = (unsigned int) queue;
+                qdisc = q->queues[queue];
+                err = qdisc->enqueue(skb, qdisc);
+                if (err == NET_XMIT_SUCCESS) {
+                        qd->q.qlen++;
+                        qd->bstats.bytes += skb->len;
+                        qd->bstats.packets++;
+                        return NET_XMIT_SUCCESS;
+                }
+        }
+        qd->qstats.drops++;
+        return err;
+}
+
+
+/* TODO: clean up the cases where master_hard_start_xmit
+ * returns non 0 - it shouldn't ever do that. Once done we
+ * can remove this function */
+static int wme_qdiscop_requeue(struct sk_buff *skb, struct Qdisc* qd)
+{
+        struct ieee80211_sched_data *q = qdisc_priv(qd);
+        struct ieee80211_tx_packet_data *pkt_data =
+                (struct ieee80211_tx_packet_data *) skb->cb;
+        struct Qdisc *qdisc;
+        int err;
+
+        /* we recorded which queue to use earlier! */
+        qdisc = q->queues[pkt_data->queue];
+
+        if ((err = qdisc->ops->requeue(skb, qdisc)) == 0) {
+                qd->q.qlen++;
+                return 0;
+        }
+        qd->qstats.drops++;
+        return err;
+}
+
+
+static struct sk_buff *wme_qdiscop_dequeue(struct Qdisc* qd)
+{
+        struct ieee80211_sched_data *q = qdisc_priv(qd);
+        struct net_device *dev = qd->dev;
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_hw *hw = &local->hw;
+        struct sk_buff *skb;
+        struct Qdisc *qdisc;
+        int queue;
+
+        /* check all the h/w queues in numeric/priority order */
+        for (queue = 0; queue < hw->queues; queue++) {
+                /* see if there is room in this hardware queue */
+                if (test_bit(IEEE80211_LINK_STATE_XOFF,
+                             &local->state[queue]) ||
+                    test_bit(IEEE80211_LINK_STATE_PENDING,
+                             &local->state[queue]))
+                        continue;
+
+                /* there is space - try and get a frame */
+                skb = skb_dequeue(&q->requeued[queue]);
+                if (skb) {
+                        qd->q.qlen--;
+                        return skb;
+                }
+
+                qdisc = q->queues[queue];
+                skb = qdisc->dequeue(qdisc);
+                if (skb) {
+                        qd->q.qlen--;
+                        return skb;
+                }
+        }
+        /* returning a NULL here when all the h/w queues are full means we
+         * never need to call netif_stop_queue in the driver */
+        return NULL;
+}
+
+
+static void wme_qdiscop_reset(struct Qdisc* qd)
+{
+        struct ieee80211_sched_data *q = qdisc_priv(qd);
+        struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr);
+        struct ieee80211_hw *hw = &local->hw;
+        int queue;
+
+        /* QUESTION: should we have some hardware flush functionality here? */
+
+        for (queue = 0; queue < hw->queues; queue++) {
+                skb_queue_purge(&q->requeued[queue]);
+                qdisc_reset(q->queues[queue]);
+        }
+        qd->q.qlen = 0;
+}
+
+
+static void wme_qdiscop_destroy(struct Qdisc* qd)
+{
+        struct ieee80211_sched_data *q = qdisc_priv(qd);
+        struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr);
+        struct ieee80211_hw *hw = &local->hw;
+        int queue;
+
+        tcf_destroy_chain(q->filter_list);
+        q->filter_list = NULL;
+
+        for (queue=0; queue < hw->queues; queue++) {
+                skb_queue_purge(&q->requeued[queue]);
+                qdisc_destroy(q->queues[queue]);
+                q->queues[queue] = &noop_qdisc;
+        }
+}
+
+
+/* called whenever parameters are updated on existing qdisc */
+static int wme_qdiscop_tune(struct Qdisc *qd, struct rtattr *opt)
+{
+/*      struct ieee80211_sched_data *q = qdisc_priv(qd);
+*/
+        /* check our options block is the right size */
+        /* copy any options to our local structure */
+/*      Ignore options block for now - always use static mapping
+        struct tc_ieee80211_qopt *qopt = RTA_DATA(opt);
+
+        if (opt->rta_len < RTA_LENGTH(sizeof(*qopt)))
+                return -EINVAL;
+        memcpy(q->tag2queue, qopt->tag2queue, sizeof(qopt->tag2queue));
+*/
+        return 0;
+}
+
+
+/* called during initial creation of qdisc on device */
+static int wme_qdiscop_init(struct Qdisc *qd, struct rtattr *opt)
+{
+        struct ieee80211_sched_data *q = qdisc_priv(qd);
+        struct net_device *dev = qd->dev;
+        struct ieee80211_local *local;
+        int queues;
+        int err = 0, i;
+
+        /* check that device is a mac80211 device */
+        if (!dev->ieee80211_ptr ||
+            dev->ieee80211_ptr->wiphy->privid != mac80211_wiphy_privid)
+                return -EINVAL;
+
+        /* check this device is an ieee80211 master type device */
+        if (dev->type != ARPHRD_IEEE80211)
+                return -EINVAL;
+
+        /* check that there is no qdisc currently attached to device
+         * this ensures that we will be the root qdisc. (I can't find a better
+         * way to test this explicitly) */
+        if (dev->qdisc_sleeping != &noop_qdisc)
+                return -EINVAL;
+
+        if (qd->flags & TCQ_F_INGRESS)
+                return -EINVAL;
+
+        local = wdev_priv(dev->ieee80211_ptr);
+        queues = local->hw.queues;
+
+        /* if options were passed in, set them */
+        if (opt) {
+                err = wme_qdiscop_tune(qd, opt);
+        }
+
+        /* create child queues */
+        for (i = 0; i < queues; i++) {
+                skb_queue_head_init(&q->requeued[i]);
+                q->queues[i] = qdisc_create_dflt(qd->dev, &pfifo_qdisc_ops,
+                                                 qd->handle);
+                if (q->queues[i] == 0) {
+                        q->queues[i] = &noop_qdisc;
+                        printk(KERN_ERR "%s child qdisc %i creation failed", dev->name, i);
+                }
+        }
+
+        return err;
+}
+
+static int wme_qdiscop_dump(struct Qdisc *qd, struct sk_buff *skb)
+{
+/*      struct ieee80211_sched_data *q = qdisc_priv(qd);
+        unsigned char *p = skb->tail;
+        struct tc_ieee80211_qopt opt;
+
+        memcpy(&opt.tag2queue, q->tag2queue, TC_80211_MAX_TAG + 1);
+        RTA_PUT(skb, TCA_OPTIONS, sizeof(opt), &opt);
+*/      return skb->len;
+/*
+rtattr_failure:
+        skb_trim(skb, p - skb->data);*/
+        return -1;
+}
+
+
+static int wme_classop_graft(struct Qdisc *qd, unsigned long arg,
+                             struct Qdisc *new, struct Qdisc **old)
+{
+        struct ieee80211_sched_data *q = qdisc_priv(qd);
+        struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr);
+        struct ieee80211_hw *hw = &local->hw;
+        unsigned long queue = arg - 1;
+
+        if (queue >= hw->queues)
+                return -EINVAL;
+
+        if (!new)
+                new = &noop_qdisc;
+
+        sch_tree_lock(qd);
+        *old = q->queues[queue];
+        q->queues[queue] = new;
+        qdisc_reset(*old);
+        sch_tree_unlock(qd);
+
+        return 0;
+}
+
+
+static struct Qdisc *
+wme_classop_leaf(struct Qdisc *qd, unsigned long arg)
+{
+        struct ieee80211_sched_data *q = qdisc_priv(qd);
+        struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr);
+        struct ieee80211_hw *hw = &local->hw;
+        unsigned long queue = arg - 1;
+
+        if (queue >= hw->queues)
+                return NULL;
+
+        return q->queues[queue];
+}
+
+
+static unsigned long wme_classop_get(struct Qdisc *qd, u32 classid)
+{
+        struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr);
+        struct ieee80211_hw *hw = &local->hw;
+        unsigned long queue = TC_H_MIN(classid);
+
+        if (queue - 1 >= hw->queues)
+                return 0;
+
+        return queue;
+}
+
+
+static unsigned long wme_classop_bind(struct Qdisc *qd, unsigned long parent,
+                                      u32 classid)
+{
+        return wme_classop_get(qd, classid);
+}
+
+
+static void wme_classop_put(struct Qdisc *q, unsigned long cl)
+{
+}
+
+
+static int wme_classop_change(struct Qdisc *qd, u32 handle, u32 parent,
+                              struct rtattr **tca, unsigned long *arg)
+{
+        unsigned long cl = *arg;
+        struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr);
+        struct ieee80211_hw *hw = &local->hw;
+
+        if (cl - 1 > hw->queues)
+                return -ENOENT;
+
+        /* TODO: put code to program hardware queue parameters here,
+         * to allow programming from tc command line */
+
+        return 0;
+}
+
+
+/* we don't support deleting hardware queues
+ * when we add WMM-SA support - TSPECs may be deleted here */
+static int wme_classop_delete(struct Qdisc *qd, unsigned long cl)
+{
+        struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr);
+        struct ieee80211_hw *hw = &local->hw;
+
+        if (cl - 1 > hw->queues)
+                return -ENOENT;
+        return 0;
+}
+
+
+static int wme_classop_dump_class(struct Qdisc *qd, unsigned long cl,
+                                  struct sk_buff *skb, struct tcmsg *tcm)
+{
+        struct ieee80211_sched_data *q = qdisc_priv(qd);
+        struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr);
+        struct ieee80211_hw *hw = &local->hw;
+
+        if (cl - 1 > hw->queues)
+                return -ENOENT;
+        tcm->tcm_handle = TC_H_MIN(cl);
+        tcm->tcm_parent = qd->handle;
+        tcm->tcm_info = q->queues[cl-1]->handle; /* do we need this? */
+        return 0;
+}
+
+
+static void wme_classop_walk(struct Qdisc *qd, struct qdisc_walker *arg)
+{
+        struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr);
+        struct ieee80211_hw *hw = &local->hw;
+        int queue;
+
+        if (arg->stop)
+                return;
+
+        for (queue = 0; queue < hw->queues; queue++) {
+                if (arg->count < arg->skip) {
+                        arg->count++;
+                        continue;
+                }
+                /* we should return classids for our internal queues here
+                 * as well as the external ones */
+                if (arg->fn(qd, queue+1, arg) < 0) {
+                        arg->stop = 1;
+                        break;
+                }
+                arg->count++;
+        }
+}
+
+
+static struct tcf_proto ** wme_classop_find_tcf(struct Qdisc *qd,
+                                                unsigned long cl)
+{
+        struct ieee80211_sched_data *q = qdisc_priv(qd);
+
+        if (cl)
+                return NULL;
+
+        return &q->filter_list;
+}
+
+
+/* this qdisc is classful (i.e. has classes, some of which may have leaf qdiscs attached)
+ * - these are the operations on the classes */
+static struct Qdisc_class_ops class_ops =
+{
+        .graft = wme_classop_graft,
+        .leaf = wme_classop_leaf,
+
+        .get = wme_classop_get,
+        .put = wme_classop_put,
+        .change = wme_classop_change,
+        .delete = wme_classop_delete,
+        .walk = wme_classop_walk,
+
+        .tcf_chain = wme_classop_find_tcf,
+        .bind_tcf = wme_classop_bind,
+        .unbind_tcf = wme_classop_put,
+
+        .dump = wme_classop_dump_class,
+};
+
+
+/* queueing discipline operations */
+static struct Qdisc_ops wme_qdisc_ops =
+{
+        .next = NULL,
+        .cl_ops = &class_ops,
+        .id = "ieee80211",
+        .priv_size = sizeof(struct ieee80211_sched_data),
+
+        .enqueue = wme_qdiscop_enqueue,
+        .dequeue = wme_qdiscop_dequeue,
+        .requeue = wme_qdiscop_requeue,
+        .drop = NULL, /* drop not needed since we are always the root qdisc */
+
+        .init = wme_qdiscop_init,
+        .reset = wme_qdiscop_reset,
+        .destroy = wme_qdiscop_destroy,
+        .change = wme_qdiscop_tune,
+
+        .dump = wme_qdiscop_dump,
+};
+
+
+void ieee80211_install_qdisc(struct net_device *dev)
+{
+        struct Qdisc *qdisc;
+
+        qdisc = qdisc_create_dflt(dev, &wme_qdisc_ops, TC_H_ROOT);
+        if (!qdisc) {
+                printk(KERN_ERR "%s: qdisc installation failed\n", dev->name);
+                return;
+        }
+
+        /* same handle as would be allocated by qdisc_alloc_handle() */
+        qdisc->handle = 0x80010000;
+
+        qdisc_lock_tree(dev);
+        list_add_tail(&qdisc->list, &dev->qdisc_list);
+        dev->qdisc_sleeping = qdisc;
+        qdisc_unlock_tree(dev);
+}
+
+
+int ieee80211_qdisc_installed(struct net_device *dev)
+{
+        return dev->qdisc_sleeping->ops == &wme_qdisc_ops;
+}
+
+
+int ieee80211_wme_register(void)
+{
+        return register_qdisc(&wme_qdisc_ops);
+}
+
+
+void ieee80211_wme_unregister(void)
+{
+        unregister_qdisc(&wme_qdisc_ops);
+}
+#endif /* CONFIG_NET_SCHED */
diff --git a/net/mac80211/wme.h b/net/mac80211/wme.h
new file mode 100644
index 000000000000..f0bff10f0e08
--- /dev/null
+++ b/net/mac80211/wme.h
@@ -0,0 +1,57 @@
+/*
+ * IEEE 802.11 driver (80211.o) - QoS datatypes
+ * Copyright 2004, Instant802 Networks, Inc.
+ * Copyright 2005, Devicescape Software, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef _WME_H
+#define _WME_H
+
+#include <linux/netdevice.h>
+#include "ieee80211_i.h"
+
+#define QOS_CONTROL_LEN 2
+
+#define QOS_CONTROL_ACK_POLICY_NORMAL 0
+#define QOS_CONTROL_ACK_POLICY_NOACK 1
+
+#define QOS_CONTROL_TID_MASK 0x0f
+#define QOS_CONTROL_ACK_POLICY_SHIFT 5
+
+#define QOS_CONTROL_TAG1D_MASK 0x07
+
+ieee80211_txrx_result
+ieee80211_rx_h_parse_qos(struct ieee80211_txrx_data *rx);
+
+ieee80211_txrx_result
+ieee80211_rx_h_remove_qos_control(struct ieee80211_txrx_data *rx);
+
+#ifdef CONFIG_NET_SCHED
+void ieee80211_install_qdisc(struct net_device *dev);
+int ieee80211_qdisc_installed(struct net_device *dev);
+
+int ieee80211_wme_register(void);
+void ieee80211_wme_unregister(void);
+#else
+static inline void ieee80211_install_qdisc(struct net_device *dev)
+{
+}
+static inline int ieee80211_qdisc_installed(struct net_device *dev)
+{
+        return 0;
+}
+
+static inline int ieee80211_wme_register(void)
+{
+        return 0;
+}
+static inline void ieee80211_wme_unregister(void)
+{
+}
+#endif /* CONFIG_NET_SCHED */
+
+#endif /* _WME_H */
diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c
new file mode 100644
index 000000000000..783af32c6911
--- /dev/null
+++ b/net/mac80211/wpa.c
@@ -0,0 +1,660 @@
+/*
+ * Copyright 2002-2004, Instant802 Networks, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/netdevice.h>
+#include <linux/types.h>
+#include <linux/slab.h>
+#include <linux/skbuff.h>
+#include <linux/compiler.h>
+#include <net/iw_handler.h>
+
+#include <net/mac80211.h>
+#include "ieee80211_common.h"
+#include "ieee80211_i.h"
+#include "michael.h"
+#include "tkip.h"
+#include "aes_ccm.h"
+#include "wpa.h"
+
+static int ieee80211_get_hdr_info(const struct sk_buff *skb, u8 **sa, u8 **da,
+                                  u8 *qos_tid, u8 **data, size_t *data_len)
+{
+        struct ieee80211_hdr *hdr;
+        size_t hdrlen;
+        u16 fc;
+        int a4_included;
+        u8 *pos;
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+        fc = le16_to_cpu(hdr->frame_control);
+
+        hdrlen = 24;
+        if ((fc & (IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS)) ==
+            (IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS)) {
+                hdrlen += ETH_ALEN;
+                *sa = hdr->addr4;
+                *da = hdr->addr3;
+        } else if (fc & IEEE80211_FCTL_FROMDS) {
+                *sa = hdr->addr3;
+                *da = hdr->addr1;
+        } else if (fc & IEEE80211_FCTL_TODS) {
+                *sa = hdr->addr2;
+                *da = hdr->addr3;
+        } else {
+                *sa = hdr->addr2;
+                *da = hdr->addr1;
+        }
+
+        if (fc & 0x80)
+                hdrlen += 2;
+
+        *data = skb->data + hdrlen;
+        *data_len = skb->len - hdrlen;
+
+        a4_included = (fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) ==
+                (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS);
+        if ((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA &&
+            fc & IEEE80211_STYPE_QOS_DATA) {
+                pos = (u8 *) &hdr->addr4;
+                if (a4_included)
+                        pos += 6;
+                *qos_tid = pos[0] & 0x0f;
+                *qos_tid |= 0x80; /* qos_included flag */
+        } else
+                *qos_tid = 0;
+
+        return skb->len < hdrlen ? -1 : 0;
+}
+
+
+ieee80211_txrx_result
+ieee80211_tx_h_michael_mic_add(struct ieee80211_txrx_data *tx)
+{
+        u8 *data, *sa, *da, *key, *mic, qos_tid;
+        size_t data_len;
+        u16 fc;
+        struct sk_buff *skb = tx->skb;
+        int authenticator;
+        int wpa_test = 0;
+
+        fc = tx->fc;
+
+        if (!tx->key || tx->key->alg != ALG_TKIP || skb->len < 24 ||
+            !WLAN_FC_DATA_PRESENT(fc))
+                return TXRX_CONTINUE;
+
+        if (ieee80211_get_hdr_info(skb, &sa, &da, &qos_tid, &data, &data_len))
+                return TXRX_DROP;
+
+        if (!tx->key->force_sw_encrypt &&
+            !tx->fragmented &&
+            !(tx->local->hw.flags & IEEE80211_HW_TKIP_INCLUDE_MMIC) &&
+            !wpa_test) {
+                /* hwaccel - with no need for preallocated room for Michael MIC
+                 */
+                return TXRX_CONTINUE;
+        }
+
+        if (skb_tailroom(skb) < MICHAEL_MIC_LEN) {
+                I802_DEBUG_INC(tx->local->tx_expand_skb_head);
+                if (unlikely(pskb_expand_head(skb, TKIP_IV_LEN,
+                                              MICHAEL_MIC_LEN + TKIP_ICV_LEN,
+                                              GFP_ATOMIC))) {
+                        printk(KERN_DEBUG "%s: failed to allocate more memory "
+                               "for Michael MIC\n", tx->dev->name);
+                        return TXRX_DROP;
+                }
+        }
+
+#if 0
+        authenticator = fc & IEEE80211_FCTL_FROMDS; /* FIX */
+#else
+        authenticator = 1;
+#endif
+        key = &tx->key->key[authenticator ? ALG_TKIP_TEMP_AUTH_TX_MIC_KEY :
+                            ALG_TKIP_TEMP_AUTH_RX_MIC_KEY];
+        mic = skb_put(skb, MICHAEL_MIC_LEN);
+        michael_mic(key, da, sa, qos_tid & 0x0f, data, data_len, mic);
+
+        return TXRX_CONTINUE;
+}
+
+
+ieee80211_txrx_result
+ieee80211_rx_h_michael_mic_verify(struct ieee80211_txrx_data *rx)
+{
+        u8 *data, *sa, *da, *key = NULL, qos_tid;
+        size_t data_len;
+        u16 fc;
+        u8 mic[MICHAEL_MIC_LEN];
+        struct sk_buff *skb = rx->skb;
+        int authenticator = 1, wpa_test = 0;
+
+        fc = rx->fc;
+
+        /* If device handles decryption totally, skip this check */
+        if ((rx->local->hw.flags & IEEE80211_HW_DEVICE_HIDES_WEP) ||
+            (rx->local->hw.flags & IEEE80211_HW_DEVICE_STRIPS_MIC))
+                return TXRX_CONTINUE;
+
+        if (!rx->key || rx->key->alg != ALG_TKIP ||
+            !(rx->fc & IEEE80211_FCTL_PROTECTED) || !WLAN_FC_DATA_PRESENT(fc))
+                return TXRX_CONTINUE;
+
+        if ((rx->u.rx.status->flag & RX_FLAG_DECRYPTED) &&
+            !rx->key->force_sw_encrypt) {
+                if (rx->local->hw.flags & IEEE80211_HW_WEP_INCLUDE_IV) {
+                        if (skb->len < MICHAEL_MIC_LEN)
+                                return TXRX_DROP;
+                }
+                /* Need to verify Michael MIC sometimes in software even when
+                 * hwaccel is used. Atheros ar5212: fragmented frames and QoS
+                 * frames. */
+                if (!rx->fragmented && !wpa_test)
+                        goto remove_mic;
+        }
+
+        if (ieee80211_get_hdr_info(skb, &sa, &da, &qos_tid, &data, &data_len)
+            || data_len < MICHAEL_MIC_LEN)
+                return TXRX_DROP;
+
+        data_len -= MICHAEL_MIC_LEN;
+
+#if 0
+        authenticator = fc & IEEE80211_FCTL_TODS; /* FIX */
+#else
+        authenticator = 1;
+#endif
+        key = &rx->key->key[authenticator ? ALG_TKIP_TEMP_AUTH_RX_MIC_KEY :
+                            ALG_TKIP_TEMP_AUTH_TX_MIC_KEY];
+        michael_mic(key, da, sa, qos_tid & 0x0f, data, data_len, mic);
+        if (memcmp(mic, data + data_len, MICHAEL_MIC_LEN) != 0 || wpa_test) {
+                if (!rx->u.rx.ra_match)
+                        return TXRX_DROP;
+
+                printk(KERN_DEBUG "%s: invalid Michael MIC in data frame from "
+                       MAC_FMT "\n", rx->dev->name, MAC_ARG(sa));
+
+                do {
+                        struct ieee80211_hdr *hdr;
+                        union iwreq_data wrqu;
+                        char *buf = kmalloc(128, GFP_ATOMIC);
+                        if (!buf)
+                                break;
+
+                        /* TODO: needed parameters: count, key type, TSC */
+                        hdr = (struct ieee80211_hdr *) skb->data;
+                        sprintf(buf, "MLME-MICHAELMICFAILURE.indication("
+                                "keyid=%d %scast addr=" MAC_FMT ")",
+                                rx->key->keyidx,
+                                hdr->addr1[0] & 0x01 ? "broad" : "uni",
+                                MAC_ARG(hdr->addr2));
+                        memset(&wrqu, 0, sizeof(wrqu));
+                        wrqu.data.length = strlen(buf);
+                        wireless_send_event(rx->dev, IWEVCUSTOM, &wrqu, buf);
+                        kfree(buf);
+                } while (0);
+
+                if (!rx->local->apdev)
+                        return TXRX_DROP;
+
+                ieee80211_rx_mgmt(rx->local, rx->skb, rx->u.rx.status,
+                                  ieee80211_msg_michael_mic_failure);
+
+                return TXRX_QUEUED;
+        }
+
+ remove_mic:
+        /* remove Michael MIC from payload */
+        skb_trim(skb, skb->len - MICHAEL_MIC_LEN);
+
+        return TXRX_CONTINUE;
+}
+
+
+static int tkip_encrypt_skb(struct ieee80211_txrx_data *tx,
+                            struct sk_buff *skb, int test)
+{
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+        struct ieee80211_key *key = tx->key;
+        int hdrlen, len, tailneed;
+        u16 fc;
+        u8 *pos;
+
+        fc = le16_to_cpu(hdr->frame_control);
+        hdrlen = ieee80211_get_hdrlen(fc);
+        len = skb->len - hdrlen;
+
+        tailneed = !tx->key->force_sw_encrypt ? 0 : TKIP_ICV_LEN;
+        if ((skb_headroom(skb) < TKIP_IV_LEN ||
+             skb_tailroom(skb) < tailneed)) {
+                I802_DEBUG_INC(tx->local->tx_expand_skb_head);
+                if (unlikely(pskb_expand_head(skb, TKIP_IV_LEN, tailneed,
+                                              GFP_ATOMIC)))
+                        return -1;
+        }
+
+        pos = skb_push(skb, TKIP_IV_LEN);
+        memmove(pos, pos + TKIP_IV_LEN, hdrlen);
+        pos += hdrlen;
+
+        /* Increase IV for the frame */
+        key->u.tkip.iv16++;
+        if (key->u.tkip.iv16 == 0)
+                key->u.tkip.iv32++;
+
+        if (!tx->key->force_sw_encrypt) {
+                u32 flags = tx->local->hw.flags;
+                hdr = (struct ieee80211_hdr *)skb->data;
+
+                /* hwaccel - with preallocated room for IV */
+                ieee80211_tkip_add_iv(pos, key,
+                                      (u8) (key->u.tkip.iv16 >> 8),
+                                      (u8) (((key->u.tkip.iv16 >> 8) | 0x20) &
+                                            0x7f),
+                                      (u8) key->u.tkip.iv16);
+
+                if (flags & IEEE80211_HW_TKIP_REQ_PHASE2_KEY)
+                        ieee80211_tkip_gen_rc4key(key, hdr->addr2,
+                                                  tx->u.tx.control->tkip_key);
+                else if (flags & IEEE80211_HW_TKIP_REQ_PHASE1_KEY) {
+                        if (key->u.tkip.iv16 == 0 ||
+                            !key->u.tkip.tx_initialized) {
+                                ieee80211_tkip_gen_phase1key(key, hdr->addr2,
+                                            (u16 *)tx->u.tx.control->tkip_key);
+                                key->u.tkip.tx_initialized = 1;
+                                tx->u.tx.control->flags |=
+                                            IEEE80211_TXCTL_TKIP_NEW_PHASE1_KEY;
+                        } else
+                                tx->u.tx.control->flags &=
+                                            ~IEEE80211_TXCTL_TKIP_NEW_PHASE1_KEY;
+                }
+
+                tx->u.tx.control->key_idx = tx->key->hw_key_idx;
+                return 0;
+        }
+
+        /* Add room for ICV */
+        skb_put(skb, TKIP_ICV_LEN);
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+        ieee80211_tkip_encrypt_data(tx->local->wep_tx_tfm,
+                                    key, pos, len, hdr->addr2);
+        return 0;
+}
+
+
+ieee80211_txrx_result
+ieee80211_tx_h_tkip_encrypt(struct ieee80211_txrx_data *tx)
+{
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) tx->skb->data;
+        u16 fc;
+        struct ieee80211_key *key = tx->key;
+        struct sk_buff *skb = tx->skb;
+        int wpa_test = 0, test = 0;
+
+        fc = le16_to_cpu(hdr->frame_control);
+
+        if (!key || key->alg != ALG_TKIP || !WLAN_FC_DATA_PRESENT(fc))
+                return TXRX_CONTINUE;
+
+        tx->u.tx.control->icv_len = TKIP_ICV_LEN;
+        tx->u.tx.control->iv_len = TKIP_IV_LEN;
+        ieee80211_tx_set_iswep(tx);
+
+        if (!tx->key->force_sw_encrypt &&
+            !(tx->local->hw.flags & IEEE80211_HW_WEP_INCLUDE_IV) &&
+            !wpa_test) {
+                /* hwaccel - with no need for preallocated room for IV/ICV */
+                tx->u.tx.control->key_idx = tx->key->hw_key_idx;
+                return TXRX_CONTINUE;
+        }
+
+        if (tkip_encrypt_skb(tx, skb, test) < 0)
+                return TXRX_DROP;
+
+        if (tx->u.tx.extra_frag) {
+                int i;
+                for (i = 0; i < tx->u.tx.num_extra_frag; i++) {
+                        if (tkip_encrypt_skb(tx, tx->u.tx.extra_frag[i], test)
+                            < 0)
+                                return TXRX_DROP;
+                }
+        }
+
+        return TXRX_CONTINUE;
+}
+
+
+ieee80211_txrx_result
+ieee80211_rx_h_tkip_decrypt(struct ieee80211_txrx_data *rx)
+{
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) rx->skb->data;
+        u16 fc;
+        int hdrlen, res, hwaccel = 0, wpa_test = 0;
+        struct ieee80211_key *key = rx->key;
+        struct sk_buff *skb = rx->skb;
+
+        fc = le16_to_cpu(hdr->frame_control);
+        hdrlen = ieee80211_get_hdrlen(fc);
+
+        if (!rx->key || rx->key->alg != ALG_TKIP ||
+            !(rx->fc & IEEE80211_FCTL_PROTECTED) ||
+            (rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA)
+                return TXRX_CONTINUE;
+
+        if (!rx->sta || skb->len - hdrlen < 12)
+                return TXRX_DROP;
+
+        if ((rx->u.rx.status->flag & RX_FLAG_DECRYPTED) &&
+            !rx->key->force_sw_encrypt) {
+                if (!(rx->local->hw.flags & IEEE80211_HW_WEP_INCLUDE_IV)) {
+                        /* Hardware takes care of all processing, including
+                         * replay protection, so no need to continue here. */
+                        return TXRX_CONTINUE;
+                }
+
+                /* let TKIP code verify IV, but skip decryption */
+                hwaccel = 1;
+        }
+
+        res = ieee80211_tkip_decrypt_data(rx->local->wep_rx_tfm,
+                                          key, skb->data + hdrlen,
+                                          skb->len - hdrlen, rx->sta->addr,
+                                          hwaccel, rx->u.rx.queue);
+        if (res != TKIP_DECRYPT_OK || wpa_test) {
+                printk(KERN_DEBUG "%s: TKIP decrypt failed for RX frame from "
+                       MAC_FMT " (res=%d)\n",
+                       rx->dev->name, MAC_ARG(rx->sta->addr), res);
+                return TXRX_DROP;
+        }
+
+        /* Trim ICV */
+        skb_trim(skb, skb->len - TKIP_ICV_LEN);
+
+        /* Remove IV */
+        memmove(skb->data + TKIP_IV_LEN, skb->data, hdrlen);
+        skb_pull(skb, TKIP_IV_LEN);
+
+        return TXRX_CONTINUE;
+}
+
+
+static void ccmp_special_blocks(struct sk_buff *skb, u8 *pn, u8 *b_0, u8 *aad,
+                                int encrypted)
+{
+        u16 fc;
+        int a4_included, qos_included;
+        u8 qos_tid, *fc_pos, *data, *sa, *da;
+        int len_a;
+        size_t data_len;
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+
+        fc_pos = (u8 *) &hdr->frame_control;
+        fc = fc_pos[0] ^ (fc_pos[1] << 8);
+        a4_included = (fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) ==
+                (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS);
+
+        ieee80211_get_hdr_info(skb, &sa, &da, &qos_tid, &data, &data_len);
+        data_len -= CCMP_HDR_LEN + (encrypted ? CCMP_MIC_LEN : 0);
+        if (qos_tid & 0x80) {
+                qos_included = 1;
+                qos_tid &= 0x0f;
+        } else
+                qos_included = 0;
+        /* First block, b_0 */
+
+        b_0[0] = 0x59; /* flags: Adata: 1, M: 011, L: 001 */
+        /* Nonce: QoS Priority | A2 | PN */
+        b_0[1] = qos_tid;
+        memcpy(&b_0[2], hdr->addr2, 6);
+        memcpy(&b_0[8], pn, CCMP_PN_LEN);
+        /* l(m) */
+        b_0[14] = (data_len >> 8) & 0xff;
+        b_0[15] = data_len & 0xff;
+
+
+        /* AAD (extra authenticate-only data) / masked 802.11 header
+         * FC | A1 | A2 | A3 | SC | [A4] | [QC] */
+
+        len_a = a4_included ? 28 : 22;
+        if (qos_included)
+                len_a += 2;
+
+        aad[0] = 0; /* (len_a >> 8) & 0xff; */
+        aad[1] = len_a & 0xff;
+        /* Mask FC: zero subtype b4 b5 b6 */
+        aad[2] = fc_pos[0] & ~(BIT(4) | BIT(5) | BIT(6));
+        /* Retry, PwrMgt, MoreData; set Protected */
+        aad[3] = (fc_pos[1] & ~(BIT(3) | BIT(4) | BIT(5))) | BIT(6);
+        memcpy(&aad[4], &hdr->addr1, 18);
+
+        /* Mask Seq#, leave Frag# */
+        aad[22] = *((u8 *) &hdr->seq_ctrl) & 0x0f;
+        aad[23] = 0;
+        if (a4_included) {
+                memcpy(&aad[24], hdr->addr4, 6);
+                aad[30] = 0;
+                aad[31] = 0;
+        } else
+                memset(&aad[24], 0, 8);
+        if (qos_included) {
+                u8 *dpos = &aad[a4_included ? 30 : 24];
+
+                /* Mask QoS Control field */
+                dpos[0] = qos_tid;
+                dpos[1] = 0;
+        }
+}
+
+
+static inline void ccmp_pn2hdr(u8 *hdr, u8 *pn, int key_id)
+{
+        hdr[0] = pn[5];
+        hdr[1] = pn[4];
+        hdr[2] = 0;
+        hdr[3] = 0x20 | (key_id << 6);
+        hdr[4] = pn[3];
+        hdr[5] = pn[2];
+        hdr[6] = pn[1];
+        hdr[7] = pn[0];
+}
+
+
+static inline int ccmp_hdr2pn(u8 *pn, u8 *hdr)
+{
+        pn[0] = hdr[7];
+        pn[1] = hdr[6];
+        pn[2] = hdr[5];
+        pn[3] = hdr[4];
+        pn[4] = hdr[1];
+        pn[5] = hdr[0];
+        return (hdr[3] >> 6) & 0x03;
+}
+
+
+static int ccmp_encrypt_skb(struct ieee80211_txrx_data *tx,
+                            struct sk_buff *skb, int test)
+{
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+        struct ieee80211_key *key = tx->key;
+        int hdrlen, len, tailneed;
+        u16 fc;
+        u8 *pos, *pn, *b_0, *aad, *scratch;
+        int i;
+
+        scratch = key->u.ccmp.tx_crypto_buf;
+        b_0 = scratch + 3 * AES_BLOCK_LEN;
+        aad = scratch + 4 * AES_BLOCK_LEN;
+
+        fc = le16_to_cpu(hdr->frame_control);
+        hdrlen = ieee80211_get_hdrlen(fc);
+        len = skb->len - hdrlen;
+
+        tailneed = !key->force_sw_encrypt ? 0 : CCMP_MIC_LEN;
+
+        if ((skb_headroom(skb) < CCMP_HDR_LEN ||
+             skb_tailroom(skb) < tailneed)) {
+                I802_DEBUG_INC(tx->local->tx_expand_skb_head);
+                if (unlikely(pskb_expand_head(skb, CCMP_HDR_LEN, tailneed,
+                                              GFP_ATOMIC)))
+                        return -1;
+        }
+
+        pos = skb_push(skb, CCMP_HDR_LEN);
+        memmove(pos, pos + CCMP_HDR_LEN, hdrlen);
+        hdr = (struct ieee80211_hdr *) pos;
+        pos += hdrlen;
+
+        /* PN = PN + 1 */
+        pn = key->u.ccmp.tx_pn;
+
+        for (i = CCMP_PN_LEN - 1; i >= 0; i--) {
+                pn[i]++;
+                if (pn[i])
+                        break;
+        }
+
+        ccmp_pn2hdr(pos, pn, key->keyidx);
+
+        if (!key->force_sw_encrypt) {
+                /* hwaccel - with preallocated room for CCMP header */
+                tx->u.tx.control->key_idx = key->hw_key_idx;
+                return 0;
+        }
+
+        pos += CCMP_HDR_LEN;
+        ccmp_special_blocks(skb, pn, b_0, aad, 0);
+        ieee80211_aes_ccm_encrypt(key->u.ccmp.tfm, scratch, b_0, aad, pos, len,
+                                  pos, skb_put(skb, CCMP_MIC_LEN));
+
+        return 0;
+}
+
+
+ieee80211_txrx_result
+ieee80211_tx_h_ccmp_encrypt(struct ieee80211_txrx_data *tx)
+{
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) tx->skb->data;
+        struct ieee80211_key *key = tx->key;
+        u16 fc;
+        struct sk_buff *skb = tx->skb;
+        int test = 0;
+
+        fc = le16_to_cpu(hdr->frame_control);
+
+        if (!key || key->alg != ALG_CCMP || !WLAN_FC_DATA_PRESENT(fc))
+                return TXRX_CONTINUE;
+
+        tx->u.tx.control->icv_len = CCMP_MIC_LEN;
+        tx->u.tx.control->iv_len = CCMP_HDR_LEN;
+        ieee80211_tx_set_iswep(tx);
+
+        if (!tx->key->force_sw_encrypt &&
+            !(tx->local->hw.flags & IEEE80211_HW_WEP_INCLUDE_IV)) {
+                /* hwaccel - with no need for preallocated room for CCMP "
+                 * header or MIC fields */
+                tx->u.tx.control->key_idx = tx->key->hw_key_idx;
+                return TXRX_CONTINUE;
+        }
+
+        if (ccmp_encrypt_skb(tx, skb, test) < 0)
+                return TXRX_DROP;
+
+        if (tx->u.tx.extra_frag) {
+                int i;
+
+                for (i = 0; i < tx->u.tx.num_extra_frag; i++) {
+                        if (ccmp_encrypt_skb(tx, tx->u.tx.extra_frag[i], test)
+                            < 0)
+                                return TXRX_DROP;
+                }
+        }
+
+        return TXRX_CONTINUE;
+}
+
+
+ieee80211_txrx_result
+ieee80211_rx_h_ccmp_decrypt(struct ieee80211_txrx_data *rx)
+{
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) rx->skb->data;
+        u16 fc;
+        int hdrlen;
+        struct ieee80211_key *key = rx->key;
+        struct sk_buff *skb = rx->skb;
+        u8 pn[CCMP_PN_LEN];
+        int data_len;
+
+        fc = le16_to_cpu(hdr->frame_control);
+        hdrlen = ieee80211_get_hdrlen(fc);
+
+        if (!key || key->alg != ALG_CCMP ||
+            !(rx->fc & IEEE80211_FCTL_PROTECTED) ||
+            (rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA)
+                return TXRX_CONTINUE;
+
+        data_len = skb->len - hdrlen - CCMP_HDR_LEN - CCMP_MIC_LEN;
+        if (!rx->sta || data_len < 0)
+                return TXRX_DROP;
+
+        if ((rx->u.rx.status->flag & RX_FLAG_DECRYPTED) &&
+            !key->force_sw_encrypt &&
+            !(rx->local->hw.flags & IEEE80211_HW_WEP_INCLUDE_IV))
+                return TXRX_CONTINUE;
+
+        (void) ccmp_hdr2pn(pn, skb->data + hdrlen);
+
+        if (memcmp(pn, key->u.ccmp.rx_pn[rx->u.rx.queue], CCMP_PN_LEN) <= 0) {
+#ifdef CONFIG_MAC80211_DEBUG
+                u8 *ppn = key->u.ccmp.rx_pn[rx->u.rx.queue];
+                printk(KERN_DEBUG "%s: CCMP replay detected for RX frame from "
+                       MAC_FMT " (RX PN %02x%02x%02x%02x%02x%02x <= prev. PN "
+                       "%02x%02x%02x%02x%02x%02x)\n", rx->dev->name,
+                       MAC_ARG(rx->sta->addr),
+                       pn[0], pn[1], pn[2], pn[3], pn[4], pn[5],
+                       ppn[0], ppn[1], ppn[2], ppn[3], ppn[4], ppn[5]);
+#endif /* CONFIG_MAC80211_DEBUG */
+                key->u.ccmp.replays++;
+                return TXRX_DROP;
+        }
+
+        if ((rx->u.rx.status->flag & RX_FLAG_DECRYPTED) &&
+            !key->force_sw_encrypt) {
+                /* hwaccel has already decrypted frame and verified MIC */
+        } else {
+                u8 *scratch, *b_0, *aad;
+
+                scratch = key->u.ccmp.rx_crypto_buf;
+                b_0 = scratch + 3 * AES_BLOCK_LEN;
+                aad = scratch + 4 * AES_BLOCK_LEN;
+
+                ccmp_special_blocks(skb, pn, b_0, aad, 1);
+
+                if (ieee80211_aes_ccm_decrypt(
+                            key->u.ccmp.tfm, scratch, b_0, aad,
+                            skb->data + hdrlen + CCMP_HDR_LEN, data_len,
+                            skb->data + skb->len - CCMP_MIC_LEN,
+                            skb->data + hdrlen + CCMP_HDR_LEN)) {
+                        printk(KERN_DEBUG "%s: CCMP decrypt failed for RX "
+                               "frame from " MAC_FMT "\n", rx->dev->name,
+                               MAC_ARG(rx->sta->addr));
+                        return TXRX_DROP;
+                }
+        }
+
+        memcpy(key->u.ccmp.rx_pn[rx->u.rx.queue], pn, CCMP_PN_LEN);
+
+        /* Remove CCMP header and MIC */
+        skb_trim(skb, skb->len - CCMP_MIC_LEN);
+        memmove(skb->data + CCMP_HDR_LEN, skb->data, hdrlen);
+        skb_pull(skb, CCMP_HDR_LEN);
+
+        return TXRX_CONTINUE;
+}
+
diff --git a/net/mac80211/wpa.h b/net/mac80211/wpa.h
new file mode 100644
index 000000000000..da3b9594f9c3
--- /dev/null
+++ b/net/mac80211/wpa.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2002-2004, Instant802 Networks, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef WPA_H
+#define WPA_H
+
+#include <linux/skbuff.h>
+#include <linux/types.h>
+#include "ieee80211_i.h"
+
+ieee80211_txrx_result
+ieee80211_tx_h_michael_mic_add(struct ieee80211_txrx_data *tx);
+ieee80211_txrx_result
+ieee80211_rx_h_michael_mic_verify(struct ieee80211_txrx_data *rx);
+
+ieee80211_txrx_result
+ieee80211_tx_h_tkip_encrypt(struct ieee80211_txrx_data *tx);
+ieee80211_txrx_result
+ieee80211_rx_h_tkip_decrypt(struct ieee80211_txrx_data *rx);
+
+ieee80211_txrx_result
+ieee80211_tx_h_ccmp_encrypt(struct ieee80211_txrx_data *tx);
+ieee80211_txrx_result
+ieee80211_rx_h_ccmp_decrypt(struct ieee80211_txrx_data *rx);
+
+#endif /* WPA_H */