112 files changed, 19125 insertions, 1070 deletions

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index c0c7bb8e9f07..bd93c45778d4 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -117,8 +117,7 @@ static void __exit vlan_cleanup_devices(void)
         struct net_device *dev, *nxt;
 
         rtnl_lock();
-        for (dev = dev_base; dev; dev = nxt) {
-                nxt = dev->next;
+        for_each_netdev_safe(dev, nxt) {
                 if (dev->priv_flags & IFF_802_1Q_VLAN) {
                         unregister_vlan_dev(VLAN_DEV_INFO(dev)->real_dev,
                                             VLAN_DEV_INFO(dev)->vlan_id);
diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c
index 5e24f72602a1..d216a64421cd 100644
--- a/net/8021q/vlanproc.c
+++ b/net/8021q/vlanproc.c
@@ -237,13 +237,9 @@ int vlan_proc_rem_dev(struct net_device *vlandev)
  * The following few functions build the content of /proc/net/vlan/config
  */
 
-/* starting at dev, find a VLAN device */
-static struct net_device *vlan_skip(struct net_device *dev)
+static inline int is_vlan_dev(struct net_device *dev)
 {
-        while (dev && !(dev->priv_flags & IFF_802_1Q_VLAN))
-                dev = dev->next;
-
-        return dev;
+        return dev->priv_flags & IFF_802_1Q_VLAN;
 }
 
 /* start read of /proc/net/vlan/config */
@@ -257,19 +253,35 @@ static void *vlan_seq_start(struct seq_file *seq, loff_t *pos)
         if (*pos == 0)
                 return SEQ_START_TOKEN;
 
-        for (dev = vlan_skip(dev_base); dev && i < *pos;
-             dev = vlan_skip(dev->next), ++i);
+        for_each_netdev(dev) {
+                if (!is_vlan_dev(dev))
+                        continue;
+
+                if (i++ == *pos)
+                        return dev;
+        }
 
-        return  (i == *pos) ? dev : NULL;
+        return  NULL;
 }
 
 static void *vlan_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
+        struct net_device *dev;
+
         ++*pos;
 
-        return vlan_skip((v == SEQ_START_TOKEN)
-                            ? dev_base
-                            : ((struct net_device *)v)->next);
+        dev = (struct net_device *)v;
+        if (v == SEQ_START_TOKEN)
+                dev = net_device_entry(&dev_base_head);
+
+        for_each_netdev_continue(dev) {
+                if (!is_vlan_dev(dev))
+                        continue;
+
+                return dev;
+        }
+
+        return NULL;
 }
 
 static void vlan_seq_stop(struct seq_file *seq, void *v)
diff --git a/net/Kconfig b/net/Kconfig
index 2fc8e77b1e62..caeacd16656a 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -220,10 +220,13 @@ config FIB_RULES
 menu "Wireless"
 
 source "net/wireless/Kconfig"
+source "net/mac80211/Kconfig"
 source "net/ieee80211/Kconfig"
 
 endmenu
 
+source "net/rfkill/Kconfig"
+
 endif   # if NET
 endmenu # Networking
 
diff --git a/net/Makefile b/net/Makefile
index 6b74d4118c5b..34e5b2d7f877 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -45,13 +45,14 @@ 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/
 obj-$(CONFIG_IUCV)              += iucv/
+obj-$(CONFIG_RFKILL)            += rfkill/
 
 ifeq ($(CONFIG_NET),y)
 obj-$(CONFIG_SYSCTL)            += sysctl_net.o
 endif
-
-obj-y                           += wireless/
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index 832b5f44be5c..bfc9a35bad33 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -499,6 +499,15 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname, char
                 break;
 
         case HCI_FILTER:
+                {
+                        struct hci_filter *f = &hci_pi(sk)->filter;
+
+                        uf.type_mask = f->type_mask;
+                        uf.opcode    = f->opcode;
+                        uf.event_mask[0] = *((u32 *) f->event_mask + 0);
+                        uf.event_mask[1] = *((u32 *) f->event_mask + 1);
+                }
+
                 len = min_t(unsigned int, len, sizeof(uf));
                 if (copy_from_user(&uf, optval, len)) {
                         err = -EFAULT;
diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c
index 801d687ea4ef..25835403d659 100644
--- a/net/bluetooth/hci_sysfs.c
+++ b/net/bluetooth/hci_sysfs.c
@@ -305,7 +305,7 @@ int hci_register_sysfs(struct hci_dev *hdev)
 
         BT_DBG("%p name %s type %d", hdev, hdev->name, hdev->type);
 
-        dev->class = bt_class;
+        dev->bus = &bt_bus;
         dev->parent = hdev->parent;
 
         strlcpy(dev->bus_id, hdev->name, BUS_ID_SIZE);
@@ -322,6 +322,10 @@ int hci_register_sysfs(struct hci_dev *hdev)
                 if (device_create_file(dev, bt_attrs[i]) < 0)
                         BT_ERR("Failed to create device attribute");
 
+        if (sysfs_create_link(&bt_class->subsys.kobj,
+                                &dev->kobj, kobject_name(&dev->kobj)) < 0)
+                BT_ERR("Failed to create class symlink");
+
         return 0;
 }
 
@@ -329,6 +333,9 @@ void hci_unregister_sysfs(struct hci_dev *hdev)
 {
         BT_DBG("%p name %s type %d", hdev, hdev->name, hdev->type);
 
+        sysfs_remove_link(&bt_class->subsys.kobj,
+                                        kobject_name(&hdev->dev.kobj));
+
         device_del(&hdev->dev);
 }
 
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index a5867879b615..a59b1fb63b76 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -954,11 +954,17 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
 
         switch (optname) {
         case L2CAP_OPTIONS:
+                opts.imtu     = l2cap_pi(sk)->imtu;
+                opts.omtu     = l2cap_pi(sk)->omtu;
+                opts.flush_to = l2cap_pi(sk)->flush_to;
+                opts.mode     = 0x00;
+
                 len = min_t(unsigned int, sizeof(opts), optlen);
                 if (copy_from_user((char *) &opts, optval, len)) {
                         err = -EFAULT;
                         break;
                 }
+
                 l2cap_pi(sk)->imtu  = opts.imtu;
                 l2cap_pi(sk)->omtu  = opts.omtu;
                 break;
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
index fe7df90eb707..52e04df323ea 100644
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
@@ -622,7 +622,7 @@ static struct rfcomm_session *rfcomm_session_create(bdaddr_t *src, bdaddr_t *dst
         bacpy(&addr.l2_bdaddr, src);
         addr.l2_family = AF_BLUETOOTH;
         addr.l2_psm    = 0;
-        *err = sock->ops->bind(sock, (struct sockaddr *) &addr, sizeof(addr));
+        *err = kernel_bind(sock, (struct sockaddr *) &addr, sizeof(addr));
         if (*err < 0)
                 goto failed;
 
@@ -643,7 +643,7 @@ static struct rfcomm_session *rfcomm_session_create(bdaddr_t *src, bdaddr_t *dst
         bacpy(&addr.l2_bdaddr, dst);
         addr.l2_family = AF_BLUETOOTH;
         addr.l2_psm    = htobs(RFCOMM_PSM);
-        *err = sock->ops->connect(sock, (struct sockaddr *) &addr, sizeof(addr), O_NONBLOCK);
+        *err = kernel_connect(sock, (struct sockaddr *) &addr, sizeof(addr), O_NONBLOCK);
         if (*err == 0 || *err == -EINPROGRESS)
                 return s;
 
@@ -1058,6 +1058,12 @@ static int rfcomm_recv_ua(struct rfcomm_session *s, u8 dlci)
                 case BT_DISCONN:
                         d->state = BT_CLOSED;
                         __rfcomm_dlc_close(d, 0);
+
+                        if (list_empty(&s->dlcs)) {
+                                s->state = BT_DISCONN;
+                                rfcomm_send_disc(s, 0);
+                        }
+
                         break;
                 }
         } else {
@@ -1067,6 +1073,10 @@ static int rfcomm_recv_ua(struct rfcomm_session *s, u8 dlci)
                         s->state = BT_CONNECTED;
                         rfcomm_process_connect(s);
                         break;
+
+                case BT_DISCONN:
+                        rfcomm_session_put(s);
+                        break;
                 }
         }
         return 0;
@@ -1757,19 +1767,12 @@ static inline void rfcomm_accept_connection(struct rfcomm_session *s)
 
         BT_DBG("session %p", s);
 
-        if (sock_create_lite(PF_BLUETOOTH, sock->type, BTPROTO_L2CAP, &nsock))
+        err = kernel_accept(sock, &nsock, O_NONBLOCK);
+        if (err < 0)
                 return;
 
-        nsock->ops  = sock->ops;
-
         __module_get(nsock->ops->owner);
 
-        err = sock->ops->accept(sock, nsock, O_NONBLOCK);
-        if (err < 0) {
-                sock_release(nsock);
-                return;
-        }
-
         /* Set our callbacks */
         nsock->sk->sk_data_ready   = rfcomm_l2data_ready;
         nsock->sk->sk_state_change = rfcomm_l2state_change;
@@ -1885,7 +1888,7 @@ static int rfcomm_add_listener(bdaddr_t *ba)
         bacpy(&addr.l2_bdaddr, ba);
         addr.l2_family = AF_BLUETOOTH;
         addr.l2_psm    = htobs(RFCOMM_PSM);
-        err = sock->ops->bind(sock, (struct sockaddr *) &addr, sizeof(addr));
+        err = kernel_bind(sock, (struct sockaddr *) &addr, sizeof(addr));
         if (err < 0) {
                 BT_ERR("Bind failed %d", err);
                 goto failed;
@@ -1898,7 +1901,7 @@ static int rfcomm_add_listener(bdaddr_t *ba)
         release_sock(sk);
 
         /* Start listening on the socket */
-        err = sock->ops->listen(sock, 10);
+        err = kernel_listen(sock, 10);
         if (err) {
                 BT_ERR("Listen failed %d", err);
                 goto failed;
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
index 9a7a44fc721f..b2b1cceb102a 100644
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@ -517,9 +517,10 @@ static void rfcomm_dev_state_change(struct rfcomm_dlc *dlc, int err)
         if (dlc->state == BT_CLOSED) {
                 if (!dev->tty) {
                         if (test_bit(RFCOMM_RELEASE_ONHUP, &dev->flags)) {
-                                rfcomm_dev_hold(dev);
-                                rfcomm_dev_del(dev);
+                                if (rfcomm_dev_get(dev->id) == NULL)
+                                        return;
 
+                                rfcomm_dev_del(dev);
                                 /* We have to drop DLC lock here, otherwise
                                    rfcomm_dev_put() will dead lock if it's
                                    the last reference. */
@@ -974,8 +975,12 @@ static void rfcomm_tty_hangup(struct tty_struct *tty)
 
         rfcomm_tty_flush_buffer(tty);
 
-        if (test_bit(RFCOMM_RELEASE_ONHUP, &dev->flags))
+        if (test_bit(RFCOMM_RELEASE_ONHUP, &dev->flags)) {
+                if (rfcomm_dev_get(dev->id) == NULL)
+                        return;
                 rfcomm_dev_del(dev);
+                rfcomm_dev_put(dev);
+        }
 }
 
 static int rfcomm_tty_read_proc(char *buf, char **start, off_t offset, int len, int *eof, void *unused)
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 690573bbf012..849deaf14108 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -475,11 +475,9 @@ void __exit br_cleanup_bridges(void)
         struct net_device *dev, *nxt;
 
         rtnl_lock();
-        for (dev = dev_base; dev; dev = nxt) {
-                nxt = dev->next;
+        for_each_netdev_safe(dev, nxt)
                 if (dev->priv_flags & IFF_EBRIDGE)
                         del_br(dev->priv);
-        }
         rtnl_unlock();
 
 }
diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c
index eda0fbfc923a..bb15e9e259b1 100644
--- a/net/bridge/br_ioctl.c
+++ b/net/bridge/br_ioctl.c
@@ -27,7 +27,9 @@ static int get_bridge_ifindices(int *indices, int num)
         struct net_device *dev;
         int i = 0;
 
-        for (dev = dev_base; dev && i < num; dev = dev->next) {
+        for_each_netdev(dev) {
+                if (i >= num)
+                        break;
                 if (dev->priv_flags & IFF_EBRIDGE)
                         indices[i++] = dev->ifindex;
         }
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index 9b2986b182ba..fa779874b9dd 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -142,14 +142,33 @@ static inline struct nf_bridge_info *nf_bridge_alloc(struct sk_buff *skb)
         return skb->nf_bridge;
 }
 
-static inline void nf_bridge_save_header(struct sk_buff *skb)
+static inline void nf_bridge_push_encap_header(struct sk_buff *skb)
+{
+        unsigned int len = nf_bridge_encap_header_len(skb);
+
+        skb_push(skb, len);
+        skb->network_header -= len;
+}
+
+static inline void nf_bridge_pull_encap_header(struct sk_buff *skb)
 {
-        int header_size = ETH_HLEN;
+        unsigned int len = nf_bridge_encap_header_len(skb);
+
+        skb_pull(skb, len);
+        skb->network_header += len;
+}
 
-        if (skb->protocol == htons(ETH_P_8021Q))
-                header_size += VLAN_HLEN;
-        else if (skb->protocol == htons(ETH_P_PPP_SES))
-                header_size += PPPOE_SES_HLEN;
+static inline void nf_bridge_pull_encap_header_rcsum(struct sk_buff *skb)
+{
+        unsigned int len = nf_bridge_encap_header_len(skb);
+
+        skb_pull_rcsum(skb, len);
+        skb->network_header += len;
+}
+
+static inline void nf_bridge_save_header(struct sk_buff *skb)
+{
+        int header_size = ETH_HLEN + nf_bridge_encap_header_len(skb);
 
         skb_copy_from_linear_data_offset(skb, -header_size,
                                          skb->nf_bridge->data, header_size);
@@ -162,12 +181,7 @@ static inline void nf_bridge_save_header(struct sk_buff *skb)
 int nf_bridge_copy_header(struct sk_buff *skb)
 {
         int err;
-        int header_size = ETH_HLEN;
-
-        if (skb->protocol == htons(ETH_P_8021Q))
-                header_size += VLAN_HLEN;
-        else if (skb->protocol == htons(ETH_P_PPP_SES))
-                header_size += PPPOE_SES_HLEN;
+        int header_size = ETH_HLEN + nf_bridge_encap_header_len(skb);
 
         err = skb_cow(skb, header_size);
         if (err)
@@ -175,11 +189,7 @@ int nf_bridge_copy_header(struct sk_buff *skb)
 
         skb_copy_to_linear_data_offset(skb, -header_size,
                                        skb->nf_bridge->data, header_size);
-
-        if (skb->protocol == htons(ETH_P_8021Q))
-                __skb_push(skb, VLAN_HLEN);
-        else if (skb->protocol == htons(ETH_P_PPP_SES))
-                __skb_push(skb, PPPOE_SES_HLEN);
+        __skb_push(skb, nf_bridge_encap_header_len(skb));
         return 0;
 }
 
@@ -200,13 +210,7 @@ static int br_nf_pre_routing_finish_ipv6(struct sk_buff *skb)
         dst_hold(skb->dst);
 
         skb->dev = nf_bridge->physindev;
-        if (skb->protocol == htons(ETH_P_8021Q)) {
-                skb_push(skb, VLAN_HLEN);
-                skb->network_header -= VLAN_HLEN;
-        } else if (skb->protocol == htons(ETH_P_PPP_SES)) {
-                skb_push(skb, PPPOE_SES_HLEN);
-                skb->network_header -= PPPOE_SES_HLEN;
-        }
+        nf_bridge_push_encap_header(skb);
         NF_HOOK_THRESH(PF_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
                        br_handle_frame_finish, 1);
 
@@ -284,13 +288,7 @@ static int br_nf_pre_routing_finish_bridge(struct sk_buff *skb)
         if (!skb->dev)
                 kfree_skb(skb);
         else {
-                if (skb->protocol == htons(ETH_P_8021Q)) {
-                        skb_pull(skb, VLAN_HLEN);
-                        skb->network_header += VLAN_HLEN;
-                } else if (skb->protocol == htons(ETH_P_PPP_SES)) {
-                        skb_pull(skb, PPPOE_SES_HLEN);
-                        skb->network_header += PPPOE_SES_HLEN;
-                }
+                nf_bridge_pull_encap_header(skb);
                 skb->dst->output(skb);
         }
         return 0;
@@ -356,15 +354,7 @@ bridged_dnat:
                                  * bridged frame */
                                 nf_bridge->mask |= BRNF_BRIDGED_DNAT;
                                 skb->dev = nf_bridge->physindev;
-                                if (skb->protocol ==
-                                    htons(ETH_P_8021Q)) {
-                                        skb_push(skb, VLAN_HLEN);
-                                        skb->network_header -= VLAN_HLEN;
-                                } else if(skb->protocol ==
-                                    htons(ETH_P_PPP_SES)) {
-                                        skb_push(skb, PPPOE_SES_HLEN);
-                                        skb->network_header -= PPPOE_SES_HLEN;
-                                }
+                                nf_bridge_push_encap_header(skb);
                                 NF_HOOK_THRESH(PF_BRIDGE, NF_BR_PRE_ROUTING,
                                                skb, skb->dev, NULL,
                                                br_nf_pre_routing_finish_bridge,
@@ -380,13 +370,7 @@ bridged_dnat:
         }
 
         skb->dev = nf_bridge->physindev;
-        if (skb->protocol == htons(ETH_P_8021Q)) {
-                skb_push(skb, VLAN_HLEN);
-                skb->network_header -= VLAN_HLEN;
-        } else if (skb->protocol == htons(ETH_P_PPP_SES)) {
-                skb_push(skb, PPPOE_SES_HLEN);
-                skb->network_header -= PPPOE_SES_HLEN;
-        }
+        nf_bridge_push_encap_header(skb);
         NF_HOOK_THRESH(PF_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
                        br_handle_frame_finish, 1);
 
@@ -536,14 +520,7 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb,
 #endif
                 if ((skb = skb_share_check(*pskb, GFP_ATOMIC)) == NULL)
                         goto out;
-
-                if (skb->protocol == htons(ETH_P_8021Q)) {
-                        skb_pull_rcsum(skb, VLAN_HLEN);
-                        skb->network_header += VLAN_HLEN;
-                } else if (skb->protocol == htons(ETH_P_PPP_SES)) {
-                        skb_pull_rcsum(skb, PPPOE_SES_HLEN);
-                        skb->network_header += PPPOE_SES_HLEN;
-                }
+                nf_bridge_pull_encap_header_rcsum(skb);
                 return br_nf_pre_routing_ipv6(hook, skb, in, out, okfn);
         }
 #ifdef CONFIG_SYSCTL
@@ -557,14 +534,7 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb,
 
         if ((skb = skb_share_check(*pskb, GFP_ATOMIC)) == NULL)
                 goto out;
-
-        if (skb->protocol == htons(ETH_P_8021Q)) {
-                skb_pull_rcsum(skb, VLAN_HLEN);
-                skb->network_header += VLAN_HLEN;
-        } else if (skb->protocol == htons(ETH_P_PPP_SES)) {
-                skb_pull_rcsum(skb, PPPOE_SES_HLEN);
-                skb->network_header += PPPOE_SES_HLEN;
-        }
+        nf_bridge_pull_encap_header_rcsum(skb);
 
         if (!pskb_may_pull(skb, sizeof(struct iphdr)))
                 goto inhdr_error;
@@ -642,13 +612,7 @@ static int br_nf_forward_finish(struct sk_buff *skb)
         } else {
                 in = *((struct net_device **)(skb->cb));
         }
-        if (skb->protocol == htons(ETH_P_8021Q)) {
-                skb_push(skb, VLAN_HLEN);
-                skb->network_header -= VLAN_HLEN;
-        } else if (skb->protocol == htons(ETH_P_PPP_SES)) {
-                skb_push(skb, PPPOE_SES_HLEN);
-                skb->network_header -= PPPOE_SES_HLEN;
-        }
+        nf_bridge_push_encap_header(skb);
         NF_HOOK_THRESH(PF_BRIDGE, NF_BR_FORWARD, skb, in,
                        skb->dev, br_forward_finish, 1);
         return 0;
@@ -682,13 +646,7 @@ static unsigned int br_nf_forward_ip(unsigned int hook, struct sk_buff **pskb,
         else
                 pf = PF_INET6;
 
-        if (skb->protocol == htons(ETH_P_8021Q)) {
-                skb_pull(*pskb, VLAN_HLEN);
-                (*pskb)->network_header += VLAN_HLEN;
-        } else if (skb->protocol == htons(ETH_P_PPP_SES)) {
-                skb_pull(*pskb, PPPOE_SES_HLEN);
-                (*pskb)->network_header += PPPOE_SES_HLEN;
-        }
+        nf_bridge_pull_encap_header(*pskb);
 
         nf_bridge = skb->nf_bridge;
         if (skb->pkt_type == PACKET_OTHERHOST) {
@@ -722,15 +680,12 @@ static unsigned int br_nf_forward_arp(unsigned int hook, struct sk_buff **pskb,
         if (skb->protocol != htons(ETH_P_ARP)) {
                 if (!IS_VLAN_ARP(skb))
                         return NF_ACCEPT;
-                skb_pull(*pskb, VLAN_HLEN);
-                (*pskb)->network_header += VLAN_HLEN;
+                nf_bridge_pull_encap_header(*pskb);
         }
 
         if (arp_hdr(skb)->ar_pln != 4) {
-                if (IS_VLAN_ARP(skb)) {
-                        skb_push(*pskb, VLAN_HLEN);
-                        (*pskb)->network_header -= VLAN_HLEN;
-                }
+                if (IS_VLAN_ARP(skb))
+                        nf_bridge_push_encap_header(*pskb);
                 return NF_ACCEPT;
         }
         *d = (struct net_device *)in;
@@ -777,13 +732,7 @@ static unsigned int br_nf_local_out(unsigned int hook, struct sk_buff **pskb,
                 skb->pkt_type = PACKET_OTHERHOST;
                 nf_bridge->mask ^= BRNF_PKT_TYPE;
         }
-        if (skb->protocol == htons(ETH_P_8021Q)) {
-                skb_push(skb, VLAN_HLEN);
-                skb->network_header -= VLAN_HLEN;
-        } else if (skb->protocol == htons(ETH_P_PPP_SES)) {
-                skb_push(skb, PPPOE_SES_HLEN);
-                skb->network_header -= PPPOE_SES_HLEN;
-        }
+        nf_bridge_push_encap_header(skb);
 
         NF_HOOK(PF_BRIDGE, NF_BR_FORWARD, skb, realindev, skb->dev,
                 br_forward_finish);
@@ -848,14 +797,7 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb,
                 nf_bridge->mask |= BRNF_PKT_TYPE;
         }
 
-        if (skb->protocol == htons(ETH_P_8021Q)) {
-                skb_pull(skb, VLAN_HLEN);
-                skb->network_header += VLAN_HLEN;
-        } else if (skb->protocol == htons(ETH_P_PPP_SES)) {
-                skb_pull(skb, PPPOE_SES_HLEN);
-                skb->network_header += PPPOE_SES_HLEN;
-        }
-
+        nf_bridge_pull_encap_header(skb);
         nf_bridge_save_header(skb);
 
 #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 35facc0c11c2..0fcf6f073064 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -109,7 +109,8 @@ static int br_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)
         struct net_device *dev;
         int idx;
 
-        for (dev = dev_base, idx = 0; dev; dev = dev->next) {
+        idx = 0;
+        for_each_netdev(dev) {
                 /* not a bridge port */
                 if (dev->br_port == NULL || idx < cb->args[0])
                         goto skip;
diff --git a/net/core/dev.c b/net/core/dev.c
index eb999003bbb7..4317c1be4d3f 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -156,13 +156,13 @@ static spinlock_t net_dma_event_lock;
 #endif
 
 /*
- * The @dev_base list is protected by @dev_base_lock and the rtnl
+ * The @dev_base_head list is protected by @dev_base_lock and the rtnl
  * semaphore.
  *
  * Pure readers hold dev_base_lock for reading.
  *
  * Writers must hold the rtnl semaphore while they loop through the
- * dev_base list, and hold dev_base_lock for writing when they do the
+ * dev_base_head list, and hold dev_base_lock for writing when they do the
  * actual updates.  This allows pure readers to access the list even
  * while a writer is preparing to update it.
  *
@@ -174,11 +174,10 @@ static spinlock_t net_dma_event_lock;
  * unregister_netdevice(), which must be called with the rtnl
  * semaphore held.
  */
-struct net_device *dev_base;
-static struct net_device **dev_tail = &dev_base;
+LIST_HEAD(dev_base_head);
 DEFINE_RWLOCK(dev_base_lock);
 
-EXPORT_SYMBOL(dev_base);
+EXPORT_SYMBOL(dev_base_head);
 EXPORT_SYMBOL(dev_base_lock);
 
 #define NETDEV_HASHBITS 8
@@ -567,26 +566,38 @@ struct net_device *dev_getbyhwaddr(unsigned short type, char *ha)
 
         ASSERT_RTNL();
 
-        for (dev = dev_base; dev; dev = dev->next)
+        for_each_netdev(dev)
                 if (dev->type == type &&
                     !memcmp(dev->dev_addr, ha, dev->addr_len))
-                        break;
-        return dev;
+                        return dev;
+
+        return NULL;
 }
 
 EXPORT_SYMBOL(dev_getbyhwaddr);
 
+struct net_device *__dev_getfirstbyhwtype(unsigned short type)
+{
+        struct net_device *dev;
+
+        ASSERT_RTNL();
+        for_each_netdev(dev)
+                if (dev->type == type)
+                        return dev;
+
+        return NULL;
+}
+
+EXPORT_SYMBOL(__dev_getfirstbyhwtype);
+
 struct net_device *dev_getfirstbyhwtype(unsigned short type)
 {
         struct net_device *dev;
 
         rtnl_lock();
-        for (dev = dev_base; dev; dev = dev->next) {
-                if (dev->type == type) {
-                        dev_hold(dev);
-                        break;
-                }
-        }
+        dev = __dev_getfirstbyhwtype(type);
+        if (dev)
+                dev_hold(dev);
         rtnl_unlock();
         return dev;
 }
@@ -606,17 +617,19 @@ EXPORT_SYMBOL(dev_getfirstbyhwtype);
 
 struct net_device * dev_get_by_flags(unsigned short if_flags, unsigned short mask)
 {
-        struct net_device *dev;
+        struct net_device *dev, *ret;
 
+        ret = NULL;
         read_lock(&dev_base_lock);
-        for (dev = dev_base; dev != NULL; dev = dev->next) {
+        for_each_netdev(dev) {
                 if (((dev->flags ^ if_flags) & mask) == 0) {
                         dev_hold(dev);
+                        ret = dev;
                         break;
                 }
         }
         read_unlock(&dev_base_lock);
-        return dev;
+        return ret;
 }
 
 /**
@@ -682,7 +695,7 @@ int dev_alloc_name(struct net_device *dev, const char *name)
                 if (!inuse)
                         return -ENOMEM;
 
-                for (d = dev_base; d; d = d->next) {
+                for_each_netdev(d) {
                         if (!sscanf(d->name, name, &i))
                                 continue;
                         if (i < 0 || i >= max_netdevices)
@@ -964,7 +977,7 @@ int register_netdevice_notifier(struct notifier_block *nb)
         rtnl_lock();
         err = raw_notifier_chain_register(&netdev_chain, nb);
         if (!err) {
-                for (dev = dev_base; dev; dev = dev->next) {
+                for_each_netdev(dev) {
                         nb->notifier_call(nb, NETDEV_REGISTER, dev);
 
                         if (dev->flags & IFF_UP)
@@ -2038,7 +2051,7 @@ static int dev_ifconf(char __user *arg)
          */
 
         total = 0;
-        for (dev = dev_base; dev; dev = dev->next) {
+        for_each_netdev(dev) {
                 for (i = 0; i < NPROTO; i++) {
                         if (gifconf_list[i]) {
                                 int done;
@@ -2070,26 +2083,28 @@ static int dev_ifconf(char __user *arg)
  *      This is invoked by the /proc filesystem handler to display a device
  *      in detail.
  */
-static struct net_device *dev_get_idx(loff_t pos)
+void *dev_seq_start(struct seq_file *seq, loff_t *pos)
 {
+        loff_t off;
         struct net_device *dev;
-        loff_t i;
 
-        for (i = 0, dev = dev_base; dev && i < pos; ++i, dev = dev->next);
+        read_lock(&dev_base_lock);
+        if (!*pos)
+                return SEQ_START_TOKEN;
 
-        return i == pos ? dev : NULL;
-}
+        off = 1;
+        for_each_netdev(dev)
+                if (off++ == *pos)
+                        return dev;
 
-void *dev_seq_start(struct seq_file *seq, loff_t *pos)
-{
-        read_lock(&dev_base_lock);
-        return *pos ? dev_get_idx(*pos - 1) : SEQ_START_TOKEN;
+        return NULL;
 }
 
 void *dev_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
         ++*pos;
-        return v == SEQ_START_TOKEN ? dev_base : ((struct net_device *)v)->next;
+        return v == SEQ_START_TOKEN ?
+                first_net_device() : next_net_device((struct net_device *)v);
 }
 
 void dev_seq_stop(struct seq_file *seq, void *v)
@@ -2362,9 +2377,9 @@ static int __init dev_proc_init(void)
 out:
         return rc;
 out_softnet:
-        proc_net_remove("softnet_stat");
-out_dev2:
         proc_net_remove("ptype");
+out_dev2:
+        proc_net_remove("softnet_stat");
 out_dev:
         proc_net_remove("dev");
         goto out;
@@ -3071,11 +3086,9 @@ int register_netdevice(struct net_device *dev)
 
         set_bit(__LINK_STATE_PRESENT, &dev->state);
 
-        dev->next = NULL;
         dev_init_scheduler(dev);
         write_lock_bh(&dev_base_lock);
-        *dev_tail = dev;
-        dev_tail = &dev->next;
+        list_add_tail(&dev->dev_list, &dev_base_head);
         hlist_add_head(&dev->name_hlist, head);
         hlist_add_head(&dev->index_hlist, dev_index_hash(dev->ifindex));
         dev_hold(dev);
@@ -3349,8 +3362,6 @@ void synchronize_net(void)
 
 void unregister_netdevice(struct net_device *dev)
 {
-        struct net_device *d, **dp;
-
         BUG_ON(dev_boot_phase);
         ASSERT_RTNL();
 
@@ -3370,19 +3381,11 @@ void unregister_netdevice(struct net_device *dev)
                 dev_close(dev);
 
         /* And unlink it from device chain. */
-        for (dp = &dev_base; (d = *dp) != NULL; dp = &d->next) {
-                if (d == dev) {
-                        write_lock_bh(&dev_base_lock);
-                        hlist_del(&dev->name_hlist);
-                        hlist_del(&dev->index_hlist);
-                        if (dev_tail == &dev->next)
-                                dev_tail = dp;
-                        *dp = d->next;
-                        write_unlock_bh(&dev_base_lock);
-                        break;
-                }
-        }
-        BUG_ON(!d);
+        write_lock_bh(&dev_base_lock);
+        list_del(&dev->dev_list);
+        hlist_del(&dev->name_hlist);
+        hlist_del(&dev->index_hlist);
+        write_unlock_bh(&dev_base_lock);
 
         dev->reg_state = NETREG_UNREGISTERING;
 
diff --git a/net/core/dev_mcast.c b/net/core/dev_mcast.c
index 7d57bf77f3a3..5a54053386c8 100644
--- a/net/core/dev_mcast.c
+++ b/net/core/dev_mcast.c
@@ -223,7 +223,7 @@ static void *dev_mc_seq_start(struct seq_file *seq, loff_t *pos)
         loff_t off = 0;
 
         read_lock(&dev_base_lock);
-        for (dev = dev_base; dev; dev = dev->next) {
+        for_each_netdev(dev) {
                 if (off++ == *pos)
                         return dev;
         }
@@ -232,9 +232,8 @@ static void *dev_mc_seq_start(struct seq_file *seq, loff_t *pos)
 
 static void *dev_mc_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
-        struct net_device *dev = v;
         ++*pos;
-        return dev->next;
+        return next_net_device((struct net_device *)v);
 }
 
 static void dev_mc_seq_stop(struct seq_file *seq, void *v)
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index cec111109155..8c971a2efe2a 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -539,13 +539,16 @@ static int rtnl_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)
         int s_idx = cb->args[0];
         struct net_device *dev;
 
-        for (dev=dev_base, idx=0; dev; dev = dev->next, idx++) {
+        idx = 0;
+        for_each_netdev(dev) {
                 if (idx < s_idx)
-                        continue;
+                        goto cont;
                 if (rtnl_fill_ifinfo(skb, dev, NULL, 0, RTM_NEWLINK,
                                      NETLINK_CB(cb->skb).pid,
                                      cb->nlh->nlmsg_seq, 0, NLM_F_MULTI) <= 0)
                         break;
+cont:
+                idx++;
         }
         cb->args[0] = idx;
 
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
index a205eaa87f52..9fbe87c93802 100644
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -721,7 +721,7 @@ static int dn_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
         struct sock *sk = sock->sk;
         struct dn_scp *scp = DN_SK(sk);
         struct sockaddr_dn *saddr = (struct sockaddr_dn *)uaddr;
-        struct net_device *dev;
+        struct net_device *dev, *ldev;
         int rv;
 
         if (addr_len != sizeof(struct sockaddr_dn))
@@ -746,14 +746,17 @@ static int dn_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
         if (!(saddr->sdn_flags & SDF_WILD)) {
                 if (dn_ntohs(saddr->sdn_nodeaddrl)) {
                         read_lock(&dev_base_lock);
-                        for(dev = dev_base; dev; dev = dev->next) {
+                        ldev = NULL;
+                        for_each_netdev(dev) {
                                 if (!dev->dn_ptr)
                                         continue;
-                                if (dn_dev_islocal(dev, dn_saddr2dn(saddr)))
+                                if (dn_dev_islocal(dev, dn_saddr2dn(saddr))) {
+                                        ldev = dev;
                                         break;
+                                }
                         }
                         read_unlock(&dev_base_lock);
-                        if (dev == NULL)
+                        if (ldev == NULL)
                                 return -EADDRNOTAVAIL;
                 }
         }
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index 5c2a9951b638..764a56a13e38 100644
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -799,9 +799,10 @@ static int dn_nl_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
         skip_ndevs = cb->args[0];
         skip_naddr = cb->args[1];
 
-        for (dev = dev_base, idx = 0; dev; dev = dev->next, idx++) {
+        idx = 0;
+        for_each_netdev(dev) {
                 if (idx < skip_ndevs)
-                        continue;
+                        goto cont;
                 else if (idx > skip_ndevs) {
                         /* Only skip over addresses for first dev dumped
                          * in this iteration (idx == skip_ndevs) */
@@ -809,18 +810,20 @@ static int dn_nl_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
                 }
 
                 if ((dn_db = dev->dn_ptr) == NULL)
-                        continue;
+                        goto cont;
 
                 for (ifa = dn_db->ifa_list, dn_idx = 0; ifa;
                      ifa = ifa->ifa_next, dn_idx++) {
                         if (dn_idx < skip_naddr)
-                                continue;
+                                goto cont;
 
                         if (dn_nl_fill_ifaddr(skb, ifa, NETLINK_CB(cb->skb).pid,
                                               cb->nlh->nlmsg_seq, RTM_NEWADDR,
                                               NLM_F_MULTI) < 0)
                                 goto done;
                 }
+cont:
+                idx++;
         }
 done:
         cb->args[0] = idx;
@@ -1296,7 +1299,7 @@ void dn_dev_devices_off(void)
         struct net_device *dev;
 
         rtnl_lock();
-        for(dev = dev_base; dev; dev = dev->next)
+        for_each_netdev(dev)
                 dn_dev_down(dev);
         rtnl_unlock();
 
@@ -1307,7 +1310,7 @@ void dn_dev_devices_on(void)
         struct net_device *dev;
 
         rtnl_lock();
-        for(dev = dev_base; dev; dev = dev->next) {
+        for_each_netdev(dev) {
                 if (dev->flags & IFF_UP)
                         dn_dev_up(dev);
         }
@@ -1325,62 +1328,56 @@ int unregister_dnaddr_notifier(struct notifier_block *nb)
 }
 
 #ifdef CONFIG_PROC_FS
-static inline struct net_device *dn_dev_get_next(struct seq_file *seq, struct net_device *dev)
+static inline int is_dn_dev(struct net_device *dev)
 {
-        do {
-                dev = dev->next;
-        } while(dev && !dev->dn_ptr);
-
-        return dev;
+        return dev->dn_ptr != NULL;
 }
 
-static struct net_device *dn_dev_get_idx(struct seq_file *seq, loff_t pos)
+static void *dn_dev_seq_start(struct seq_file *seq, loff_t *pos)
 {
+        int i;
         struct net_device *dev;
 
-        dev = dev_base;
-        if (dev && !dev->dn_ptr)
-                dev = dn_dev_get_next(seq, dev);
-        if (pos) {
-                while(dev && (dev = dn_dev_get_next(seq, dev)))
-                        --pos;
-        }
-        return dev;
-}
+        read_lock(&dev_base_lock);
 
-static void *dn_dev_seq_start(struct seq_file *seq, loff_t *pos)
-{
-        if (*pos) {
-                struct net_device *dev;
-                read_lock(&dev_base_lock);
-                dev = dn_dev_get_idx(seq, *pos - 1);
-                if (dev == NULL)
-                        read_unlock(&dev_base_lock);
-                return dev;
+        if (*pos == 0)
+                return SEQ_START_TOKEN;
+
+        i = 1;
+        for_each_netdev(dev) {
+                if (!is_dn_dev(dev))
+                        continue;
+
+                if (i++ == *pos)
+                        return dev;
         }
-        return SEQ_START_TOKEN;
+
+        return NULL;
 }
 
 static void *dn_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
-        struct net_device *dev = v;
-        loff_t one = 1;
+        struct net_device *dev;
 
-        if (v == SEQ_START_TOKEN) {
-                dev = dn_dev_seq_start(seq, &one);
-        } else {
-                dev = dn_dev_get_next(seq, dev);
-                if (dev == NULL)
-                        read_unlock(&dev_base_lock);
-        }
         ++*pos;
-        return dev;
+
+        dev = (struct net_device *)v;
+        if (v == SEQ_START_TOKEN)
+                dev = net_device_entry(&dev_base_head);
+
+        for_each_netdev_continue(dev) {
+                if (!is_dn_dev(dev))
+                        continue;
+
+                return dev;
+        }
+
+        return NULL;
 }
 
 static void dn_dev_seq_stop(struct seq_file *seq, void *v)
 {
-        if (v && v != SEQ_START_TOKEN)
-                read_unlock(&dev_base_lock);
+        read_unlock(&dev_base_lock);
 }
 
 static char *dn_type2asc(char type)
diff --git a/net/decnet/dn_fib.c b/net/decnet/dn_fib.c
index 310a86268d2b..d2bc19d47950 100644
--- a/net/decnet/dn_fib.c
+++ b/net/decnet/dn_fib.c
@@ -602,7 +602,7 @@ static void dn_fib_del_ifaddr(struct dn_ifaddr *ifa)
 
         /* Scan device list */
         read_lock(&dev_base_lock);
-        for(dev = dev_base; dev; dev = dev->next) {
+        for_each_netdev(dev) {
                 dn_db = dev->dn_ptr;
                 if (dn_db == NULL)
                         continue;
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index 5d7337bcf0fe..a8bf106b7a61 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -886,7 +886,7 @@ static int dn_route_output_slow(struct dst_entry **pprt, const struct flowi *old
                             .iif = loopback_dev.ifindex,
                             .oif = oldflp->oif };
         struct dn_route *rt = NULL;
-        struct net_device *dev_out = NULL;
+        struct net_device *dev_out = NULL, *dev;
         struct neighbour *neigh = NULL;
         unsigned hash;
         unsigned flags = 0;
@@ -925,15 +925,17 @@ static int dn_route_output_slow(struct dst_entry **pprt, const struct flowi *old
                         goto out;
                 }
                 read_lock(&dev_base_lock);
-                for(dev_out = dev_base; dev_out; dev_out = dev_out->next) {
-                        if (!dev_out->dn_ptr)
+                for_each_netdev(dev) {
+                        if (!dev->dn_ptr)
                                 continue;
-                        if (!dn_dev_islocal(dev_out, oldflp->fld_src))
+                        if (!dn_dev_islocal(dev, oldflp->fld_src))
                                 continue;
-                        if ((dev_out->flags & IFF_LOOPBACK) &&
+                        if ((dev->flags & IFF_LOOPBACK) &&
                             oldflp->fld_dst &&
-                            !dn_dev_islocal(dev_out, oldflp->fld_dst))
+                            !dn_dev_islocal(dev, oldflp->fld_dst))
                                 continue;
+
+                        dev_out = dev;
                         break;
                 }
                 read_unlock(&dev_base_lock);
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 088888db8b3d..7f95e6e9beeb 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -910,7 +910,7 @@ no_in_dev:
          */
         read_lock(&dev_base_lock);
         rcu_read_lock();
-        for (dev = dev_base; dev; dev = dev->next) {
+        for_each_netdev(dev) {
                 if ((in_dev = __in_dev_get_rcu(dev)) == NULL)
                         continue;
 
@@ -989,7 +989,7 @@ __be32 inet_confirm_addr(const struct net_device *dev, __be32 dst, __be32 local,
 
         read_lock(&dev_base_lock);
         rcu_read_lock();
-        for (dev = dev_base; dev; dev = dev->next) {
+        for_each_netdev(dev) {
                 if ((in_dev = __in_dev_get_rcu(dev))) {
                         addr = confirm_addr_indev(in_dev, dst, local, scope);
                         if (addr)
@@ -1182,23 +1182,26 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
         int s_ip_idx, s_idx = cb->args[0];
 
         s_ip_idx = ip_idx = cb->args[1];
-        for (dev = dev_base, idx = 0; dev; dev = dev->next, idx++) {
+        idx = 0;
+        for_each_netdev(dev) {
                 if (idx < s_idx)
-                        continue;
+                        goto cont;
                 if (idx > s_idx)
                         s_ip_idx = 0;
                 if ((in_dev = __in_dev_get_rtnl(dev)) == NULL)
-                        continue;
+                        goto cont;
 
                 for (ifa = in_dev->ifa_list, ip_idx = 0; ifa;
                      ifa = ifa->ifa_next, ip_idx++) {
                         if (ip_idx < s_ip_idx)
-                                continue;
+                                goto cont;
                         if (inet_fill_ifaddr(skb, ifa, NETLINK_CB(cb->skb).pid,
                                              cb->nlh->nlmsg_seq,
                                              RTM_NEWADDR, NLM_F_MULTI) <= 0)
                                 goto done;
                 }
+cont:
+                idx++;
         }
 
 done:
@@ -1243,7 +1246,7 @@ void inet_forward_change(void)
         ipv4_devconf_dflt.forwarding = on;
 
         read_lock(&dev_base_lock);
-        for (dev = dev_base; dev; dev = dev->next) {
+        for_each_netdev(dev) {
                 struct in_device *in_dev;
                 rcu_read_lock();
                 in_dev = __in_dev_get_rcu(dev);
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 2506021c2935..f4dd47453108 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -2288,9 +2288,8 @@ static inline struct ip_mc_list *igmp_mc_get_first(struct seq_file *seq)
         struct ip_mc_list *im = NULL;
         struct igmp_mc_iter_state *state = igmp_mc_seq_private(seq);
 
-        for (state->dev = dev_base, state->in_dev = NULL;
-             state->dev;
-             state->dev = state->dev->next) {
+        state->in_dev = NULL;
+        for_each_netdev(state->dev) {
                 struct in_device *in_dev;
                 in_dev = in_dev_get(state->dev);
                 if (!in_dev)
@@ -2316,7 +2315,7 @@ static struct ip_mc_list *igmp_mc_get_next(struct seq_file *seq, struct ip_mc_li
                         read_unlock(&state->in_dev->mc_list_lock);
                         in_dev_put(state->in_dev);
                 }
-                state->dev = state->dev->next;
+                state->dev = next_net_device(state->dev);
                 if (!state->dev) {
                         state->in_dev = NULL;
                         break;
@@ -2450,9 +2449,9 @@ static inline struct ip_sf_list *igmp_mcf_get_first(struct seq_file *seq)
         struct ip_mc_list *im = NULL;
         struct igmp_mcf_iter_state *state = igmp_mcf_seq_private(seq);
 
-        for (state->dev = dev_base, state->idev = NULL, state->im = NULL;
-             state->dev;
-             state->dev = state->dev->next) {
+        state->idev = NULL;
+        state->im = NULL;
+        for_each_netdev(state->dev) {
                 struct in_device *idev;
                 idev = in_dev_get(state->dev);
                 if (unlikely(idev == NULL))
@@ -2488,7 +2487,7 @@ static struct ip_sf_list *igmp_mcf_get_next(struct seq_file *seq, struct ip_sf_l
                                 read_unlock(&state->idev->mc_list_lock);
                                 in_dev_put(state->idev);
                         }
-                        state->dev = state->dev->next;
+                        state->dev = next_net_device(state->dev);
                         if (!state->dev) {
                                 state->idev = NULL;
                                 goto out;
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 597c800b2fdc..342ca8d89458 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -192,7 +192,7 @@ static int __init ic_open_devs(void)
         if (dev_change_flags(&loopback_dev, loopback_dev.flags | IFF_UP) < 0)
                 printk(KERN_ERR "IP-Config: Failed to open %s\n", loopback_dev.name);
 
-        for (dev = dev_base; dev; dev = dev->next) {
+        for_each_netdev(dev) {
                 if (dev == &loopback_dev)
                         continue;
                 if (user_dev_name[0] ? !strcmp(dev->name, user_dev_name) :
diff --git a/net/ipv4/netfilter/nf_nat_proto_gre.c b/net/ipv4/netfilter/nf_nat_proto_gre.c
index e5a34c17d927..c3908bc5a709 100644
--- a/net/ipv4/netfilter/nf_nat_proto_gre.c
+++ b/net/ipv4/netfilter/nf_nat_proto_gre.c
@@ -72,6 +72,11 @@ gre_unique_tuple(struct nf_conntrack_tuple *tuple,
         __be16 *keyptr;
         unsigned int min, i, range_size;
 
+        /* If there is no master conntrack we are not PPTP,
+           do not change tuples */
+        if (!conntrack->master)
+                return 0;
+
         if (maniptype == IP_NAT_MANIP_SRC)
                 keyptr = &tuple->src.u.gre.key;
         else
@@ -122,18 +127,9 @@ gre_manip_pkt(struct sk_buff **pskb, unsigned int iphdroff,
         if (maniptype != IP_NAT_MANIP_DST)
                 return 1;
         switch (greh->version) {
-        case 0:
-                if (!greh->key) {
-                        DEBUGP("can't nat GRE w/o key\n");
-                        break;
-                }
-                if (greh->csum) {
-                        /* FIXME: Never tested this code... */
-                        nf_proto_csum_replace4(gre_csum(greh), *pskb,
-                                               *(gre_key(greh)),
-                                               tuple->dst.u.gre.key, 0);
-                }
-                *(gre_key(greh)) = tuple->dst.u.gre.key;
+        case GRE_VERSION_1701:
+                /* We do not currently NAT any GREv0 packets.
+                 * Try to behave like "nf_nat_proto_unknown" */
                 break;
         case GRE_VERSION_PPTP:
                 DEBUGP("call_id -> 0x%04x\n", ntohs(tuple->dst.u.gre.key));
diff --git a/net/ipv4/netfilter/nf_nat_rule.c b/net/ipv4/netfilter/nf_nat_rule.c
index 2a283397a8b6..2534f718ab92 100644
--- a/net/ipv4/netfilter/nf_nat_rule.c
+++ b/net/ipv4/netfilter/nf_nat_rule.c
@@ -226,10 +226,6 @@ static int ipt_dnat_checkentry(const char *tablename,
                 printk("DNAT: multiple ranges no longer supported\n");
                 return 0;
         }
-        if (mr->range[0].flags & IP_NAT_RANGE_PROTO_RANDOM) {
-                printk("DNAT: port randomization not supported\n");
-                return 0;
-        }
         return 1;
 }
 
diff --git a/net/ipv4/netfilter/nf_nat_sip.c b/net/ipv4/netfilter/nf_nat_sip.c
index bfd88e4e0685..fac97cf51ae5 100644
--- a/net/ipv4/netfilter/nf_nat_sip.c
+++ b/net/ipv4/netfilter/nf_nat_sip.c
@@ -222,6 +222,29 @@ static unsigned int mangle_sdp(struct sk_buff **pskb,
         return mangle_content_len(pskb, ctinfo, ct, dptr);
 }
 
+static void ip_nat_sdp_expect(struct nf_conn *ct,
+                              struct nf_conntrack_expect *exp)
+{
+        struct nf_nat_range range;
+
+        /* This must be a fresh one. */
+        BUG_ON(ct->status & IPS_NAT_DONE_MASK);
+
+        /* Change src to where master sends to */
+        range.flags = IP_NAT_RANGE_MAP_IPS;
+        range.min_ip = range.max_ip
+                = ct->master->tuplehash[!exp->dir].tuple.dst.u3.ip;
+        /* hook doesn't matter, but it has to do source manip */
+        nf_nat_setup_info(ct, &range, NF_IP_POST_ROUTING);
+
+        /* For DST manip, map port here to where it's expected. */
+        range.flags = (IP_NAT_RANGE_MAP_IPS | IP_NAT_RANGE_PROTO_SPECIFIED);
+        range.min = range.max = exp->saved_proto;
+        range.min_ip = range.max_ip = exp->saved_ip;
+        /* hook doesn't matter, but it has to do destination manip */
+        nf_nat_setup_info(ct, &range, NF_IP_PRE_ROUTING);
+}
+
 /* So, this packet has hit the connection tracking matching code.
    Mangle it, and change the expectation to match the new version. */
 static unsigned int ip_nat_sdp(struct sk_buff **pskb,
@@ -239,13 +262,14 @@ static unsigned int ip_nat_sdp(struct sk_buff **pskb,
         /* Connection will come from reply */
         newip = ct->tuplehash[!dir].tuple.dst.u3.ip;
 
+        exp->saved_ip = exp->tuple.dst.u3.ip;
         exp->tuple.dst.u3.ip = newip;
         exp->saved_proto.udp.port = exp->tuple.dst.u.udp.port;
         exp->dir = !dir;
 
         /* When you see the packet, we need to NAT it the same as the
            this one. */
-        exp->expectfn = nf_nat_follow_master;
+        exp->expectfn = ip_nat_sdp_expect;
 
         /* Try to get same port: if not, try to change it. */
         for (port = ntohs(exp->saved_proto.udp.port); port != 0; port++) {
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index d6e488668171..8b124eafbb90 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1760,8 +1760,7 @@ int tcp_disconnect(struct sock *sk, int flags)
         tcp_clear_retrans(tp);
         inet_csk_delack_init(sk);
         tcp_init_send_head(sk);
-        tp->rx_opt.saw_tstamp = 0;
-        tcp_sack_reset(&tp->rx_opt);
+        memset(&tp->rx_opt, 0, sizeof(tp->rx_opt));
         __sk_dst_reset(sk);
 
         BUG_TRAP(!inet->num || icsk->icsk_bind_hash);
diff --git a/net/ipv4/tcp_highspeed.c b/net/ipv4/tcp_highspeed.c
index a291097fcc0a..43d624e5043c 100644
--- a/net/ipv4/tcp_highspeed.c
+++ b/net/ipv4/tcp_highspeed.c
@@ -97,10 +97,6 @@ struct hstcp {
         u32     ai;
 };
 
-static int max_ssthresh = 100;
-module_param(max_ssthresh, int, 0644);
-MODULE_PARM_DESC(max_ssthresh, "limited slow start threshold (RFC3742)");
-
 static void hstcp_init(struct sock *sk)
 {
         struct tcp_sock *tp = tcp_sk(sk);
@@ -122,23 +118,9 @@ static void hstcp_cong_avoid(struct sock *sk, u32 adk, u32 rtt,
         if (!tcp_is_cwnd_limited(sk, in_flight))
                 return;
 
-        if (tp->snd_cwnd <= tp->snd_ssthresh) {
-                /* RFC3742: limited slow start
-                 * the window is increased by 1/K MSS for each arriving ACK,
-                 * for K = int(cwnd/(0.5 max_ssthresh))
-                 */
-                if (max_ssthresh > 0 && tp->snd_cwnd > max_ssthresh) {
-                        u32 k = max(tp->snd_cwnd / (max_ssthresh >> 1), 1U);
-                        if (++tp->snd_cwnd_cnt >= k) {
-                                if (tp->snd_cwnd < tp->snd_cwnd_clamp)
-                                        tp->snd_cwnd++;
-                                tp->snd_cwnd_cnt = 0;
-                        }
-                } else {
-                        if (tp->snd_cwnd < tp->snd_cwnd_clamp)
-                                tp->snd_cwnd++;
-                }
-        } else {
+        if (tp->snd_cwnd <= tp->snd_ssthresh)
+                tcp_slow_start(tp);
+        else {
                 /* Update AIMD parameters.
                  *
                  * We want to guarantee that:
diff --git a/net/ipv4/tcp_yeah.h b/net/ipv4/tcp_yeah.h
deleted file mode 100644
index ed3b7198f23c..000000000000
--- a/net/ipv4/tcp_yeah.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/skbuff.h>
-#include <linux/inet_diag.h>
-#include <asm/div64.h>
-
-#include <net/tcp.h>
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 3452433cbc96..d02685c6bc69 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -449,7 +449,7 @@ static void addrconf_forward_change(void)
         struct inet6_dev *idev;
 
         read_lock(&dev_base_lock);
-        for (dev=dev_base; dev; dev=dev->next) {
+        for_each_netdev(dev) {
                 rcu_read_lock();
                 idev = __in6_dev_get(dev);
                 if (idev) {
@@ -911,7 +911,7 @@ int ipv6_dev_get_saddr(struct net_device *daddr_dev,
         read_lock(&dev_base_lock);
         rcu_read_lock();
 
-        for (dev = dev_base; dev; dev=dev->next) {
+        for_each_netdev(dev) {
                 struct inet6_dev *idev;
                 struct inet6_ifaddr *ifa;
 
@@ -2064,7 +2064,7 @@ static void sit_add_v4_addrs(struct inet6_dev *idev)
                 return;
         }
 
-        for (dev = dev_base; dev != NULL; dev = dev->next) {
+        for_each_netdev(dev) {
                 struct in_device * in_dev = __in_dev_get_rtnl(dev);
                 if (in_dev && (dev->flags & IFF_UP)) {
                         struct in_ifaddr * ifa;
@@ -2225,7 +2225,7 @@ static void ip6_tnl_add_linklocal(struct inet6_dev *idev)
                         return;
         }
         /* then try to inherit it from any device */
-        for (link_dev = dev_base; link_dev; link_dev = link_dev->next) {
+        for_each_netdev(link_dev) {
                 if (!ipv6_inherit_linklocal(idev, link_dev))
                         return;
         }
@@ -3257,14 +3257,15 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
         s_idx = cb->args[0];
         s_ip_idx = ip_idx = cb->args[1];
 
-        for (dev = dev_base, idx = 0; dev; dev = dev->next, idx++) {
+        idx = 0;
+        for_each_netdev(dev) {
                 if (idx < s_idx)
-                        continue;
+                        goto cont;
                 if (idx > s_idx)
                         s_ip_idx = 0;
                 ip_idx = 0;
                 if ((idev = in6_dev_get(dev)) == NULL)
-                        continue;
+                        goto cont;
                 read_lock_bh(&idev->lock);
                 switch (type) {
                 case UNICAST_ADDR:
@@ -3311,6 +3312,8 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
                 }
                 read_unlock_bh(&idev->lock);
                 in6_dev_put(idev);
+cont:
+                idx++;
         }
 done:
         if (err <= 0) {
@@ -3575,16 +3578,19 @@ static int inet6_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)
         struct inet6_dev *idev;
 
         read_lock(&dev_base_lock);
-        for (dev=dev_base, idx=0; dev; dev = dev->next, idx++) {
+        idx = 0;
+        for_each_netdev(dev) {
                 if (idx < s_idx)
-                        continue;
+                        goto cont;
                 if ((idev = in6_dev_get(dev)) == NULL)
-                        continue;
+                        goto cont;
                 err = inet6_fill_ifinfo(skb, idev, NETLINK_CB(cb->skb).pid,
                                 cb->nlh->nlmsg_seq, RTM_NEWLINK, NLM_F_MULTI);
                 in6_dev_put(idev);
                 if (err <= 0)
                         break;
+cont:
+                idx++;
         }
         read_unlock(&dev_base_lock);
         cb->args[0] = idx;
@@ -4247,7 +4253,7 @@ void __exit addrconf_cleanup(void)
          *      clean dev list.
          */
 
-        for (dev=dev_base; dev; dev=dev->next) {
+        for_each_netdev(dev) {
                 if ((idev = __in6_dev_get(dev)) == NULL)
                         continue;
                 addrconf_ifdown(dev, 1);
diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c
index 09117d63256f..9b81264eb78f 100644
--- a/net/ipv6/anycast.c
+++ b/net/ipv6/anycast.c
@@ -423,14 +423,18 @@ static int ipv6_chk_acast_dev(struct net_device *dev, struct in6_addr *addr)
  */
 int ipv6_chk_acast_addr(struct net_device *dev, struct in6_addr *addr)
 {
+        int found = 0;
+
         if (dev)
                 return ipv6_chk_acast_dev(dev, addr);
         read_lock(&dev_base_lock);
-        for (dev=dev_base; dev; dev=dev->next)
-                if (ipv6_chk_acast_dev(dev, addr))
+        for_each_netdev(dev)
+                if (ipv6_chk_acast_dev(dev, addr)) {
+                        found = 1;
                         break;
+                }
         read_unlock(&dev_base_lock);
-        return dev != 0;
+        return found;
 }
 
 
@@ -447,9 +451,8 @@ static inline struct ifacaddr6 *ac6_get_first(struct seq_file *seq)
         struct ifacaddr6 *im = NULL;
         struct ac6_iter_state *state = ac6_seq_private(seq);
 
-        for (state->dev = dev_base, state->idev = NULL;
-             state->dev;
-             state->dev = state->dev->next) {
+        state->idev = NULL;
+        for_each_netdev(state->dev) {
                 struct inet6_dev *idev;
                 idev = in6_dev_get(state->dev);
                 if (!idev)
@@ -476,7 +479,7 @@ static struct ifacaddr6 *ac6_get_next(struct seq_file *seq, struct ifacaddr6 *im
                         read_unlock_bh(&state->idev->lock);
                         in6_dev_put(state->idev);
                 }
-                state->dev = state->dev->next;
+                state->dev = next_net_device(state->dev);
                 if (!state->dev) {
                         state->idev = NULL;
                         break;
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index 6c2758951d60..3e308fb41b49 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -2331,9 +2331,8 @@ static inline struct ifmcaddr6 *igmp6_mc_get_first(struct seq_file *seq)
         struct ifmcaddr6 *im = NULL;
         struct igmp6_mc_iter_state *state = igmp6_mc_seq_private(seq);
 
-        for (state->dev = dev_base, state->idev = NULL;
-             state->dev;
-             state->dev = state->dev->next) {
+        state->idev = NULL;
+        for_each_netdev(state->dev) {
                 struct inet6_dev *idev;
                 idev = in6_dev_get(state->dev);
                 if (!idev)
@@ -2360,7 +2359,7 @@ static struct ifmcaddr6 *igmp6_mc_get_next(struct seq_file *seq, struct ifmcaddr
                         read_unlock_bh(&state->idev->lock);
                         in6_dev_put(state->idev);
                 }
-                state->dev = state->dev->next;
+                state->dev = next_net_device(state->dev);
                 if (!state->dev) {
                         state->idev = NULL;
                         break;
@@ -2475,9 +2474,9 @@ static inline struct ip6_sf_list *igmp6_mcf_get_first(struct seq_file *seq)
         struct ifmcaddr6 *im = NULL;
         struct igmp6_mcf_iter_state *state = igmp6_mcf_seq_private(seq);
 
-        for (state->dev = dev_base, state->idev = NULL, state->im = NULL;
-             state->dev;
-             state->dev = state->dev->next) {
+        state->idev = NULL;
+        state->im = NULL;
+        for_each_netdev(state->dev) {
                 struct inet6_dev *idev;
                 idev = in6_dev_get(state->dev);
                 if (unlikely(idev == NULL))
@@ -2513,7 +2512,7 @@ static struct ip6_sf_list *igmp6_mcf_get_next(struct seq_file *seq, struct ip6_s
                                 read_unlock_bh(&state->idev->lock);
                                 in6_dev_put(state->idev);
                         }
-                        state->dev = state->dev->next;
+                        state->dev = next_net_device(state->dev);
                         if (!state->dev) {
                                 state->idev = NULL;
                                 goto out;
diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig
index da07e9a88ee9..bbe99f842f9f 100644
--- a/net/ipv6/netfilter/Kconfig
+++ b/net/ipv6/netfilter/Kconfig
@@ -198,7 +198,7 @@ config IP6_NF_RAW
           and OUTPUT chains.
         
           If you want to compile it as a module, say M here and read
-          <file:Documentation/modules.txt>.  If unsure, say `N'.
+          <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.
 
 endmenu
 
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index e84c924a81ee..d9e9ddb8eac5 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -45,7 +45,8 @@ static struct proto iucv_proto = {
 static void iucv_callback_rx(struct iucv_path *, struct iucv_message *);
 static void iucv_callback_txdone(struct iucv_path *, struct iucv_message *);
 static void iucv_callback_connack(struct iucv_path *, u8 ipuser[16]);
-static int iucv_callback_connreq(struct iucv_path *, u8 ipvmid[8], u8 ipuser[16]);
+static int iucv_callback_connreq(struct iucv_path *, u8 ipvmid[8],
+                                 u8 ipuser[16]);
 static void iucv_callback_connrej(struct iucv_path *, u8 ipuser[16]);
 
 static struct iucv_sock_list iucv_sk_list = {
@@ -147,11 +148,12 @@ static void iucv_sock_close(struct sock *sk)
         unsigned char user_data[16];
         struct iucv_sock *iucv = iucv_sk(sk);
         int err;
+        unsigned long timeo;
 
         iucv_sock_clear_timer(sk);
         lock_sock(sk);
 
-        switch(sk->sk_state) {
+        switch (sk->sk_state) {
         case IUCV_LISTEN:
                 iucv_sock_cleanup_listen(sk);
                 break;
@@ -159,6 +161,21 @@ static void iucv_sock_close(struct sock *sk)
         case IUCV_CONNECTED:
         case IUCV_DISCONN:
                 err = 0;
+
+                sk->sk_state = IUCV_CLOSING;
+                sk->sk_state_change(sk);
+
+                if (!skb_queue_empty(&iucv->send_skb_q)) {
+                        if (sock_flag(sk, SOCK_LINGER) && sk->sk_lingertime)
+                                timeo = sk->sk_lingertime;
+                        else
+                                timeo = IUCV_DISCONN_TIMEOUT;
+                        err = iucv_sock_wait_state(sk, IUCV_CLOSED, 0, timeo);
+                }
+
+                sk->sk_state = IUCV_CLOSED;
+                sk->sk_state_change(sk);
+
                 if (iucv->path) {
                         low_nmcpy(user_data, iucv->src_name);
                         high_nmcpy(user_data, iucv->dst_name);
@@ -168,12 +185,11 @@ static void iucv_sock_close(struct sock *sk)
                         iucv->path = NULL;
                 }
 
-                sk->sk_state = IUCV_CLOSED;
-                sk->sk_state_change(sk);
                 sk->sk_err = ECONNRESET;
                 sk->sk_state_change(sk);
 
                 skb_queue_purge(&iucv->send_skb_q);
+                skb_queue_purge(&iucv->backlog_skb_q);
 
                 sock_set_flag(sk, SOCK_ZAPPED);
                 break;
@@ -204,6 +220,7 @@ static struct sock *iucv_sock_alloc(struct socket *sock, int proto, gfp_t prio)
         sock_init_data(sock, sk);
         INIT_LIST_HEAD(&iucv_sk(sk)->accept_q);
         skb_queue_head_init(&iucv_sk(sk)->send_skb_q);
+        skb_queue_head_init(&iucv_sk(sk)->backlog_skb_q);
         iucv_sk(sk)->send_tag = 0;
 
         sk->sk_destruct = iucv_sock_destruct;
@@ -276,7 +293,7 @@ struct sock *iucv_accept_dequeue(struct sock *parent, struct socket *newsock)
         struct iucv_sock *isk, *n;
         struct sock *sk;
 
-        list_for_each_entry_safe(isk, n, &iucv_sk(parent)->accept_q, accept_q){
+        list_for_each_entry_safe(isk, n, &iucv_sk(parent)->accept_q, accept_q) {
                 sk = (struct sock *) isk;
                 lock_sock(sk);
 
@@ -510,7 +527,7 @@ static int iucv_sock_accept(struct socket *sock, struct socket *newsock,
         long timeo;
         int err = 0;
 
-        lock_sock(sk);
+        lock_sock_nested(sk, SINGLE_DEPTH_NESTING);
 
         if (sk->sk_state != IUCV_LISTEN) {
                 err = -EBADFD;
@@ -521,7 +538,7 @@ static int iucv_sock_accept(struct socket *sock, struct socket *newsock,
 
         /* Wait for an incoming connection */
         add_wait_queue_exclusive(sk->sk_sleep, &wait);
-        while (!(nsk = iucv_accept_dequeue(sk, newsock))){
+        while (!(nsk = iucv_accept_dequeue(sk, newsock))) {
                 set_current_state(TASK_INTERRUPTIBLE);
                 if (!timeo) {
                         err = -EAGAIN;
@@ -530,7 +547,7 @@ static int iucv_sock_accept(struct socket *sock, struct socket *newsock,
 
                 release_sock(sk);
                 timeo = schedule_timeout(timeo);
-                lock_sock(sk);
+                lock_sock_nested(sk, SINGLE_DEPTH_NESTING);
 
                 if (sk->sk_state != IUCV_LISTEN) {
                         err = -EBADFD;
@@ -602,13 +619,13 @@ static int iucv_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
                 goto out;
         }
 
-        if (sk->sk_state == IUCV_CONNECTED){
-                if(!(skb = sock_alloc_send_skb(sk, len,
-                                       msg->msg_flags & MSG_DONTWAIT,
-                                       &err)))
-                        return err;
+        if (sk->sk_state == IUCV_CONNECTED) {
+                if (!(skb = sock_alloc_send_skb(sk, len,
+                                                msg->msg_flags & MSG_DONTWAIT,
+                                                &err)))
+                        goto out;
 
-                if (memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len)){
+                if (memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len)) {
                         err = -EFAULT;
                         goto fail;
                 }
@@ -647,10 +664,16 @@ static int iucv_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
 {
         int noblock = flags & MSG_DONTWAIT;
         struct sock *sk = sock->sk;
+        struct iucv_sock *iucv = iucv_sk(sk);
         int target, copied = 0;
-        struct sk_buff *skb;
+        struct sk_buff *skb, *rskb, *cskb;
         int err = 0;
 
+        if ((sk->sk_state == IUCV_DISCONN || sk->sk_state == IUCV_SEVERED) &&
+                skb_queue_empty(&iucv->backlog_skb_q) &&
+                skb_queue_empty(&sk->sk_receive_queue))
+                return 0;
+
         if (flags & (MSG_OOB))
                 return -EOPNOTSUPP;
 
@@ -665,10 +688,12 @@ static int iucv_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
 
         copied = min_t(unsigned int, skb->len, len);
 
-        if (memcpy_toiovec(msg->msg_iov, skb->data, copied)) {
+        cskb = skb;
+        if (memcpy_toiovec(msg->msg_iov, cskb->data, copied)) {
                 skb_queue_head(&sk->sk_receive_queue, skb);
                 if (copied == 0)
                         return -EFAULT;
+                goto done;
         }
 
         len -= copied;
@@ -683,6 +708,18 @@ static int iucv_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
                 }
 
                 kfree_skb(skb);
+
+                /* Queue backlog skbs */
+                rskb = skb_dequeue(&iucv_sk(sk)->backlog_skb_q);
+                while (rskb) {
+                        if (sock_queue_rcv_skb(sk, rskb)) {
+                                skb_queue_head(&iucv_sk(sk)->backlog_skb_q,
+                                                rskb);
+                                break;
+                        } else {
+                                rskb = skb_dequeue(&iucv_sk(sk)->backlog_skb_q);
+                        }
+                }
         } else
                 skb_queue_head(&sk->sk_receive_queue, skb);
 
@@ -695,7 +732,7 @@ static inline unsigned int iucv_accept_poll(struct sock *parent)
         struct iucv_sock *isk, *n;
         struct sock *sk;
 
-        list_for_each_entry_safe(isk, n, &iucv_sk(parent)->accept_q, accept_q){
+        list_for_each_entry_safe(isk, n, &iucv_sk(parent)->accept_q, accept_q) {
                 sk = (struct sock *) isk;
 
                 if (sk->sk_state == IUCV_CONNECTED)
@@ -726,12 +763,15 @@ unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
                 mask |= POLLHUP;
 
         if (!skb_queue_empty(&sk->sk_receive_queue) ||
-                        (sk->sk_shutdown & RCV_SHUTDOWN))
+            (sk->sk_shutdown & RCV_SHUTDOWN))
                 mask |= POLLIN | POLLRDNORM;
 
         if (sk->sk_state == IUCV_CLOSED)
                 mask |= POLLHUP;
 
+        if (sk->sk_state == IUCV_DISCONN || sk->sk_state == IUCV_SEVERED)
+                mask |= POLLIN;
+
         if (sock_writeable(sk))
                 mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
         else
@@ -754,7 +794,7 @@ static int iucv_sock_shutdown(struct socket *sock, int how)
                 return -EINVAL;
 
         lock_sock(sk);
-        switch(sk->sk_state) {
+        switch (sk->sk_state) {
         case IUCV_CLOSED:
                 err = -ENOTCONN;
                 goto fail;
@@ -770,7 +810,7 @@ static int iucv_sock_shutdown(struct socket *sock, int how)
                 err = iucv_message_send(iucv->path, &txmsg, IUCV_IPRMDATA, 0,
                                         (void *) prmmsg, 8);
                 if (err) {
-                        switch(err) {
+                        switch (err) {
                         case 1:
                                 err = -ENOTCONN;
                                 break;
@@ -817,13 +857,6 @@ static int iucv_sock_release(struct socket *sock)
                 iucv_sk(sk)->path = NULL;
         }
 
-        if (sock_flag(sk, SOCK_LINGER) && sk->sk_lingertime){
-                lock_sock(sk);
-                err = iucv_sock_wait_state(sk, IUCV_CLOSED, 0,
-                                           sk->sk_lingertime);
-                release_sock(sk);
-        }
-
         sock_orphan(sk);
         iucv_sock_kill(sk);
         return err;
@@ -880,7 +913,7 @@ static int iucv_callback_connreq(struct iucv_path *path,
 
         /* Create the new socket */
         nsk = iucv_sock_alloc(NULL, SOCK_STREAM, GFP_ATOMIC);
-        if (!nsk){
+        if (!nsk) {
                 err = iucv_path_sever(path, user_data);
                 goto fail;
         }
@@ -903,7 +936,7 @@ static int iucv_callback_connreq(struct iucv_path *path,
 
         path->msglim = IUCV_QUEUELEN_DEFAULT;
         err = iucv_path_accept(path, &af_iucv_handler, nuser_data, nsk);
-        if (err){
+        if (err) {
                 err = iucv_path_sever(path, user_data);
                 goto fail;
         }
@@ -927,18 +960,53 @@ static void iucv_callback_connack(struct iucv_path *path, u8 ipuser[16])
         sk->sk_state_change(sk);
 }
 
+static int iucv_fragment_skb(struct sock *sk, struct sk_buff *skb, int len,
+                             struct sk_buff_head *fragmented_skb_q)
+{
+        int dataleft, size, copied = 0;
+        struct sk_buff *nskb;
+
+        dataleft = len;
+        while (dataleft) {
+                if (dataleft >= sk->sk_rcvbuf / 4)
+                        size = sk->sk_rcvbuf / 4;
+                else
+                        size = dataleft;
+
+                nskb = alloc_skb(size, GFP_ATOMIC | GFP_DMA);
+                if (!nskb)
+                        return -ENOMEM;
+
+                memcpy(nskb->data, skb->data + copied, size);
+                copied += size;
+                dataleft -= size;
+
+                skb_reset_transport_header(nskb);
+                skb_reset_network_header(nskb);
+                nskb->len = size;
+
+                skb_queue_tail(fragmented_skb_q, nskb);
+        }
+
+        return 0;
+}
+
 static void iucv_callback_rx(struct iucv_path *path, struct iucv_message *msg)
 {
         struct sock *sk = path->private;
-        struct sk_buff *skb;
+        struct iucv_sock *iucv = iucv_sk(sk);
+        struct sk_buff *skb, *fskb;
+        struct sk_buff_head fragmented_skb_q;
         int rc;
 
+        skb_queue_head_init(&fragmented_skb_q);
+
         if (sk->sk_shutdown & RCV_SHUTDOWN)
                 return;
 
         skb = alloc_skb(msg->length, GFP_ATOMIC | GFP_DMA);
         if (!skb) {
-                iucv_message_reject(path, msg);
+                iucv_path_sever(path, NULL);
                 return;
         }
 
@@ -952,14 +1020,39 @@ static void iucv_callback_rx(struct iucv_path *path, struct iucv_message *msg)
                         kfree_skb(skb);
                         return;
                 }
+                if (skb->truesize >= sk->sk_rcvbuf / 4) {
+                        rc = iucv_fragment_skb(sk, skb, msg->length,
+                                               &fragmented_skb_q);
+                        kfree_skb(skb);
+                        skb = NULL;
+                        if (rc) {
+                                iucv_path_sever(path, NULL);
+                                return;
+                        }
+                } else {
+                        skb_reset_transport_header(skb);
+                        skb_reset_network_header(skb);
+                        skb->len = msg->length;
+                }
+        }
+        /* Queue the fragmented skb */
+        fskb = skb_dequeue(&fragmented_skb_q);
+        while (fskb) {
+                if (!skb_queue_empty(&iucv->backlog_skb_q))
+                        skb_queue_tail(&iucv->backlog_skb_q, fskb);
+                else if (sock_queue_rcv_skb(sk, fskb))
+                        skb_queue_tail(&iucv_sk(sk)->backlog_skb_q, fskb);
+                fskb = skb_dequeue(&fragmented_skb_q);
+        }
 
-                skb_reset_transport_header(skb);
-                skb_reset_network_header(skb);
-                skb->len = msg->length;
+        /* Queue the original skb if it exists (was not fragmented) */
+        if (skb) {
+                if (!skb_queue_empty(&iucv->backlog_skb_q))
+                        skb_queue_tail(&iucv_sk(sk)->backlog_skb_q, skb);
+                else if (sock_queue_rcv_skb(sk, skb))
+                        skb_queue_tail(&iucv_sk(sk)->backlog_skb_q, skb);
         }
 
-        if (sock_queue_rcv_skb(sk, skb))
-                kfree_skb(skb);
 }
 
 static void iucv_callback_txdone(struct iucv_path *path,
@@ -971,17 +1064,27 @@ static void iucv_callback_txdone(struct iucv_path *path,
         struct sk_buff *list_skb = list->next;
         unsigned long flags;
 
-        spin_lock_irqsave(&list->lock, flags);
+        if (list_skb) {
+                spin_lock_irqsave(&list->lock, flags);
+
+                do {
+                        this = list_skb;
+                        list_skb = list_skb->next;
+                } while (memcmp(&msg->tag, this->cb, 4) && list_skb);
+
+                spin_unlock_irqrestore(&list->lock, flags);
 
-        do {
-                this = list_skb;
-                list_skb = list_skb->next;
-        } while (memcmp(&msg->tag, this->cb, 4));
+                skb_unlink(this, &iucv_sk(sk)->send_skb_q);
+                kfree_skb(this);
+        }
 
-        spin_unlock_irqrestore(&list->lock, flags);
+        if (sk->sk_state == IUCV_CLOSING) {
+                if (skb_queue_empty(&iucv_sk(sk)->send_skb_q)) {
+                        sk->sk_state = IUCV_CLOSED;
+                        sk->sk_state_change(sk);
+                }
+        }
 
-        skb_unlink(this, &iucv_sk(sk)->send_skb_q);
-        kfree_skb(this);
 }
 
 static void iucv_callback_connrej(struct iucv_path *path, u8 ipuser[16])
@@ -1022,7 +1125,7 @@ static struct net_proto_family iucv_sock_family_ops = {
         .create = iucv_sock_create,
 };
 
-static int afiucv_init(void)
+static int __init afiucv_init(void)
 {
         int err;
 
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
index 903bdb6eaaa1..fb3faf72e850 100644
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@ -32,7 +32,6 @@
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
-
 #include <linux/spinlock.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
@@ -69,7 +68,7 @@
 #define IUCV_IPNORPY    0x10
 #define IUCV_IPALL      0x80
 
-static int iucv_bus_match (struct device *dev, struct device_driver *drv)
+static int iucv_bus_match(struct device *dev, struct device_driver *drv)
 {
         return 0;
 }
@@ -78,8 +77,11 @@ struct bus_type iucv_bus = {
         .name = "iucv",
         .match = iucv_bus_match,
 };
+EXPORT_SYMBOL(iucv_bus);
 
 struct device *iucv_root;
+EXPORT_SYMBOL(iucv_root);
+
 static int iucv_available;
 
 /* General IUCV interrupt structure */
@@ -405,7 +407,7 @@ static void iucv_declare_cpu(void *data)
         rc = iucv_call_b2f0(IUCV_DECLARE_BUFFER, parm);
         if (rc) {
                 char *err = "Unknown";
-                switch(rc) {
+                switch (rc) {
                 case 0x03:
                         err = "Directory error";
                         break;
@@ -588,7 +590,7 @@ static int __cpuinit iucv_cpu_notify(struct notifier_block *self,
         return NOTIFY_OK;
 }
 
-static struct notifier_block iucv_cpu_notifier = {
+static struct notifier_block __cpuinitdata iucv_cpu_notifier = {
         .notifier_call = iucv_cpu_notify,
 };
 
@@ -691,6 +693,7 @@ out_mutex:
         mutex_unlock(&iucv_register_mutex);
         return rc;
 }
+EXPORT_SYMBOL(iucv_register);
 
 /**
  * iucv_unregister
@@ -723,6 +726,7 @@ void iucv_unregister(struct iucv_handler *handler, int smp)
                 iucv_setmask_mp();
         mutex_unlock(&iucv_register_mutex);
 }
+EXPORT_SYMBOL(iucv_unregister);
 
 /**
  * iucv_path_accept
@@ -761,6 +765,7 @@ int iucv_path_accept(struct iucv_path *path, struct iucv_handler *handler,
         local_bh_enable();
         return rc;
 }
+EXPORT_SYMBOL(iucv_path_accept);
 
 /**
  * iucv_path_connect
@@ -824,6 +829,7 @@ int iucv_path_connect(struct iucv_path *path, struct iucv_handler *handler,
         spin_unlock_bh(&iucv_table_lock);
         return rc;
 }
+EXPORT_SYMBOL(iucv_path_connect);
 
 /**
  * iucv_path_quiesce:
@@ -850,6 +856,7 @@ int iucv_path_quiesce(struct iucv_path *path, u8 userdata[16])
         local_bh_enable();
         return rc;
 }
+EXPORT_SYMBOL(iucv_path_quiesce);
 
 /**
  * iucv_path_resume:
@@ -890,7 +897,6 @@ int iucv_path_sever(struct iucv_path *path, u8 userdata[16])
 {
         int rc;
 
-
         preempt_disable();
         if (iucv_active_cpu != smp_processor_id())
                 spin_lock_bh(&iucv_table_lock);
@@ -904,6 +910,7 @@ int iucv_path_sever(struct iucv_path *path, u8 userdata[16])
         preempt_enable();
         return rc;
 }
+EXPORT_SYMBOL(iucv_path_sever);
 
 /**
  * iucv_message_purge
@@ -936,6 +943,7 @@ int iucv_message_purge(struct iucv_path *path, struct iucv_message *msg,
         local_bh_enable();
         return rc;
 }
+EXPORT_SYMBOL(iucv_message_purge);
 
 /**
  * iucv_message_receive
@@ -1006,6 +1014,7 @@ int iucv_message_receive(struct iucv_path *path, struct iucv_message *msg,
         local_bh_enable();
         return rc;
 }
+EXPORT_SYMBOL(iucv_message_receive);
 
 /**
  * iucv_message_reject
@@ -1034,6 +1043,7 @@ int iucv_message_reject(struct iucv_path *path, struct iucv_message *msg)
         local_bh_enable();
         return rc;
 }
+EXPORT_SYMBOL(iucv_message_reject);
 
 /**
  * iucv_message_reply
@@ -1077,6 +1087,7 @@ int iucv_message_reply(struct iucv_path *path, struct iucv_message *msg,
         local_bh_enable();
         return rc;
 }
+EXPORT_SYMBOL(iucv_message_reply);
 
 /**
  * iucv_message_send
@@ -1125,6 +1136,7 @@ int iucv_message_send(struct iucv_path *path, struct iucv_message *msg,
         local_bh_enable();
         return rc;
 }
+EXPORT_SYMBOL(iucv_message_send);
 
 /**
  * iucv_message_send2way
@@ -1181,6 +1193,7 @@ int iucv_message_send2way(struct iucv_path *path, struct iucv_message *msg,
         local_bh_enable();
         return rc;
 }
+EXPORT_SYMBOL(iucv_message_send2way);
 
 /**
  * iucv_path_pending
@@ -1572,7 +1585,7 @@ static void iucv_external_interrupt(u16 code)
  *
  * Allocates and initializes various data structures.
  */
-static int iucv_init(void)
+static int __init iucv_init(void)
 {
         int rc;
 
@@ -1583,7 +1596,7 @@ static int iucv_init(void)
         rc = iucv_query_maxconn();
         if (rc)
                 goto out;
-        rc = register_external_interrupt (0x4000, iucv_external_interrupt);
+        rc = register_external_interrupt(0x4000, iucv_external_interrupt);
         if (rc)
                 goto out;
         rc = bus_register(&iucv_bus);
@@ -1594,7 +1607,7 @@ static int iucv_init(void)
                 rc = PTR_ERR(iucv_root);
                 goto out_bus;
         }
-        /* Note: GFP_DMA used used to get memory below 2G */
+        /* Note: GFP_DMA used to get memory below 2G */
         iucv_irq_data = percpu_alloc(sizeof(struct iucv_irq_data),
                                      GFP_KERNEL|GFP_DMA);
         if (!iucv_irq_data) {
@@ -1632,7 +1645,7 @@ out:
  *
  * Frees everything allocated from iucv_init.
  */
-static void iucv_exit(void)
+static void __exit iucv_exit(void)
 {
         struct iucv_irq_list *p, *n;
 
@@ -1653,24 +1666,6 @@ static void iucv_exit(void)
 subsys_initcall(iucv_init);
 module_exit(iucv_exit);
 
-/**
- * Export all public stuff
- */
-EXPORT_SYMBOL (iucv_bus);
-EXPORT_SYMBOL (iucv_root);
-EXPORT_SYMBOL (iucv_register);
-EXPORT_SYMBOL (iucv_unregister);
-EXPORT_SYMBOL (iucv_path_accept);
-EXPORT_SYMBOL (iucv_path_connect);
-EXPORT_SYMBOL (iucv_path_quiesce);
-EXPORT_SYMBOL (iucv_path_sever);
-EXPORT_SYMBOL (iucv_message_purge);
-EXPORT_SYMBOL (iucv_message_receive);
-EXPORT_SYMBOL (iucv_message_reject);
-EXPORT_SYMBOL (iucv_message_reply);
-EXPORT_SYMBOL (iucv_message_send);
-EXPORT_SYMBOL (iucv_message_send2way);
-
 MODULE_AUTHOR("(C) 2001 IBM Corp. by Fritz Elfert (felfert@millenux.com)");
 MODULE_DESCRIPTION("Linux for S/390 IUCV lowlevel driver");
 MODULE_LICENSE("GPL");
diff --git a/net/llc/llc_core.c b/net/llc/llc_core.c
index d12413cff5bd..d4b13a031fd5 100644
--- a/net/llc/llc_core.c
+++ b/net/llc/llc_core.c
@@ -160,8 +160,14 @@ static struct packet_type llc_tr_packet_type = {
 
 static int __init llc_init(void)
 {
-        if (dev_base->next)
-                memcpy(llc_station_mac_sa, dev_base->next->dev_addr, ETH_ALEN);
+        struct net_device *dev;
+
+        dev = first_net_device();
+        if (dev != NULL)
+                dev = next_net_device(dev);
+
+        if (dev != NULL)
+                memcpy(llc_station_mac_sa, dev->dev_addr, ETH_ALEN);
         else
                 memset(llc_station_mac_sa, 0, ETH_ALEN);
         dev_add_pack(&llc_packet_type);
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 */
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index c558f3214255..ea6211cade0a 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -100,7 +100,7 @@ config NF_CT_PROTO_SCTP
           tracking code will be able to do state tracking on SCTP connections.
 
           If you want to compile it as a module, say M here and read
-          Documentation/modules.txt.  If unsure, say `N'.
+          <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.
 
 config NF_CONNTRACK_AMANDA
         tristate "Amanda backup protocol support"
@@ -279,8 +279,8 @@ config NETFILTER_XT_TARGET_CONNMARK
           affects the connection mark value rather than the packet mark value.
         
           If you want to compile it as a module, say M here and read
-          <file:Documentation/modules.txt>.  The module will be called
-          ipt_CONNMARK.o.  If unsure, say `N'.
+          <file:Documentation/kbuild/modules.txt>.  The module will be called
+          ipt_CONNMARK.ko.  If unsure, say `N'.
 
 config NETFILTER_XT_TARGET_DSCP
         tristate '"DSCP" target support'
@@ -341,7 +341,7 @@ config NETFILTER_XT_TARGET_NOTRACK
           no protocol helpers for the selected packets).
         
           If you want to compile it as a module, say M here and read
-          <file:Documentation/modules.txt>.  If unsure, say `N'.
+          <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.
 
 config NETFILTER_XT_TARGET_SECMARK
         tristate '"SECMARK" target support'
@@ -397,7 +397,7 @@ config NETFILTER_XT_MATCH_COMMENT
           comments in your iptables ruleset.
 
           If you want to compile it as a module, say M here and read
-          <file:Documentation/modules.txt>.  If unsure, say `N'.
+          <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.
 
 config NETFILTER_XT_MATCH_CONNBYTES
         tristate  '"connbytes" per-connection counter match support'
@@ -409,7 +409,7 @@ config NETFILTER_XT_MATCH_CONNBYTES
           number of bytes and/or packets for each direction within a connection.
 
           If you want to compile it as a module, say M here and read
-          <file:Documentation/modules.txt>.  If unsure, say `N'.
+          <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.
 
 config NETFILTER_XT_MATCH_CONNMARK
         tristate  '"connmark" connection mark match support'
@@ -421,8 +421,8 @@ config NETFILTER_XT_MATCH_CONNMARK
           connection mark value previously set for the session by `CONNMARK'. 
         
           If you want to compile it as a module, say M here and read
-          <file:Documentation/modules.txt>.  The module will be called
-          ipt_connmark.o.  If unsure, say `N'.
+          <file:Documentation/kbuild/modules.txt>.  The module will be called
+          ipt_connmark.ko.  If unsure, say `N'.
 
 config NETFILTER_XT_MATCH_CONNTRACK
         tristate '"conntrack" connection tracking match support'
@@ -446,7 +446,7 @@ config NETFILTER_XT_MATCH_DCCP
           and DCCP flags.
 
           If you want to compile it as a module, say M here and read
-          <file:Documentation/modules.txt>.  If unsure, say `N'.
+          <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.
 
 config NETFILTER_XT_MATCH_DSCP
         tristate '"DSCP" match support'
@@ -565,7 +565,7 @@ config NETFILTER_XT_MATCH_QUOTA
           byte counter.
 
           If you want to compile it as a module, say M here and read
-          <file:Documentation/modules.txt>.  If unsure, say `N'.
+          <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.
 
 config NETFILTER_XT_MATCH_REALM
         tristate  '"realm" match support'
@@ -579,7 +579,7 @@ config NETFILTER_XT_MATCH_REALM
           in tc world.
         
           If you want to compile it as a module, say M here and read
-          <file:Documentation/modules.txt>.  If unsure, say `N'.
+          <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.
 
 config NETFILTER_XT_MATCH_SCTP
         tristate  '"sctp" protocol match support (EXPERIMENTAL)'
@@ -590,7 +590,7 @@ config NETFILTER_XT_MATCH_SCTP
           and SCTP chunk types.
 
           If you want to compile it as a module, say M here and read
-          <file:Documentation/modules.txt>.  If unsure, say `N'.
+          <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.
 
 config NETFILTER_XT_MATCH_STATE
         tristate '"state" match support'
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 42d2fb94eff1..507828d7d4ae 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -140,6 +140,14 @@ static struct hlist_head *nl_pid_hashfn(struct nl_pid_hash *hash, u32 pid)
 
 static void netlink_sock_destruct(struct sock *sk)
 {
+        struct netlink_sock *nlk = nlk_sk(sk);
+
+        if (nlk->cb) {
+                if (nlk->cb->done)
+                        nlk->cb->done(nlk->cb);
+                netlink_destroy_callback(nlk->cb);
+        }
+
         skb_queue_purge(&sk->sk_receive_queue);
 
         if (!sock_flag(sk, SOCK_DEAD)) {
@@ -148,7 +156,6 @@ static void netlink_sock_destruct(struct sock *sk)
         }
         BUG_TRAP(!atomic_read(&sk->sk_rmem_alloc));
         BUG_TRAP(!atomic_read(&sk->sk_wmem_alloc));
-        BUG_TRAP(!nlk_sk(sk)->cb);
         BUG_TRAP(!nlk_sk(sk)->groups);
 }
 
@@ -456,17 +463,10 @@ static int netlink_release(struct socket *sock)
         sock_orphan(sk);
         nlk = nlk_sk(sk);
 
-        mutex_lock(nlk->cb_mutex);
-        if (nlk->cb) {
-                if (nlk->cb->done)
-                        nlk->cb->done(nlk->cb);
-                netlink_destroy_callback(nlk->cb);
-                nlk->cb = NULL;
-        }
-        mutex_unlock(nlk->cb_mutex);
-
-        /* OK. Socket is unlinked, and, therefore,
-           no new packets will arrive */
+        /*
+         * OK. Socket is unlinked, any packets that arrive now
+         * will be purged.
+         */
 
         sock->sk = NULL;
         wake_up_interruptible_all(&nlk->wait);
@@ -1245,16 +1245,14 @@ static int netlink_recvmsg(struct kiocb *kiocb, struct socket *sock,
                 siocb->scm = &scm;
         }
         siocb->scm->creds = *NETLINK_CREDS(skb);
+        if (flags & MSG_TRUNC)
+                copied = skb->len;
         skb_free_datagram(sk, skb);
 
         if (nlk->cb && atomic_read(&sk->sk_rmem_alloc) <= sk->sk_rcvbuf / 2)
                 netlink_dump(sk);
 
         scm_recv(sock, msg, siocb->scm, flags);
-
-        if (flags & MSG_TRUNC)
-                copied = skb->len;
-
 out:
         netlink_rcv_wake(sk);
         return err ? : copied;
@@ -1426,9 +1424,9 @@ int netlink_dump_start(struct sock *ssk, struct sk_buff *skb,
                 return -ECONNREFUSED;
         }
         nlk = nlk_sk(sk);
-        /* A dump or destruction is in progress... */
+        /* A dump is in progress... */
         mutex_lock(nlk->cb_mutex);
-        if (nlk->cb || sock_flag(sk, SOCK_DEAD)) {
+        if (nlk->cb) {
                 mutex_unlock(nlk->cb_mutex);
                 netlink_destroy_callback(cb);
                 sock_put(sk);
diff --git a/net/netrom/nr_route.c b/net/netrom/nr_route.c
index 8e6bd4e9d82c..2f76e062609d 100644
--- a/net/netrom/nr_route.c
+++ b/net/netrom/nr_route.c
@@ -598,7 +598,7 @@ struct net_device *nr_dev_first(void)
         struct net_device *dev, *first = NULL;
 
         read_lock(&dev_base_lock);
-        for (dev = dev_base; dev != NULL; dev = dev->next) {
+        for_each_netdev(dev) {
                 if ((dev->flags & IFF_UP) && dev->type == ARPHRD_NETROM)
                         if (first == NULL || strncmp(dev->name, first->name, 3) < 0)
                                 first = dev;
@@ -618,12 +618,13 @@ struct net_device *nr_dev_get(ax25_address *addr)
         struct net_device *dev;
 
         read_lock(&dev_base_lock);
-        for (dev = dev_base; dev != NULL; dev = dev->next) {
+        for_each_netdev(dev) {
                 if ((dev->flags & IFF_UP) && dev->type == ARPHRD_NETROM && ax25cmp(addr, (ax25_address *)dev->dev_addr) == 0) {
                         dev_hold(dev);
                         goto out;
                 }
         }
+        dev = NULL;
 out:
         read_unlock(&dev_base_lock);
         return dev;
diff --git a/net/rfkill/Kconfig b/net/rfkill/Kconfig
new file mode 100644
index 000000000000..8b31759ee8b0
--- /dev/null
+++ b/net/rfkill/Kconfig
@@ -0,0 +1,24 @@
+#
+# RF switch subsystem configuration
+#
+menuconfig RFKILL
+        tristate "RF switch subsystem support"
+        help
+          Say Y here if you want to have control over RF switches
+          found on many WiFi, Bluetooth and IRDA cards.
+
+          To compile this driver as a module, choose M here: the
+          module will be called rfkill.
+
+config RFKILL_INPUT
+        tristate "Input layer to RF switch connector"
+        depends on RFKILL && INPUT
+        help
+          Say Y here if you want kernel automatically toggle state
+          of RF switches on and off when user presses appropriate
+          button or a key on the keyboard. Without this module you
+          need a some kind of userspace application to control
+          state of the switches.
+
+          To compile this driver as a module, choose M here: the
+          module will be called rfkill-input.
diff --git a/net/rfkill/Makefile b/net/rfkill/Makefile
new file mode 100644
index 000000000000..b38c430be057
--- /dev/null
+++ b/net/rfkill/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the RF switch subsystem.
+#
+
+obj-$(CONFIG_RFKILL)                    += rfkill.o
+obj-$(CONFIG_RFKILL_INPUT)              += rfkill-input.o
diff --git a/net/rfkill/rfkill-input.c b/net/rfkill/rfkill-input.c
new file mode 100644
index 000000000000..e5c840c30284
--- /dev/null
+++ b/net/rfkill/rfkill-input.c
@@ -0,0 +1,174 @@
+/*
+ * Input layer to RF Kill interface connector
+ *
+ * Copyright (c) 2007 Dmitry Torokhov
+ */
+
+/*
+ * 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/input.h>
+#include <linux/slab.h>
+#include <linux/workqueue.h>
+#include <linux/init.h>
+#include <linux/rfkill.h>
+
+MODULE_AUTHOR("Dmitry Torokhov <dtor@mail.ru>");
+MODULE_DESCRIPTION("Input layer to RF switch connector");
+MODULE_LICENSE("GPL");
+
+struct rfkill_task {
+        struct work_struct work;
+        enum rfkill_type type;
+        struct mutex mutex; /* ensures that task is serialized */
+        spinlock_t lock; /* for accessing last and desired state */
+        unsigned long last; /* last schedule */
+        enum rfkill_state desired_state; /* on/off */
+        enum rfkill_state current_state; /* on/off */
+};
+
+static void rfkill_task_handler(struct work_struct *work)
+{
+        struct rfkill_task *task = container_of(work, struct rfkill_task, work);
+        enum rfkill_state state;
+
+        mutex_lock(&task->mutex);
+
+        /*
+         * Use temp variable to fetch desired state to keep it
+         * consistent even if rfkill_schedule_toggle() runs in
+         * another thread or interrupts us.
+         */
+        state = task->desired_state;
+
+        if (state != task->current_state) {
+                rfkill_switch_all(task->type, state);
+                task->current_state = state;
+        }
+
+        mutex_unlock(&task->mutex);
+}
+
+static void rfkill_schedule_toggle(struct rfkill_task *task)
+{
+        unsigned int flags;
+
+        spin_lock_irqsave(&task->lock, flags);
+
+        if (time_after(jiffies, task->last + msecs_to_jiffies(200))) {
+                task->desired_state = !task->desired_state;
+                task->last = jiffies;
+                schedule_work(&task->work);
+        }
+
+        spin_unlock_irqrestore(&task->lock, flags);
+}
+
+#define DEFINE_RFKILL_TASK(n, t)                        \
+        struct rfkill_task n = {                        \
+                .work = __WORK_INITIALIZER(n.work,      \
+                                rfkill_task_handler),   \
+                .type = t,                              \
+                .mutex = __MUTEX_INITIALIZER(n.mutex),  \
+                .lock = __SPIN_LOCK_UNLOCKED(n.lock),   \
+                .desired_state = RFKILL_STATE_ON,       \
+                .current_state = RFKILL_STATE_ON,       \
+        }
+
+static DEFINE_RFKILL_TASK(rfkill_wlan, RFKILL_TYPE_WLAN);
+static DEFINE_RFKILL_TASK(rfkill_bt, RFKILL_TYPE_BLUETOOTH);
+
+static void rfkill_event(struct input_handle *handle, unsigned int type,
+                        unsigned int code, int down)
+{
+        if (type == EV_KEY && down == 1) {
+                switch (code) {
+                case KEY_WLAN:
+                        rfkill_schedule_toggle(&rfkill_wlan);
+                        break;
+                case KEY_BLUETOOTH:
+                        rfkill_schedule_toggle(&rfkill_bt);
+                        break;
+                default:
+                        break;
+                }
+        }
+}
+
+static int rfkill_connect(struct input_handler *handler, struct input_dev *dev,
+                          const struct input_device_id *id)
+{
+        struct input_handle *handle;
+        int error;
+
+        handle = kzalloc(sizeof(struct input_handle), GFP_KERNEL);
+        if (!handle)
+                return -ENOMEM;
+
+        handle->dev = dev;
+        handle->handler = handler;
+        handle->name = "rfkill";
+
+        error = input_register_handle(handle);
+        if (error)
+                goto err_free_handle;
+
+        error = input_open_device(handle);
+        if (error)
+                goto err_unregister_handle;
+
+        return 0;
+
+ err_unregister_handle:
+        input_unregister_handle(handle);
+ err_free_handle:
+        kfree(handle);
+        return error;
+}
+
+static void rfkill_disconnect(struct input_handle *handle)
+{
+        input_close_device(handle);
+        input_unregister_handle(handle);
+        kfree(handle);
+}
+
+static const struct input_device_id rfkill_ids[] = {
+        {
+                .flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT,
+                .evbit = { BIT(EV_KEY) },
+                .keybit = { [LONG(KEY_WLAN)] = BIT(KEY_WLAN) },
+        },
+        {
+                .flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT,
+                .evbit = { BIT(EV_KEY) },
+                .keybit = { [LONG(KEY_BLUETOOTH)] = BIT(KEY_BLUETOOTH) },
+        },
+        { }
+};
+
+static struct input_handler rfkill_handler = {
+        .event =        rfkill_event,
+        .connect =      rfkill_connect,
+        .disconnect =   rfkill_disconnect,
+        .name =         "rfkill",
+        .id_table =     rfkill_ids,
+};
+
+static int __init rfkill_handler_init(void)
+{
+        return input_register_handler(&rfkill_handler);
+}
+
+static void __exit rfkill_handler_exit(void)
+{
+        input_unregister_handler(&rfkill_handler);
+        flush_scheduled_work();
+}
+
+module_init(rfkill_handler_init);
+module_exit(rfkill_handler_exit);
diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c
new file mode 100644
index 000000000000..a973603e3880
--- /dev/null
+++ b/net/rfkill/rfkill.c
@@ -0,0 +1,407 @@
+/*
+ * Copyright (C) 2006 Ivo van Doorn
+ * Copyright (C) 2007 Dmitry Torokhov
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/workqueue.h>
+#include <linux/capability.h>
+#include <linux/list.h>
+#include <linux/mutex.h>
+#include <linux/rfkill.h>
+
+MODULE_AUTHOR("Ivo van Doorn <IvDoorn@gmail.com>");
+MODULE_VERSION("1.0");
+MODULE_DESCRIPTION("RF switch support");
+MODULE_LICENSE("GPL");
+
+static LIST_HEAD(rfkill_list);  /* list of registered rf switches */
+static DEFINE_MUTEX(rfkill_mutex);
+
+static enum rfkill_state rfkill_states[RFKILL_TYPE_MAX];
+
+static int rfkill_toggle_radio(struct rfkill *rfkill,
+                                enum rfkill_state state)
+{
+        int retval;
+
+        retval = mutex_lock_interruptible(&rfkill->mutex);
+        if (retval)
+                return retval;
+
+        if (state != rfkill->state) {
+                retval = rfkill->toggle_radio(rfkill->data, state);
+                if (!retval)
+                        rfkill->state = state;
+        }
+
+        mutex_unlock(&rfkill->mutex);
+        return retval;
+}
+
+/**
+ * rfkill_switch_all - Toggle state of all switches of given type
+ * @type: type of interfaces to be affeceted
+ * @state: the new state
+ *
+ * This function toggles state of all switches of given type unless
+ * a specific switch is claimed by userspace in which case it is
+ * left alone.
+ */
+
+void rfkill_switch_all(enum rfkill_type type, enum rfkill_state state)
+{
+        struct rfkill *rfkill;
+
+        mutex_lock(&rfkill_mutex);
+
+        rfkill_states[type] = state;
+
+        list_for_each_entry(rfkill, &rfkill_list, node) {
+                if (!rfkill->user_claim)
+                        rfkill_toggle_radio(rfkill, state);
+        }
+
+        mutex_unlock(&rfkill_mutex);
+}
+EXPORT_SYMBOL(rfkill_switch_all);
+
+static ssize_t rfkill_name_show(struct device *dev,
+                                struct device_attribute *attr,
+                                char *buf)
+{
+        struct rfkill *rfkill = to_rfkill(dev);
+
+        return sprintf(buf, "%s\n", rfkill->name);
+}
+
+static ssize_t rfkill_type_show(struct device *dev,
+                                struct device_attribute *attr,
+                                char *buf)
+{
+        struct rfkill *rfkill = to_rfkill(dev);
+        const char *type;
+
+        switch (rfkill->type) {
+        case RFKILL_TYPE_WLAN:
+                type = "wlan";
+                break;
+        case RFKILL_TYPE_BLUETOOTH:
+                type = "bluetooth";
+                break;
+        case RFKILL_TYPE_IRDA:
+                type = "irda";
+                break;
+        default:
+                BUG();
+        }
+
+        return sprintf(buf, "%s\n", type);
+}
+
+static ssize_t rfkill_state_show(struct device *dev,
+                                 struct device_attribute *attr,
+                                 char *buf)
+{
+        struct rfkill *rfkill = to_rfkill(dev);
+
+        return sprintf(buf, "%d\n", rfkill->state);
+}
+
+static ssize_t rfkill_state_store(struct device *dev,
+                                  struct device_attribute *attr,
+                                  const char *buf, size_t count)
+{
+        struct rfkill *rfkill = to_rfkill(dev);
+        unsigned int state = simple_strtoul(buf, NULL, 0);
+        int error;
+
+        if (!capable(CAP_NET_ADMIN))
+                return -EPERM;
+
+        error = rfkill_toggle_radio(rfkill,
+                        state ? RFKILL_STATE_ON : RFKILL_STATE_OFF);
+        if (error)
+                return error;
+
+        return count;
+}
+
+static ssize_t rfkill_claim_show(struct device *dev,
+                                 struct device_attribute *attr,
+                                 char *buf)
+{
+        struct rfkill *rfkill = to_rfkill(dev);
+
+        return sprintf(buf, "%d", rfkill->user_claim);
+}
+
+static ssize_t rfkill_claim_store(struct device *dev,
+                                  struct device_attribute *attr,
+                                  const char *buf, size_t count)
+{
+        struct rfkill *rfkill = to_rfkill(dev);
+        bool claim = !!simple_strtoul(buf, NULL, 0);
+        int error;
+
+        if (!capable(CAP_NET_ADMIN))
+                return -EPERM;
+
+        /*
+         * Take the global lock to make sure the kernel is not in
+         * the middle of rfkill_switch_all
+         */
+        error = mutex_lock_interruptible(&rfkill_mutex);
+        if (error)
+                return error;
+
+        if (rfkill->user_claim != claim) {
+                if (!claim)
+                        rfkill_toggle_radio(rfkill,
+                                            rfkill_states[rfkill->type]);
+                rfkill->user_claim = claim;
+        }
+
+        mutex_unlock(&rfkill_mutex);
+
+        return count;
+}
+
+static struct device_attribute rfkill_dev_attrs[] = {
+        __ATTR(name, S_IRUGO, rfkill_name_show, NULL),
+        __ATTR(type, S_IRUGO, rfkill_type_show, NULL),
+        __ATTR(state, S_IRUGO, rfkill_state_show, rfkill_state_store),
+        __ATTR(claim, S_IRUGO|S_IWUSR, rfkill_claim_show, rfkill_claim_store),
+        __ATTR_NULL
+};
+
+static void rfkill_release(struct device *dev)
+{
+        struct rfkill *rfkill = to_rfkill(dev);
+
+        kfree(rfkill);
+        module_put(THIS_MODULE);
+}
+
+#ifdef CONFIG_PM
+static int rfkill_suspend(struct device *dev, pm_message_t state)
+{
+        struct rfkill *rfkill = to_rfkill(dev);
+
+        if (dev->power.power_state.event != state.event) {
+                if (state.event == PM_EVENT_SUSPEND) {
+                        mutex_lock(&rfkill->mutex);
+
+                        if (rfkill->state == RFKILL_STATE_ON)
+                                rfkill->toggle_radio(rfkill->data,
+                                                     RFKILL_STATE_OFF);
+
+                        mutex_unlock(&rfkill->mutex);
+                }
+
+                dev->power.power_state = state;
+        }
+
+        return 0;
+}
+
+static int rfkill_resume(struct device *dev)
+{
+        struct rfkill *rfkill = to_rfkill(dev);
+
+        if (dev->power.power_state.event != PM_EVENT_ON) {
+                mutex_lock(&rfkill->mutex);
+
+                if (rfkill->state == RFKILL_STATE_ON)
+                        rfkill->toggle_radio(rfkill->data, RFKILL_STATE_ON);
+
+                mutex_unlock(&rfkill->mutex);
+        }
+
+        dev->power.power_state = PMSG_ON;
+        return 0;
+}
+#else
+#define rfkill_suspend NULL
+#define rfkill_resume NULL
+#endif
+
+static struct class rfkill_class = {
+        .name           = "rfkill",
+        .dev_release    = rfkill_release,
+        .dev_attrs      = rfkill_dev_attrs,
+        .suspend        = rfkill_suspend,
+        .resume         = rfkill_resume,
+};
+
+static int rfkill_add_switch(struct rfkill *rfkill)
+{
+        int retval;
+
+        retval = mutex_lock_interruptible(&rfkill_mutex);
+        if (retval)
+                return retval;
+
+        retval = rfkill_toggle_radio(rfkill, rfkill_states[rfkill->type]);
+        if (retval)
+                goto out;
+
+        list_add_tail(&rfkill->node, &rfkill_list);
+
+ out:
+        mutex_unlock(&rfkill_mutex);
+        return retval;
+}
+
+static void rfkill_remove_switch(struct rfkill *rfkill)
+{
+        mutex_lock(&rfkill_mutex);
+        list_del_init(&rfkill->node);
+        rfkill_toggle_radio(rfkill, RFKILL_STATE_OFF);
+        mutex_unlock(&rfkill_mutex);
+}
+
+/**
+ * rfkill_allocate - allocate memory for rfkill structure.
+ * @parent: device that has rf switch on it
+ * @type: type of the switch (wlan, bluetooth, irda)
+ *
+ * This function should be called by the network driver when it needs
+ * rfkill structure. Once the structure is allocated the driver shoud
+ * finish its initialization by setting name, private data, enable_radio
+ * and disable_radio methods and then register it with rfkill_register().
+ * NOTE: If registration fails the structure shoudl be freed by calling
+ * rfkill_free() otherwise rfkill_unregister() should be used.
+ */
+struct rfkill *rfkill_allocate(struct device *parent, enum rfkill_type type)
+{
+        struct rfkill *rfkill;
+        struct device *dev;
+
+        rfkill = kzalloc(sizeof(struct rfkill), GFP_KERNEL);
+        if (rfkill)
+                return NULL;
+
+        mutex_init(&rfkill->mutex);
+        INIT_LIST_HEAD(&rfkill->node);
+        rfkill->type = type;
+
+        dev = &rfkill->dev;
+        dev->class = &rfkill_class;
+        dev->parent = parent;
+        device_initialize(dev);
+
+        __module_get(THIS_MODULE);
+
+        return rfkill;
+}
+EXPORT_SYMBOL(rfkill_allocate);
+
+/**
+ * rfkill_free - Mark rfkill structure for deletion
+ * @rfkill: rfkill structure to be destroyed
+ *
+ * Decrements reference count of rfkill structure so it is destoryed.
+ * Note that rfkill_free() should _not_ be called after rfkill_unregister().
+ */
+void rfkill_free(struct rfkill *rfkill)
+{
+        if (rfkill)
+                put_device(&rfkill->dev);
+}
+EXPORT_SYMBOL(rfkill_free);
+
+/**
+ * rfkill_register - Register a rfkill structure.
+ * @rfkill: rfkill structure to be registered
+ *
+ * This function should be called by the network driver when the rfkill
+ * structure needs to be registered. Immediately from registration the
+ * switch driver should be able to service calls to toggle_radio.
+ */
+int rfkill_register(struct rfkill *rfkill)
+{
+        static atomic_t rfkill_no = ATOMIC_INIT(0);
+        struct device *dev = &rfkill->dev;
+        int error;
+
+        if (!rfkill->toggle_radio)
+                return -EINVAL;
+
+        error = rfkill_add_switch(rfkill);
+        if (error)
+                return error;
+
+        snprintf(dev->bus_id, sizeof(dev->bus_id),
+                 "rfkill%ld", (long)atomic_inc_return(&rfkill_no) - 1);
+
+        error = device_add(dev);
+        if (error) {
+                rfkill_remove_switch(rfkill);
+                return error;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL(rfkill_register);
+
+/**
+ * rfkill_unregister - Uegister a rfkill structure.
+ * @rfkill: rfkill structure to be unregistered
+ *
+ * This function should be called by the network driver during device
+ * teardown to destroy rfkill structure. Note that rfkill_free() should
+ * _not_ be called after rfkill_unregister().
+ */
+void rfkill_unregister(struct rfkill *rfkill)
+{
+        device_del(&rfkill->dev);
+        rfkill_remove_switch(rfkill);
+        put_device(&rfkill->dev);
+}
+EXPORT_SYMBOL(rfkill_unregister);
+
+/*
+ * Rfkill module initialization/deinitialization.
+ */
+static int __init rfkill_init(void)
+{
+        int error;
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(rfkill_states); i++)
+                rfkill_states[i] = RFKILL_STATE_ON;
+
+        error = class_register(&rfkill_class);
+        if (error) {
+                printk(KERN_ERR "rfkill: unable to register rfkill class\n");
+                return error;
+        }
+
+        return 0;
+}
+
+static void __exit rfkill_exit(void)
+{
+        class_unregister(&rfkill_class);
+}
+
+module_init(rfkill_init);
+module_exit(rfkill_exit);
diff --git a/net/rose/rose_route.c b/net/rose/rose_route.c
index 1f9aefd95a99..929a784a86d7 100644
--- a/net/rose/rose_route.c
+++ b/net/rose/rose_route.c
@@ -596,7 +596,7 @@ struct net_device *rose_dev_first(void)
         struct net_device *dev, *first = NULL;
 
         read_lock(&dev_base_lock);
-        for (dev = dev_base; dev != NULL; dev = dev->next) {
+        for_each_netdev(dev) {
                 if ((dev->flags & IFF_UP) && dev->type == ARPHRD_ROSE)
                         if (first == NULL || strncmp(dev->name, first->name, 3) < 0)
                                 first = dev;
@@ -614,12 +614,13 @@ struct net_device *rose_dev_get(rose_address *addr)
         struct net_device *dev;
 
         read_lock(&dev_base_lock);
-        for (dev = dev_base; dev != NULL; dev = dev->next) {
+        for_each_netdev(dev) {
                 if ((dev->flags & IFF_UP) && dev->type == ARPHRD_ROSE && rosecmp(addr, (rose_address *)dev->dev_addr) == 0) {
                         dev_hold(dev);
                         goto out;
                 }
         }
+        dev = NULL;
 out:
         read_unlock(&dev_base_lock);
         return dev;
@@ -630,10 +631,11 @@ static int rose_dev_exists(rose_address *addr)
         struct net_device *dev;
 
         read_lock(&dev_base_lock);
-        for (dev = dev_base; dev != NULL; dev = dev->next) {
+        for_each_netdev(dev) {
                 if ((dev->flags & IFF_UP) && dev->type == ARPHRD_ROSE && rosecmp(addr, (rose_address *)dev->dev_addr) == 0)
                         goto out;
         }
+        dev = NULL;
 out:
         read_unlock(&dev_base_lock);
         return dev != NULL;
diff --git a/net/rxrpc/Kconfig b/net/rxrpc/Kconfig
index 8750f6da6bc7..91b3d52f6f1a 100644
--- a/net/rxrpc/Kconfig
+++ b/net/rxrpc/Kconfig
@@ -5,6 +5,7 @@
 config AF_RXRPC
         tristate "RxRPC session sockets"
         depends on EXPERIMENTAL
+        select KEYS
         help
           Say Y or M here to include support for RxRPC session sockets (just
           the transport part, not the presentation part: (un)marshalling is
@@ -29,7 +30,7 @@ config AF_RXRPC_DEBUG
 
 config RXKAD
         tristate "RxRPC Kerberos security"
-        depends on AF_RXRPC && KEYS
+        depends on AF_RXRPC
         select CRYPTO
         select CRYPTO_MANAGER
         select CRYPTO_BLKCIPHER
diff --git a/net/rxrpc/ar-ack.c b/net/rxrpc/ar-ack.c
index fc07a926df56..657ee69f2133 100644
--- a/net/rxrpc/ar-ack.c
+++ b/net/rxrpc/ar-ack.c
@@ -543,6 +543,38 @@ static void rxrpc_zap_tx_window(struct rxrpc_call *call)
 }
 
 /*
+ * process the extra information that may be appended to an ACK packet
+ */
+static void rxrpc_extract_ackinfo(struct rxrpc_call *call, struct sk_buff *skb,
+                                  unsigned latest, int nAcks)
+{
+        struct rxrpc_ackinfo ackinfo;
+        struct rxrpc_peer *peer;
+        unsigned mtu;
+
+        if (skb_copy_bits(skb, nAcks + 3, &ackinfo, sizeof(ackinfo)) < 0) {
+                _leave(" [no ackinfo]");
+                return;
+        }
+
+        _proto("Rx ACK %%%u Info { rx=%u max=%u rwin=%u jm=%u }",
+               latest,
+               ntohl(ackinfo.rxMTU), ntohl(ackinfo.maxMTU),
+               ntohl(ackinfo.rwind), ntohl(ackinfo.jumbo_max));
+
+        mtu = min(ntohl(ackinfo.rxMTU), ntohl(ackinfo.maxMTU));
+
+        peer = call->conn->trans->peer;
+        if (mtu < peer->maxdata) {
+                spin_lock_bh(&peer->lock);
+                peer->maxdata = mtu;
+                peer->mtu = mtu + peer->hdrsize;
+                spin_unlock_bh(&peer->lock);
+                _net("Net MTU %u (maxdata %u)", peer->mtu, peer->maxdata);
+        }
+}
+
+/*
  * process packets in the reception queue
  */
 static int rxrpc_process_rx_queue(struct rxrpc_call *call,
@@ -606,6 +638,8 @@ process_further:
                        rxrpc_acks[ack.reason],
                        ack.nAcks);
 
+                rxrpc_extract_ackinfo(call, skb, latest, ack.nAcks);
+
                 if (ack.reason == RXRPC_ACK_PING) {
                         _proto("Rx ACK %%%u PING Request", latest);
                         rxrpc_propose_ACK(call, RXRPC_ACK_PING_RESPONSE,
@@ -801,9 +835,9 @@ void rxrpc_process_call(struct work_struct *work)
         struct msghdr msg;
         struct kvec iov[5];
         unsigned long bits;
-        __be32 data;
+        __be32 data, pad;
         size_t len;
-        int genbit, loop, nbit, ioc, ret;
+        int genbit, loop, nbit, ioc, ret, mtu;
         u32 abort_code = RX_PROTOCOL_ERROR;
         u8 *acks = NULL;
 
@@ -899,9 +933,30 @@ void rxrpc_process_call(struct work_struct *work)
         }
 
         if (test_bit(RXRPC_CALL_ACK_FINAL, &call->events)) {
-                hdr.type = RXRPC_PACKET_TYPE_ACKALL;
                 genbit = RXRPC_CALL_ACK_FINAL;
-                goto send_message;
+
+                ack.bufferSpace = htons(8);
+                ack.maxSkew     = 0;
+                ack.serial      = 0;
+                ack.reason      = RXRPC_ACK_IDLE;
+                ack.nAcks       = 0;
+                call->ackr_reason = 0;
+
+                spin_lock_bh(&call->lock);
+                ack.serial = call->ackr_serial;
+                ack.previousPacket = call->ackr_prev_seq;
+                ack.firstPacket = htonl(call->rx_data_eaten + 1);
+                spin_unlock_bh(&call->lock);
+
+                pad = 0;
+
+                iov[1].iov_base = &ack;
+                iov[1].iov_len  = sizeof(ack);
+                iov[2].iov_base = &pad;
+                iov[2].iov_len  = 3;
+                iov[3].iov_base = &ackinfo;
+                iov[3].iov_len  = sizeof(ackinfo);
+                goto send_ACK;
         }
 
         if (call->events & ((1 << RXRPC_CALL_RCVD_BUSY) |
@@ -971,8 +1026,6 @@ void rxrpc_process_call(struct work_struct *work)
 
         /* consider sending an ordinary ACK */
         if (test_bit(RXRPC_CALL_ACK, &call->events)) {
-                __be32 pad;
-
                 _debug("send ACK: window: %d - %d { %lx }",
                        call->rx_data_eaten, call->ackr_win_top,
                        call->ackr_window[0]);
@@ -997,12 +1050,6 @@ void rxrpc_process_call(struct work_struct *work)
                 ack.serial      = 0;
                 ack.reason      = 0;
 
-                ackinfo.rxMTU   = htonl(5692);
-//              ackinfo.rxMTU   = htonl(call->conn->trans->peer->maxdata);
-                ackinfo.maxMTU  = htonl(call->conn->trans->peer->maxdata);
-                ackinfo.rwind   = htonl(32);
-                ackinfo.jumbo_max = htonl(4);
-
                 spin_lock_bh(&call->lock);
                 ack.reason = call->ackr_reason;
                 ack.serial = call->ackr_serial;
@@ -1116,6 +1163,15 @@ send_ACK_with_skew:
         ack.maxSkew = htons(atomic_read(&call->conn->hi_serial) -
                             ntohl(ack.serial));
 send_ACK:
+        mtu = call->conn->trans->peer->if_mtu;
+        mtu -= call->conn->trans->peer->hdrsize;
+        ackinfo.maxMTU  = htonl(mtu);
+        ackinfo.rwind   = htonl(32);
+
+        /* permit the peer to send us jumbo packets if it wants to */
+        ackinfo.rxMTU   = htonl(5692);
+        ackinfo.jumbo_max = htonl(4);
+
         hdr.serial = htonl(atomic_inc_return(&call->conn->serial));
         _proto("Tx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
                ntohl(hdr.serial),
diff --git a/net/rxrpc/ar-error.c b/net/rxrpc/ar-error.c
index 2c27df1ffa17..6cb3e8890e7e 100644
--- a/net/rxrpc/ar-error.c
+++ b/net/rxrpc/ar-error.c
@@ -100,8 +100,10 @@ void rxrpc_UDP_error_report(struct sock *sk)
                 }
 
                 if (mtu < peer->mtu) {
+                        spin_lock_bh(&peer->lock);
                         peer->mtu = mtu;
                         peer->maxdata = peer->mtu - peer->hdrsize;
+                        spin_unlock_bh(&peer->lock);
                         _net("Net MTU %u (maxdata %u)",
                              peer->mtu, peer->maxdata);
                 }
diff --git a/net/rxrpc/ar-output.c b/net/rxrpc/ar-output.c
index 5cdde4a48ed1..591c4422205e 100644
--- a/net/rxrpc/ar-output.c
+++ b/net/rxrpc/ar-output.c
@@ -582,7 +582,7 @@ static int rxrpc_send_data(struct kiocb *iocb,
                         max &= ~(call->conn->size_align - 1UL);
 
                         chunk = max;
-                        if (chunk > len)
+                        if (chunk > len && !more)
                                 chunk = len;
 
                         space = chunk + call->conn->size_align;
diff --git a/net/rxrpc/ar-peer.c b/net/rxrpc/ar-peer.c
index d399de4a7fe2..ce08b78647ce 100644
--- a/net/rxrpc/ar-peer.c
+++ b/net/rxrpc/ar-peer.c
@@ -19,6 +19,7 @@
 #include <net/sock.h>
 #include <net/af_rxrpc.h>
 #include <net/ip.h>
+#include <net/route.h>
 #include "ar-internal.h"
 
 static LIST_HEAD(rxrpc_peers);
@@ -28,6 +29,47 @@ static DECLARE_WAIT_QUEUE_HEAD(rxrpc_peer_wq);
 static void rxrpc_destroy_peer(struct work_struct *work);
 
 /*
+ * assess the MTU size for the network interface through which this peer is
+ * reached
+ */
+static void rxrpc_assess_MTU_size(struct rxrpc_peer *peer)
+{
+        struct rtable *rt;
+        struct flowi fl;
+        int ret;
+
+        peer->if_mtu = 1500;
+
+        memset(&fl, 0, sizeof(fl));
+
+        switch (peer->srx.transport.family) {
+        case AF_INET:
+                fl.oif = 0;
+                fl.proto = IPPROTO_UDP,
+                fl.nl_u.ip4_u.saddr = 0;
+                fl.nl_u.ip4_u.daddr = peer->srx.transport.sin.sin_addr.s_addr;
+                fl.nl_u.ip4_u.tos = 0;
+                /* assume AFS.CM talking to AFS.FS */
+                fl.uli_u.ports.sport = htons(7001);
+                fl.uli_u.ports.dport = htons(7000);
+                break;
+        default:
+                BUG();
+        }
+
+        ret = ip_route_output_key(&rt, &fl);
+        if (ret < 0) {
+                kleave(" [route err %d]", ret);
+                return;
+        }
+
+        peer->if_mtu = dst_mtu(&rt->u.dst);
+        dst_release(&rt->u.dst);
+
+        kleave(" [if_mtu %u]", peer->if_mtu);
+}
+
+/*
  * allocate a new peer
  */
 static struct rxrpc_peer *rxrpc_alloc_peer(struct sockaddr_rxrpc *srx,
@@ -47,7 +89,8 @@ static struct rxrpc_peer *rxrpc_alloc_peer(struct sockaddr_rxrpc *srx,
                 peer->debug_id = atomic_inc_return(&rxrpc_debug_id);
                 memcpy(&peer->srx, srx, sizeof(*srx));
 
-                peer->mtu = peer->if_mtu = 65535;
+                rxrpc_assess_MTU_size(peer);
+                peer->mtu = peer->if_mtu;
 
                 if (srx->transport.family == AF_INET) {
                         peer->hdrsize = sizeof(struct iphdr);
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 8699e7006d80..bec600af03ca 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -894,9 +894,10 @@ static int tc_dump_qdisc(struct sk_buff *skb, struct netlink_callback *cb)
         s_idx = cb->args[0];
         s_q_idx = q_idx = cb->args[1];
         read_lock(&dev_base_lock);
-        for (dev=dev_base, idx=0; dev; dev = dev->next, idx++) {
+        idx = 0;
+        for_each_netdev(dev) {
                 if (idx < s_idx)
-                        continue;
+                        goto cont;
                 if (idx > s_idx)
                         s_q_idx = 0;
                 q_idx = 0;
@@ -910,6 +911,8 @@ static int tc_dump_qdisc(struct sk_buff *skb, struct netlink_callback *cb)
                                 goto done;
                         q_idx++;
                 }
+cont:
+                idx++;
         }
 
 done:
diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index db73ef97485a..df94e3cdfba3 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -1103,6 +1103,13 @@ void sctp_assoc_update(struct sctp_association *asoc,
                         asoc->ssnmap = new->ssnmap;
                         new->ssnmap = NULL;
                 }
+
+                if (!asoc->assoc_id) {
+                        /* get a new association id since we don't have one
+                         * yet.
+                         */
+                        sctp_assoc_set_id(asoc, GFP_ATOMIC);
+                }
         }
 }
 
@@ -1375,3 +1382,25 @@ out:
         sctp_read_unlock(&asoc->base.addr_lock);
         return found;
 }
+
+/* Set an association id for a given association */
+int sctp_assoc_set_id(struct sctp_association *asoc, gfp_t gfp)
+{
+        int assoc_id;
+        int error = 0;
+retry:
+        if (unlikely(!idr_pre_get(&sctp_assocs_id, gfp)))
+                return -ENOMEM;
+
+        spin_lock_bh(&sctp_assocs_id_lock);
+        error = idr_get_new_above(&sctp_assocs_id, (void *)asoc,
+                                    1, &assoc_id);
+        spin_unlock_bh(&sctp_assocs_id_lock);
+        if (error == -EAGAIN)
+                goto retry;
+        else if (error)
+                return error;
+
+        asoc->assoc_id = (sctp_assoc_t) assoc_id;
+        return error;
+}
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index ca527a27dd05..84cd53635fe8 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -992,45 +992,52 @@ static struct sctp_pf sctp_pf_inet6_specific = {
         .af            = &sctp_ipv6_specific,
 };
 
-/* Initialize IPv6 support and register with inet6 stack.  */
+/* Initialize IPv6 support and register with socket layer.  */
 int sctp_v6_init(void)
 {
-        int rc = proto_register(&sctpv6_prot, 1);
+        int rc;
 
+        /* Register the SCTP specific PF_INET6 functions. */
+        sctp_register_pf(&sctp_pf_inet6_specific, PF_INET6);
+
+        /* Register the SCTP specific AF_INET6 functions. */
+        sctp_register_af(&sctp_ipv6_specific);
+
+        rc = proto_register(&sctpv6_prot, 1);
         if (rc)
-                goto out;
-        /* Register inet6 protocol. */
-        rc = -EAGAIN;
-        if (inet6_add_protocol(&sctpv6_protocol, IPPROTO_SCTP) < 0)
-                goto out_unregister_sctp_proto;
+                return rc;
 
         /* Add SCTPv6(UDP and TCP style) to inetsw6 linked list. */
         inet6_register_protosw(&sctpv6_seqpacket_protosw);
         inet6_register_protosw(&sctpv6_stream_protosw);
 
-        /* Register the SCTP specific PF_INET6 functions. */
-        sctp_register_pf(&sctp_pf_inet6_specific, PF_INET6);
-
-        /* Register the SCTP specific AF_INET6 functions. */
-        sctp_register_af(&sctp_ipv6_specific);
+        return 0;
+}
 
+/* Register with inet6 layer. */
+int sctp_v6_add_protocol(void)
+{
         /* Register notifier for inet6 address additions/deletions. */
         register_inet6addr_notifier(&sctp_inet6addr_notifier);
-        rc = 0;
-out:
-        return rc;
-out_unregister_sctp_proto:
-        proto_unregister(&sctpv6_prot);
-        goto out;
+
+        if (inet6_add_protocol(&sctpv6_protocol, IPPROTO_SCTP) < 0)
+                return -EAGAIN;
+
+        return 0;
 }
 
 /* IPv6 specific exit support. */
 void sctp_v6_exit(void)
 {
-        list_del(&sctp_ipv6_specific.list);
-        inet6_del_protocol(&sctpv6_protocol, IPPROTO_SCTP);
         inet6_unregister_protosw(&sctpv6_seqpacket_protosw);
         inet6_unregister_protosw(&sctpv6_stream_protosw);
-        unregister_inet6addr_notifier(&sctp_inet6addr_notifier);
         proto_unregister(&sctpv6_prot);
+        list_del(&sctp_ipv6_specific.list);
+}
+
+/* Unregister with inet6 layer. */
+void sctp_v6_del_protocol(void)
+{
+        inet6_del_protocol(&sctpv6_protocol, IPPROTO_SCTP);
+        unregister_inet6addr_notifier(&sctp_inet6addr_notifier);
 }
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index c361deb6cea9..34bab36637ac 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -170,7 +170,7 @@ static void sctp_get_local_addr_list(void)
         struct sctp_af *af;
 
         read_lock(&dev_base_lock);
-        for (dev = dev_base; dev; dev = dev->next) {
+        for_each_netdev(dev) {
                 __list_for_each(pos, &sctp_address_families) {
                         af = list_entry(pos, struct sctp_af, list);
                         af->copy_addrlist(&sctp_local_addr_list, dev);
@@ -975,28 +975,14 @@ SCTP_STATIC __init int sctp_init(void)
         if (!sctp_sanity_check())
                 goto out;
 
-        status = proto_register(&sctp_prot, 1);
-        if (status)
-                goto out;
-
-        /* Add SCTP to inet_protos hash table.  */
-        status = -EAGAIN;
-        if (inet_add_protocol(&sctp_protocol, IPPROTO_SCTP) < 0)
-                goto err_add_protocol;
-
-        /* Add SCTP(TCP and UDP style) to inetsw linked list.  */
-        inet_register_protosw(&sctp_seqpacket_protosw);
-        inet_register_protosw(&sctp_stream_protosw);
-
-        /* Allocate a cache pools. */
+        /* Allocate bind_bucket and chunk caches. */
         status = -ENOBUFS;
         sctp_bucket_cachep = kmem_cache_create("sctp_bind_bucket",
                                                sizeof(struct sctp_bind_bucket),
                                                0, SLAB_HWCACHE_ALIGN,
                                                NULL, NULL);
-
         if (!sctp_bucket_cachep)
-                goto err_bucket_cachep;
+                goto out;
 
         sctp_chunk_cachep = kmem_cache_create("sctp_chunk",
                                                sizeof(struct sctp_chunk),
@@ -1153,6 +1139,14 @@ SCTP_STATIC __init int sctp_init(void)
         INIT_LIST_HEAD(&sctp_address_families);
         sctp_register_af(&sctp_ipv4_specific);
 
+        status = proto_register(&sctp_prot, 1);
+        if (status)
+                goto err_proto_register;
+
+        /* Register SCTP(UDP and TCP style) with socket layer.  */
+        inet_register_protosw(&sctp_seqpacket_protosw);
+        inet_register_protosw(&sctp_stream_protosw);
+
         status = sctp_v6_init();
         if (status)
                 goto err_v6_init;
@@ -1166,19 +1160,39 @@ SCTP_STATIC __init int sctp_init(void)
 
         /* Initialize the local address list. */
         INIT_LIST_HEAD(&sctp_local_addr_list);
-
         sctp_get_local_addr_list();
 
         /* Register notifier for inet address additions/deletions. */
         register_inetaddr_notifier(&sctp_inetaddr_notifier);
 
+        /* Register SCTP with inet layer.  */
+        if (inet_add_protocol(&sctp_protocol, IPPROTO_SCTP) < 0) {
+                status = -EAGAIN;
+                goto err_add_protocol;
+        }
+
+        /* Register SCTP with inet6 layer.  */
+        status = sctp_v6_add_protocol();
+        if (status)
+                goto err_v6_add_protocol;
+
         __unsafe(THIS_MODULE);
         status = 0;
 out:
         return status;
+err_v6_add_protocol:
+        inet_del_protocol(&sctp_protocol, IPPROTO_SCTP);
+        unregister_inetaddr_notifier(&sctp_inetaddr_notifier);
+err_add_protocol:
+        sctp_free_local_addr_list();
+        sock_release(sctp_ctl_socket);
 err_ctl_sock_init:
         sctp_v6_exit();
 err_v6_init:
+        inet_unregister_protosw(&sctp_stream_protosw);
+        inet_unregister_protosw(&sctp_seqpacket_protosw);
+        proto_unregister(&sctp_prot);
+err_proto_register:
         sctp_sysctl_unregister();
         list_del(&sctp_ipv4_specific.list);
         free_pages((unsigned long)sctp_port_hashtable,
@@ -1192,19 +1206,13 @@ err_ehash_alloc:
                              sizeof(struct sctp_hashbucket)));
 err_ahash_alloc:
         sctp_dbg_objcnt_exit();
-err_init_proc:
         sctp_proc_exit();
+err_init_proc:
         cleanup_sctp_mibs();
 err_init_mibs:
         kmem_cache_destroy(sctp_chunk_cachep);
 err_chunk_cachep:
         kmem_cache_destroy(sctp_bucket_cachep);
-err_bucket_cachep:
-        inet_del_protocol(&sctp_protocol, IPPROTO_SCTP);
-        inet_unregister_protosw(&sctp_seqpacket_protosw);
-        inet_unregister_protosw(&sctp_stream_protosw);
-err_add_protocol:
-        proto_unregister(&sctp_prot);
         goto out;
 }
 
@@ -1215,8 +1223,9 @@ SCTP_STATIC __exit void sctp_exit(void)
          * up all the remaining associations and all that memory.
          */
 
-        /* Unregister notifier for inet address additions/deletions. */
-        unregister_inetaddr_notifier(&sctp_inetaddr_notifier);
+        /* Unregister with inet6/inet layers. */
+        sctp_v6_del_protocol();
+        inet_del_protocol(&sctp_protocol, IPPROTO_SCTP);
 
         /* Free the local address list.  */
         sctp_free_local_addr_list();
@@ -1224,7 +1233,16 @@ SCTP_STATIC __exit void sctp_exit(void)
         /* Free the control endpoint.  */
         sock_release(sctp_ctl_socket);
 
+        /* Cleanup v6 initializations. */
         sctp_v6_exit();
+
+        /* Unregister with socket layer. */
+        inet_unregister_protosw(&sctp_stream_protosw);
+        inet_unregister_protosw(&sctp_seqpacket_protosw);
+
+        /* Unregister notifier for inet address additions/deletions. */
+        unregister_inetaddr_notifier(&sctp_inetaddr_notifier);
+
         sctp_sysctl_unregister();
         list_del(&sctp_ipv4_specific.list);
 
@@ -1236,16 +1254,13 @@ SCTP_STATIC __exit void sctp_exit(void)
                    get_order(sctp_port_hashsize *
                              sizeof(struct sctp_bind_hashbucket)));
 
-        kmem_cache_destroy(sctp_chunk_cachep);
-        kmem_cache_destroy(sctp_bucket_cachep);
-
         sctp_dbg_objcnt_exit();
         sctp_proc_exit();
         cleanup_sctp_mibs();
 
-        inet_del_protocol(&sctp_protocol, IPPROTO_SCTP);
-        inet_unregister_protosw(&sctp_seqpacket_protosw);
-        inet_unregister_protosw(&sctp_stream_protosw);
+        kmem_cache_destroy(sctp_chunk_cachep);
+        kmem_cache_destroy(sctp_bucket_cachep);
+
         proto_unregister(&sctp_prot);
 }
 
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index be783a3761c4..8d18f570c2e6 100644
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -1939,7 +1939,6 @@ int sctp_process_init(struct sctp_association *asoc, sctp_cid_t cid,
          * association.
          */
         if (!asoc->temp) {
-                int assoc_id;
                 int error;
 
                 asoc->ssnmap = sctp_ssnmap_new(asoc->c.sinit_max_instreams,
@@ -1947,19 +1946,9 @@ int sctp_process_init(struct sctp_association *asoc, sctp_cid_t cid,
                 if (!asoc->ssnmap)
                         goto clean_up;
 
-        retry:
-                if (unlikely(!idr_pre_get(&sctp_assocs_id, gfp)))
+                error = sctp_assoc_set_id(asoc, gfp);
+                if (error)
                         goto clean_up;
-                spin_lock_bh(&sctp_assocs_id_lock);
-                error = idr_get_new_above(&sctp_assocs_id, (void *)asoc, 1,
-                                          &assoc_id);
-                spin_unlock_bh(&sctp_assocs_id_lock);
-                if (error == -EAGAIN)
-                        goto retry;
-                else if (error)
-                        goto clean_up;
-
-                asoc->assoc_id = (sctp_assoc_t) assoc_id;
         }
 
         /* ADDIP Section 4.1 ASCONF Chunk Procedures
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
index b37a7adeb150..d9fad4f6ffc3 100644
--- a/net/sctp/sm_sideeffect.c
+++ b/net/sctp/sm_sideeffect.c
@@ -862,6 +862,33 @@ static void sctp_cmd_set_sk_err(struct sctp_association *asoc, int error)
                 sk->sk_err = error;
 }
 
+/* Helper function to generate an association change event */
+static void sctp_cmd_assoc_change(sctp_cmd_seq_t *commands,
+                                 struct sctp_association *asoc,
+                                 u8 state)
+{
+        struct sctp_ulpevent *ev;
+
+        ev = sctp_ulpevent_make_assoc_change(asoc, 0, state, 0,
+                                            asoc->c.sinit_num_ostreams,
+                                            asoc->c.sinit_max_instreams,
+                                            NULL, GFP_ATOMIC);
+        if (ev)
+                sctp_ulpq_tail_event(&asoc->ulpq, ev);
+}
+
+/* Helper function to generate an adaptation indication event */
+static void sctp_cmd_adaptation_ind(sctp_cmd_seq_t *commands,
+                                    struct sctp_association *asoc)
+{
+        struct sctp_ulpevent *ev;
+
+        ev = sctp_ulpevent_make_adaptation_indication(asoc, GFP_ATOMIC);
+
+        if (ev)
+                sctp_ulpq_tail_event(&asoc->ulpq, ev);
+}
+
 /* These three macros allow us to pull the debugging code out of the
  * main flow of sctp_do_sm() to keep attention focused on the real
  * functionality there.
@@ -1485,6 +1512,14 @@ static int sctp_cmd_interpreter(sctp_event_t event_type,
                 case SCTP_CMD_SET_SK_ERR:
                         sctp_cmd_set_sk_err(asoc, cmd->obj.error);
                         break;
+                case SCTP_CMD_ASSOC_CHANGE:
+                        sctp_cmd_assoc_change(commands, asoc,
+                                              cmd->obj.u8);
+                        break;
+                case SCTP_CMD_ADAPTATION_IND:
+                        sctp_cmd_adaptation_ind(commands, asoc);
+                        break;
+
                 default:
                         printk(KERN_WARNING "Impossible command: %u, %p\n",
                                cmd->verb, cmd->obj.ptr);
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 9e28a5d51200..f02ce3dddb7b 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -1656,7 +1656,6 @@ static sctp_disposition_t sctp_sf_do_dupcook_b(const struct sctp_endpoint *ep,
                                         struct sctp_association *new_asoc)
 {
         sctp_init_chunk_t *peer_init;
-        struct sctp_ulpevent *ev;
         struct sctp_chunk *repl;
 
         /* new_asoc is a brand-new association, so these are not yet
@@ -1687,34 +1686,28 @@ static sctp_disposition_t sctp_sf_do_dupcook_b(const struct sctp_endpoint *ep,
          * D) IMPLEMENTATION NOTE: An implementation may choose to
          * send the Communication Up notification to the SCTP user
          * upon reception of a valid COOKIE ECHO chunk.
+         *
+         * Sadly, this needs to be implemented as a side-effect, because
+         * we are not guaranteed to have set the association id of the real
+         * association and so these notifications need to be delayed until
+         * the association id is allocated.
          */
-        ev = sctp_ulpevent_make_assoc_change(asoc, 0, SCTP_COMM_UP, 0,
-                                             new_asoc->c.sinit_num_ostreams,
-                                             new_asoc->c.sinit_max_instreams,
-                                             NULL, GFP_ATOMIC);
-        if (!ev)
-                goto nomem_ev;
 
-        sctp_add_cmd_sf(commands, SCTP_CMD_EVENT_ULP, SCTP_ULPEVENT(ev));
+        sctp_add_cmd_sf(commands, SCTP_CMD_ASSOC_CHANGE, SCTP_U8(SCTP_COMM_UP));
 
         /* Sockets API Draft Section 5.3.1.6
          * When a peer sends a Adaptation Layer Indication parameter , SCTP
          * delivers this notification to inform the application that of the
          * peers requested adaptation layer.
+         *
+         * This also needs to be done as a side effect for the same reason as
+         * above.
          */
-        if (asoc->peer.adaptation_ind) {
-                ev = sctp_ulpevent_make_adaptation_indication(asoc, GFP_ATOMIC);
-                if (!ev)
-                        goto nomem_ev;
-
-                sctp_add_cmd_sf(commands, SCTP_CMD_EVENT_ULP,
-                                SCTP_ULPEVENT(ev));
-        }
+        if (asoc->peer.adaptation_ind)
+                sctp_add_cmd_sf(commands, SCTP_CMD_ADAPTATION_IND, SCTP_NULL());
 
         return SCTP_DISPOSITION_CONSUME;
 
-nomem_ev:
-        sctp_chunk_free(repl);
 nomem:
         return SCTP_DISPOSITION_NOMEM;
 }
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 2fc0a92caa78..9f1a908776de 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -972,6 +972,7 @@ static int __sctp_connect(struct sock* sk,
         int walk_size = 0;
         union sctp_addr *sa_addr;
         void *addr_buf;
+        unsigned short port;
 
         sp = sctp_sk(sk);
         ep = sp->ep;
@@ -992,6 +993,7 @@ static int __sctp_connect(struct sock* sk,
         while (walk_size < addrs_size) {
                 sa_addr = (union sctp_addr *)addr_buf;
                 af = sctp_get_af_specific(sa_addr->sa.sa_family);
+                port = ntohs(sa_addr->v4.sin_port);
 
                 /* If the address family is not supported or if this address
                  * causes the address buffer to overflow return EINVAL.
@@ -1005,6 +1007,12 @@ static int __sctp_connect(struct sock* sk,
                 if (err)
                         goto out_free;
 
+                /* Make sure the destination port is correctly set
+                 * in all addresses.
+                 */
+                if (asoc && asoc->peer.port && asoc->peer.port != port)
+                        goto out_free;
+
                 memcpy(&to, sa_addr, af->sockaddr_len);
 
                 /* Check if there already is a matching association on the
@@ -5012,7 +5020,8 @@ pp_found:
                 struct hlist_node *node;
 
                 SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n");
-                if (pp->fastreuse && sk->sk_reuse)
+                if (pp->fastreuse && sk->sk_reuse &&
+                        sk->sk_state != SCTP_SS_LISTENING)
                         goto success;
 
                 /* Run through the list of sockets bound to the port
@@ -5029,7 +5038,8 @@ pp_found:
                         struct sctp_endpoint *ep2;
                         ep2 = sctp_sk(sk2)->ep;
 
-                        if (reuse && sk2->sk_reuse)
+                        if (reuse && sk2->sk_reuse &&
+                            sk2->sk_state != SCTP_SS_LISTENING)
                                 continue;
 
                         if (sctp_bind_addr_match(&ep2->base.bind_addr, addr,
@@ -5050,9 +5060,13 @@ pp_not_found:
          * if sk->sk_reuse is too (that is, if the caller requested
          * SO_REUSEADDR on this socket -sk-).
          */
-        if (hlist_empty(&pp->owner))
-                pp->fastreuse = sk->sk_reuse ? 1 : 0;
-        else if (pp->fastreuse && !sk->sk_reuse)
+        if (hlist_empty(&pp->owner)) {
+                if (sk->sk_reuse && sk->sk_state != SCTP_SS_LISTENING)
+                        pp->fastreuse = 1;
+                else
+                        pp->fastreuse = 0;
+        } else if (pp->fastreuse &&
+                (!sk->sk_reuse || sk->sk_state == SCTP_SS_LISTENING))
                 pp->fastreuse = 0;
 
         /* We are set, so fill up all the data in the hash table
@@ -5060,8 +5074,8 @@ pp_not_found:
          * sockets FIXME: Blurry, NPI (ipg).
          */
 success:
-        inet_sk(sk)->num = snum;
         if (!sctp_sk(sk)->bind_hash) {
+                inet_sk(sk)->num = snum;
                 sk_add_bind_node(sk, &pp->owner);
                 sctp_sk(sk)->bind_hash = pp;
         }
@@ -5134,12 +5148,16 @@ SCTP_STATIC int sctp_seqpacket_listen(struct sock *sk, int backlog)
          * This is not currently spelled out in the SCTP sockets
          * extensions draft, but follows the practice as seen in TCP
          * sockets.
+         *
+         * Additionally, turn off fastreuse flag since we are not listening
          */
+        sk->sk_state = SCTP_SS_LISTENING;
         if (!ep->base.bind_addr.port) {
                 if (sctp_autobind(sk))
                         return -EAGAIN;
-        }
-        sk->sk_state = SCTP_SS_LISTENING;
+        } else
+                sctp_sk(sk)->bind_hash->fastreuse = 0;
+
         sctp_hash_endpoint(ep);
         return 0;
 }
@@ -5177,11 +5195,13 @@ SCTP_STATIC int sctp_stream_listen(struct sock *sk, int backlog)
          * extensions draft, but follows the practice as seen in TCP
          * sockets.
          */
+        sk->sk_state = SCTP_SS_LISTENING;
         if (!ep->base.bind_addr.port) {
                 if (sctp_autobind(sk))
                         return -EAGAIN;
-        }
-        sk->sk_state = SCTP_SS_LISTENING;
+        } else
+                sctp_sk(sk)->bind_hash->fastreuse = 0;
+
         sk->sk_max_ack_backlog = backlog;
         sctp_hash_endpoint(ep);
         return 0;
diff --git a/net/socket.c b/net/socket.c
index 1ad62c08377b..759825b7ca26 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -261,8 +261,7 @@ static void init_once(void *foo, struct kmem_cache *cachep, unsigned long flags)
 {
         struct socket_alloc *ei = (struct socket_alloc *)foo;
 
-        if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR))
-            == SLAB_CTOR_CONSTRUCTOR)
+        if (flags & SLAB_CTOR_CONSTRUCTOR)
                 inode_init_once(&ei->vfs_inode);
 }
 
diff --git a/net/sunrpc/Makefile b/net/sunrpc/Makefile
index cdcab9ca4c60..8ebfc4db7f51 100644
--- a/net/sunrpc/Makefile
+++ b/net/sunrpc/Makefile
@@ -9,7 +9,7 @@ obj-$(CONFIG_SUNRPC_GSS) += auth_gss/
 sunrpc-y := clnt.o xprt.o socklib.o xprtsock.o sched.o \
             auth.o auth_null.o auth_unix.o \
             svc.o svcsock.o svcauth.o svcauth_unix.o \
-            pmap_clnt.o timer.o xdr.o \
+            rpcb_clnt.o timer.o xdr.o \
             sunrpc_syms.o cache.o rpc_pipe.o
 sunrpc-$(CONFIG_PROC_FS) += stats.o
 sunrpc-$(CONFIG_SYSCTL) += sysctl.o
diff --git a/net/sunrpc/auth_gss/gss_spkm3_seal.c b/net/sunrpc/auth_gss/gss_spkm3_seal.c
index 104cbf4f769f..d158635de6c0 100644
--- a/net/sunrpc/auth_gss/gss_spkm3_seal.c
+++ b/net/sunrpc/auth_gss/gss_spkm3_seal.c
@@ -123,9 +123,6 @@ spkm3_make_token(struct spkm3_ctx *ctx,
 
         return  GSS_S_COMPLETE;
 out_err:
-        if (md5cksum.data)
-                kfree(md5cksum.data);
-
         token->data = NULL;
         token->len = 0;
         return GSS_S_FAILURE;
@@ -152,7 +149,7 @@ make_spkm3_checksum(s32 cksumtype, struct xdr_netobj *key, char *header,
 
         switch (cksumtype) {
                 case CKSUMTYPE_HMAC_MD5:
-                        cksumname = "md5";
+                        cksumname = "hmac(md5)";
                         break;
                 default:
                         dprintk("RPC:       spkm3_make_checksum:"
@@ -172,8 +169,12 @@ make_spkm3_checksum(s32 cksumtype, struct xdr_netobj *key, char *header,
         if (err)
                 goto out;
 
+        err = crypto_hash_init(&desc);
+        if (err)
+                goto out;
+
         sg_set_buf(sg, header, hdrlen);
-        crypto_hash_update(&desc, sg, 1);
+        crypto_hash_update(&desc, sg, sg->length);
 
         xdr_process_buf(body, body_offset, body->len - body_offset,
                         spkm3_checksummer, &desc);
@@ -184,5 +185,3 @@ out:
 
         return err ? GSS_S_FAILURE : 0;
 }
-
-EXPORT_SYMBOL(make_spkm3_checksum);
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 396cdbe249d1..d8fbee40a19c 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -36,8 +36,6 @@
 #include <linux/sunrpc/metrics.h>
 
 
-#define RPC_SLACK_SPACE         (1024)  /* total overkill */
-
 #ifdef RPC_DEBUG
 # define RPCDBG_FACILITY        RPCDBG_CALL
 #endif
@@ -747,21 +745,38 @@ call_reserveresult(struct rpc_task *task)
 static void
 call_allocate(struct rpc_task *task)
 {
+        unsigned int slack = task->tk_auth->au_cslack;
         struct rpc_rqst *req = task->tk_rqstp;
         struct rpc_xprt *xprt = task->tk_xprt;
-        unsigned int    bufsiz;
+        struct rpc_procinfo *proc = task->tk_msg.rpc_proc;
 
         dprint_status(task);
 
+        task->tk_status = 0;
         task->tk_action = call_bind;
+
         if (req->rq_buffer)
                 return;
 
-        /* FIXME: compute buffer requirements more exactly using
-         * auth->au_wslack */
-        bufsiz = task->tk_msg.rpc_proc->p_bufsiz + RPC_SLACK_SPACE;
+        if (proc->p_proc != 0) {
+                BUG_ON(proc->p_arglen == 0);
+                if (proc->p_decode != NULL)
+                        BUG_ON(proc->p_replen == 0);
+        }
 
-        if (xprt->ops->buf_alloc(task, bufsiz << 1) != NULL)
+        /*
+         * Calculate the size (in quads) of the RPC call
+         * and reply headers, and convert both values
+         * to byte sizes.
+         */
+        req->rq_callsize = RPC_CALLHDRSIZE + (slack << 1) + proc->p_arglen;
+        req->rq_callsize <<= 2;
+        req->rq_rcvsize = RPC_REPHDRSIZE + slack + proc->p_replen;
+        req->rq_rcvsize <<= 2;
+
+        req->rq_buffer = xprt->ops->buf_alloc(task,
+                                        req->rq_callsize + req->rq_rcvsize);
+        if (req->rq_buffer != NULL)
                 return;
 
         dprintk("RPC: %5u rpc_buffer allocation failed\n", task->tk_pid);
@@ -788,6 +803,17 @@ rpc_task_force_reencode(struct rpc_task *task)
         task->tk_rqstp->rq_snd_buf.len = 0;
 }
 
+static inline void
+rpc_xdr_buf_init(struct xdr_buf *buf, void *start, size_t len)
+{
+        buf->head[0].iov_base = start;
+        buf->head[0].iov_len = len;
+        buf->tail[0].iov_len = 0;
+        buf->page_len = 0;
+        buf->len = 0;
+        buf->buflen = len;
+}
+
 /*
  * 3.   Encode arguments of an RPC call
  */
@@ -795,28 +821,17 @@ static void
 call_encode(struct rpc_task *task)
 {
         struct rpc_rqst *req = task->tk_rqstp;
-        struct xdr_buf *sndbuf = &req->rq_snd_buf;
-        struct xdr_buf *rcvbuf = &req->rq_rcv_buf;
-        unsigned int    bufsiz;
         kxdrproc_t      encode;
         __be32          *p;
 
         dprint_status(task);
 
-        /* Default buffer setup */
-        bufsiz = req->rq_bufsize >> 1;
-        sndbuf->head[0].iov_base = (void *)req->rq_buffer;
-        sndbuf->head[0].iov_len  = bufsiz;
-        sndbuf->tail[0].iov_len  = 0;
-        sndbuf->page_len         = 0;
-        sndbuf->len              = 0;
-        sndbuf->buflen           = bufsiz;
-        rcvbuf->head[0].iov_base = (void *)((char *)req->rq_buffer + bufsiz);
-        rcvbuf->head[0].iov_len  = bufsiz;
-        rcvbuf->tail[0].iov_len  = 0;
-        rcvbuf->page_len         = 0;
-        rcvbuf->len              = 0;
-        rcvbuf->buflen           = bufsiz;
+        rpc_xdr_buf_init(&req->rq_snd_buf,
+                         req->rq_buffer,
+                         req->rq_callsize);
+        rpc_xdr_buf_init(&req->rq_rcv_buf,
+                         (char *)req->rq_buffer + req->rq_callsize,
+                         req->rq_rcvsize);
 
         /* Encode header and provided arguments */
         encode = task->tk_msg.rpc_proc->p_encode;
@@ -887,9 +902,11 @@ call_bind_status(struct rpc_task *task)
                                 task->tk_pid);
                 break;
         case -EPROTONOSUPPORT:
-                dprintk("RPC: %5u remote rpcbind version 2 unavailable\n",
+                dprintk("RPC: %5u remote rpcbind version unavailable, retrying\n",
                                 task->tk_pid);
-                break;
+                task->tk_status = 0;
+                task->tk_action = call_bind;
+                return;
         default:
                 dprintk("RPC: %5u unrecognized rpcbind error (%d)\n",
                                 task->tk_pid, -task->tk_status);
diff --git a/net/sunrpc/pmap_clnt.c b/net/sunrpc/pmap_clnt.c
deleted file mode 100644
index d9f765344589..000000000000
--- a/net/sunrpc/pmap_clnt.c
+++ /dev/null
@@ -1,383 +0,0 @@
-/*
- * linux/net/sunrpc/pmap_clnt.c
- *
- * In-kernel RPC portmapper client.
- *
- * Portmapper supports version 2 of the rpcbind protocol (RFC 1833).
- *
- * Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de>
- */
-
-#include <linux/types.h>
-#include <linux/socket.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/uio.h>
-#include <linux/in.h>
-#include <linux/sunrpc/clnt.h>
-#include <linux/sunrpc/sched.h>
-
-#ifdef RPC_DEBUG
-# define RPCDBG_FACILITY        RPCDBG_PMAP
-#endif
-
-#define PMAP_SET                1
-#define PMAP_UNSET              2
-#define PMAP_GETPORT            3
-
-struct portmap_args {
-        u32                     pm_prog;
-        u32                     pm_vers;
-        u32                     pm_prot;
-        unsigned short          pm_port;
-        struct rpc_xprt *       pm_xprt;
-};
-
-static struct rpc_procinfo      pmap_procedures[];
-static struct rpc_clnt *        pmap_create(char *, struct sockaddr_in *, int, int);
-static void                     pmap_getport_done(struct rpc_task *, void *);
-static struct rpc_program       pmap_program;
-
-static void pmap_getport_prepare(struct rpc_task *task, void *calldata)
-{
-        struct portmap_args *map = calldata;
-        struct rpc_message msg = {
-                .rpc_proc       = &pmap_procedures[PMAP_GETPORT],
-                .rpc_argp       = map,
-                .rpc_resp       = &map->pm_port,
-        };
-
-        rpc_call_setup(task, &msg, 0);
-}
-
-static inline struct portmap_args *pmap_map_alloc(void)
-{
-        return kmalloc(sizeof(struct portmap_args), GFP_NOFS);
-}
-
-static inline void pmap_map_free(struct portmap_args *map)
-{
-        kfree(map);
-}
-
-static void pmap_map_release(void *data)
-{
-        struct portmap_args *map = data;
-
-        xprt_put(map->pm_xprt);
-        pmap_map_free(map);
-}
-
-static const struct rpc_call_ops pmap_getport_ops = {
-        .rpc_call_prepare       = pmap_getport_prepare,
-        .rpc_call_done          = pmap_getport_done,
-        .rpc_release            = pmap_map_release,
-};
-
-static inline void pmap_wake_portmap_waiters(struct rpc_xprt *xprt, int status)
-{
-        xprt_clear_binding(xprt);
-        rpc_wake_up_status(&xprt->binding, status);
-}
-
-/**
- * rpc_getport - obtain the port for a given RPC service on a given host
- * @task: task that is waiting for portmapper request
- *
- * This one can be called for an ongoing RPC request, and can be used in
- * an async (rpciod) context.
- */
-void rpc_getport(struct rpc_task *task)
-{
-        struct rpc_clnt *clnt = task->tk_client;
-        struct rpc_xprt *xprt = task->tk_xprt;
-        struct sockaddr_in addr;
-        struct portmap_args *map;
-        struct rpc_clnt *pmap_clnt;
-        struct rpc_task *child;
-        int status;
-
-        dprintk("RPC: %5u rpc_getport(%s, %u, %u, %d)\n",
-                        task->tk_pid, clnt->cl_server,
-                        clnt->cl_prog, clnt->cl_vers, xprt->prot);
-
-        /* Autobind on cloned rpc clients is discouraged */
-        BUG_ON(clnt->cl_parent != clnt);
-
-        status = -EACCES;               /* tell caller to check again */
-        if (xprt_test_and_set_binding(xprt))
-                goto bailout_nowake;
-
-        /* Put self on queue before sending rpcbind request, in case
-         * pmap_getport_done completes before we return from rpc_run_task */
-        rpc_sleep_on(&xprt->binding, task, NULL, NULL);
-
-        /* Someone else may have bound if we slept */
-        status = 0;
-        if (xprt_bound(xprt))
-                goto bailout_nofree;
-
-        status = -ENOMEM;
-        map = pmap_map_alloc();
-        if (!map)
-                goto bailout_nofree;
-        map->pm_prog = clnt->cl_prog;
-        map->pm_vers = clnt->cl_vers;
-        map->pm_prot = xprt->prot;
-        map->pm_port = 0;
-        map->pm_xprt = xprt_get(xprt);
-
-        rpc_peeraddr(clnt, (struct sockaddr *) &addr, sizeof(addr));
-        pmap_clnt = pmap_create(clnt->cl_server, &addr, map->pm_prot, 0);
-        status = PTR_ERR(pmap_clnt);
-        if (IS_ERR(pmap_clnt))
-                goto bailout;
-
-        status = -EIO;
-        child = rpc_run_task(pmap_clnt, RPC_TASK_ASYNC, &pmap_getport_ops, map);
-        if (IS_ERR(child))
-                goto bailout_nofree;
-        rpc_put_task(child);
-
-        task->tk_xprt->stat.bind_count++;
-        return;
-
-bailout:
-        pmap_map_free(map);
-        xprt_put(xprt);
-bailout_nofree:
-        pmap_wake_portmap_waiters(xprt, status);
-bailout_nowake:
-        task->tk_status = status;
-}
-
-#ifdef CONFIG_ROOT_NFS
-/**
- * rpc_getport_external - obtain the port for a given RPC service on a given host
- * @sin: address of remote peer
- * @prog: RPC program number to bind
- * @vers: RPC version number to bind
- * @prot: transport protocol to use to make this request
- *
- * This one is called from outside the RPC client in a synchronous task context.
- */
-int rpc_getport_external(struct sockaddr_in *sin, __u32 prog, __u32 vers, int prot)
-{
-        struct portmap_args map = {
-                .pm_prog        = prog,
-                .pm_vers        = vers,
-                .pm_prot        = prot,
-                .pm_port        = 0
-        };
-        struct rpc_message msg = {
-                .rpc_proc       = &pmap_procedures[PMAP_GETPORT],
-                .rpc_argp       = &map,
-                .rpc_resp       = &map.pm_port,
-        };
-        struct rpc_clnt *pmap_clnt;
-        char            hostname[32];
-        int             status;
-
-        dprintk("RPC:       rpc_getport_external(%u.%u.%u.%u, %u, %u, %d)\n",
-                        NIPQUAD(sin->sin_addr.s_addr), prog, vers, prot);
-
-        sprintf(hostname, "%u.%u.%u.%u", NIPQUAD(sin->sin_addr.s_addr));
-        pmap_clnt = pmap_create(hostname, sin, prot, 0);
-        if (IS_ERR(pmap_clnt))
-                return PTR_ERR(pmap_clnt);
-
-        /* Setup the call info struct */
-        status = rpc_call_sync(pmap_clnt, &msg, 0);
-
-        if (status >= 0) {
-                if (map.pm_port != 0)
-                        return map.pm_port;
-                status = -EACCES;
-        }
-        return status;
-}
-#endif
-
-/*
- * Portmapper child task invokes this callback via tk_exit.
- */
-static void pmap_getport_done(struct rpc_task *child, void *data)
-{
-        struct portmap_args *map = data;
-        struct rpc_xprt *xprt = map->pm_xprt;
-        int status = child->tk_status;
-
-        if (status < 0) {
-                /* Portmapper not available */
-                xprt->ops->set_port(xprt, 0);
-        } else if (map->pm_port == 0) {
-                /* Requested RPC service wasn't registered */
-                xprt->ops->set_port(xprt, 0);
-                status = -EACCES;
-        } else {
-                /* Succeeded */
-                xprt->ops->set_port(xprt, map->pm_port);
-                xprt_set_bound(xprt);
-                status = 0;
-        }
-
-        dprintk("RPC: %5u pmap_getport_done(status %d, port %u)\n",
-                        child->tk_pid, status, map->pm_port);
-
-        pmap_wake_portmap_waiters(xprt, status);
-}
-
-/**
- * rpc_register - set or unset a port registration with the local portmapper
- * @prog: RPC program number to bind
- * @vers: RPC version number to bind
- * @prot: transport protocol to use to make this request
- * @port: port value to register
- * @okay: result code
- *
- * port == 0 means unregister, port != 0 means register.
- */
-int rpc_register(u32 prog, u32 vers, int prot, unsigned short port, int *okay)
-{
-        struct sockaddr_in      sin = {
-                .sin_family     = AF_INET,
-                .sin_addr.s_addr = htonl(INADDR_LOOPBACK),
-        };
-        struct portmap_args     map = {
-                .pm_prog        = prog,
-                .pm_vers        = vers,
-                .pm_prot        = prot,
-                .pm_port        = port,
-        };
-        struct rpc_message msg = {
-                .rpc_proc       = &pmap_procedures[port ? PMAP_SET : PMAP_UNSET],
-                .rpc_argp       = &map,
-                .rpc_resp       = okay,
-        };
-        struct rpc_clnt         *pmap_clnt;
-        int error = 0;
-
-        dprintk("RPC:       registering (%u, %u, %d, %u) with portmapper.\n",
-                        prog, vers, prot, port);
-
-        pmap_clnt = pmap_create("localhost", &sin, IPPROTO_UDP, 1);
-        if (IS_ERR(pmap_clnt)) {
-                error = PTR_ERR(pmap_clnt);
-                dprintk("RPC:       couldn't create pmap client. Error = %d\n",
-                                error);
-                return error;
-        }
-
-        error = rpc_call_sync(pmap_clnt, &msg, 0);
-
-        if (error < 0) {
-                printk(KERN_WARNING
-                        "RPC: failed to contact portmap (errno %d).\n",
-                        error);
-        }
-        dprintk("RPC:       registration status %d/%d\n", error, *okay);
-
-        /* Client deleted automatically because cl_oneshot == 1 */
-        return error;
-}
-
-static struct rpc_clnt *pmap_create(char *hostname, struct sockaddr_in *srvaddr, int proto, int privileged)
-{
-        struct rpc_create_args args = {
-                .protocol       = proto,
-                .address        = (struct sockaddr *)srvaddr,
-                .addrsize       = sizeof(*srvaddr),
-                .servername     = hostname,
-                .program        = &pmap_program,
-                .version        = RPC_PMAP_VERSION,
-                .authflavor     = RPC_AUTH_UNIX,
-                .flags          = (RPC_CLNT_CREATE_ONESHOT |
-                                   RPC_CLNT_CREATE_NOPING),
-        };
-
-        srvaddr->sin_port = htons(RPC_PMAP_PORT);
-        if (!privileged)
-                args.flags |= RPC_CLNT_CREATE_NONPRIVPORT;
-        return rpc_create(&args);
-}
-
-/*
- * XDR encode/decode functions for PMAP
- */
-static int xdr_encode_mapping(struct rpc_rqst *req, __be32 *p, struct portmap_args *map)
-{
-        dprintk("RPC:       xdr_encode_mapping(%u, %u, %u, %u)\n",
-                        map->pm_prog, map->pm_vers,
-                        map->pm_prot, map->pm_port);
-        *p++ = htonl(map->pm_prog);
-        *p++ = htonl(map->pm_vers);
-        *p++ = htonl(map->pm_prot);
-        *p++ = htonl(map->pm_port);
-
-        req->rq_slen = xdr_adjust_iovec(req->rq_svec, p);
-        return 0;
-}
-
-static int xdr_decode_port(struct rpc_rqst *req, __be32 *p, unsigned short *portp)
-{
-        *portp = (unsigned short) ntohl(*p++);
-        return 0;
-}
-
-static int xdr_decode_bool(struct rpc_rqst *req, __be32 *p, unsigned int *boolp)
-{
-        *boolp = (unsigned int) ntohl(*p++);
-        return 0;
-}
-
-static struct rpc_procinfo      pmap_procedures[] = {
-[PMAP_SET] = {
-          .p_proc               = PMAP_SET,
-          .p_encode             = (kxdrproc_t) xdr_encode_mapping,
-          .p_decode             = (kxdrproc_t) xdr_decode_bool,
-          .p_bufsiz             = 4,
-          .p_count              = 1,
-          .p_statidx            = PMAP_SET,
-          .p_name               = "SET",
-        },
-[PMAP_UNSET] = {
-          .p_proc               = PMAP_UNSET,
-          .p_encode             = (kxdrproc_t) xdr_encode_mapping,
-          .p_decode             = (kxdrproc_t) xdr_decode_bool,
-          .p_bufsiz             = 4,
-          .p_count              = 1,
-          .p_statidx            = PMAP_UNSET,
-          .p_name               = "UNSET",
-        },
-[PMAP_GETPORT] = {
-          .p_proc               = PMAP_GETPORT,
-          .p_encode             = (kxdrproc_t) xdr_encode_mapping,
-          .p_decode             = (kxdrproc_t) xdr_decode_port,
-          .p_bufsiz             = 4,
-          .p_count              = 1,
-          .p_statidx            = PMAP_GETPORT,
-          .p_name               = "GETPORT",
-        },
-};
-
-static struct rpc_version       pmap_version2 = {
-        .number         = 2,
-        .nrprocs        = 4,
-        .procs          = pmap_procedures
-};
-
-static struct rpc_version *     pmap_version[] = {
-        NULL,
-        NULL,
-        &pmap_version2
-};
-
-static struct rpc_stat          pmap_stats;
-
-static struct rpc_program       pmap_program = {
-        .name           = "portmap",
-        .number         = RPC_PMAP_PROGRAM,
-        .nrvers         = ARRAY_SIZE(pmap_version),
-        .version        = pmap_version,
-        .stats          = &pmap_stats,
-};
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index 9b9ea5045569..ad39b47e05bc 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -828,8 +828,7 @@ init_once(void * foo, struct kmem_cache * cachep, unsigned long flags)
 {
         struct rpc_inode *rpci = (struct rpc_inode *) foo;
 
-        if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
-            SLAB_CTOR_CONSTRUCTOR) {
+        if (flags & SLAB_CTOR_CONSTRUCTOR) {
                 inode_init_once(&rpci->vfs_inode);
                 rpci->private = NULL;
                 rpci->nreaders = 0;
diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
new file mode 100644
index 000000000000..6c7aa8a1f0c6
--- /dev/null
+++ b/net/sunrpc/rpcb_clnt.c
@@ -0,0 +1,625 @@
+/*
+ * In-kernel rpcbind client supporting versions 2, 3, and 4 of the rpcbind
+ * protocol
+ *
+ * Based on RFC 1833: "Binding Protocols for ONC RPC Version 2" and
+ * RFC 3530: "Network File System (NFS) version 4 Protocol"
+ *
+ * Original: Gilles Quillard, Bull Open Source, 2005 <gilles.quillard@bull.net>
+ * Updated: Chuck Lever, Oracle Corporation, 2007 <chuck.lever@oracle.com>
+ *
+ * Descended from net/sunrpc/pmap_clnt.c,
+ *  Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de>
+ */
+
+#include <linux/types.h>
+#include <linux/socket.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+
+#include <linux/sunrpc/clnt.h>
+#include <linux/sunrpc/sched.h>
+
+#ifdef RPC_DEBUG
+# define RPCDBG_FACILITY        RPCDBG_BIND
+#endif
+
+#define RPCBIND_PROGRAM         (100000u)
+#define RPCBIND_PORT            (111u)
+
+enum {
+        RPCBPROC_NULL,
+        RPCBPROC_SET,
+        RPCBPROC_UNSET,
+        RPCBPROC_GETPORT,
+        RPCBPROC_GETADDR = 3,           /* alias for GETPORT */
+        RPCBPROC_DUMP,
+        RPCBPROC_CALLIT,
+        RPCBPROC_BCAST = 5,             /* alias for CALLIT */
+        RPCBPROC_GETTIME,
+        RPCBPROC_UADDR2TADDR,
+        RPCBPROC_TADDR2UADDR,
+        RPCBPROC_GETVERSADDR,
+        RPCBPROC_INDIRECT,
+        RPCBPROC_GETADDRLIST,
+        RPCBPROC_GETSTAT,
+};
+
+#define RPCB_HIGHPROC_2         RPCBPROC_CALLIT
+#define RPCB_HIGHPROC_3         RPCBPROC_TADDR2UADDR
+#define RPCB_HIGHPROC_4         RPCBPROC_GETSTAT
+
+/*
+ * r_addr
+ *
+ * Quoting RFC 3530, section 2.2:
+ *
+ * For TCP over IPv4 and for UDP over IPv4, the format of r_addr is the
+ * US-ASCII string:
+ *
+ *      h1.h2.h3.h4.p1.p2
+ *
+ * The prefix, "h1.h2.h3.h4", is the standard textual form for
+ * representing an IPv4 address, which is always four octets long.
+ * Assuming big-endian ordering, h1, h2, h3, and h4, are respectively,
+ * the first through fourth octets each converted to ASCII-decimal.
+ * Assuming big-endian ordering, p1 and p2 are, respectively, the first
+ * and second octets each converted to ASCII-decimal.  For example, if a
+ * host, in big-endian order, has an address of 0x0A010307 and there is
+ * a service listening on, in big endian order, port 0x020F (decimal
+ * 527), then the complete universal address is "10.1.3.7.2.15".
+ *
+ * ...
+ *
+ * For TCP over IPv6 and for UDP over IPv6, the format of r_addr is the
+ * US-ASCII string:
+ *
+ *      x1:x2:x3:x4:x5:x6:x7:x8.p1.p2
+ *
+ * The suffix "p1.p2" is the service port, and is computed the same way
+ * as with universal addresses for TCP and UDP over IPv4.  The prefix,
+ * "x1:x2:x3:x4:x5:x6:x7:x8", is the standard textual form for
+ * representing an IPv6 address as defined in Section 2.2 of [RFC2373].
+ * Additionally, the two alternative forms specified in Section 2.2 of
+ * [RFC2373] are also acceptable.
+ *
+ * XXX: Currently this implementation does not explicitly convert the
+ *      stored address to US-ASCII on non-ASCII systems.
+ */
+#define RPCB_MAXADDRLEN         (128u)
+
+/*
+ * r_netid
+ *
+ * Quoting RFC 3530, section 2.2:
+ *
+ * For TCP over IPv4 the value of r_netid is the string "tcp".  For UDP
+ * over IPv4 the value of r_netid is the string "udp".
+ *
+ * ...
+ *
+ * For TCP over IPv6 the value of r_netid is the string "tcp6".  For UDP
+ * over IPv6 the value of r_netid is the string "udp6".
+ */
+#define RPCB_NETID_UDP  "\165\144\160"          /* "udp" */
+#define RPCB_NETID_TCP  "\164\143\160"          /* "tcp" */
+#define RPCB_NETID_UDP6 "\165\144\160\066"      /* "udp6" */
+#define RPCB_NETID_TCP6 "\164\143\160\066"      /* "tcp6" */
+
+#define RPCB_MAXNETIDLEN        (4u)
+
+/*
+ * r_owner
+ *
+ * The "owner" is allowed to unset a service in the rpcbind database.
+ * We always use the following (arbitrary) fixed string.
+ */
+#define RPCB_OWNER_STRING       "rpcb"
+#define RPCB_MAXOWNERLEN        sizeof(RPCB_OWNER_STRING)
+
+static void                     rpcb_getport_done(struct rpc_task *, void *);
+extern struct rpc_program       rpcb_program;
+
+struct rpcbind_args {
+        struct rpc_xprt *       r_xprt;
+
+        u32                     r_prog;
+        u32                     r_vers;
+        u32                     r_prot;
+        unsigned short          r_port;
+        char *                  r_netid;
+        char                    r_addr[RPCB_MAXADDRLEN];
+        char *                  r_owner;
+};
+
+static struct rpc_procinfo rpcb_procedures2[];
+static struct rpc_procinfo rpcb_procedures3[];
+
+static struct rpcb_info {
+        int                     rpc_vers;
+        struct rpc_procinfo *   rpc_proc;
+} rpcb_next_version[];
+
+static void rpcb_getport_prepare(struct rpc_task *task, void *calldata)
+{
+        struct rpcbind_args *map = calldata;
+        struct rpc_xprt *xprt = map->r_xprt;
+        struct rpc_message msg = {
+                .rpc_proc       = rpcb_next_version[xprt->bind_index].rpc_proc,
+                .rpc_argp       = map,
+                .rpc_resp       = &map->r_port,
+        };
+
+        rpc_call_setup(task, &msg, 0);
+}
+
+static void rpcb_map_release(void *data)
+{
+        struct rpcbind_args *map = data;
+
+        xprt_put(map->r_xprt);
+        kfree(map);
+}
+
+static const struct rpc_call_ops rpcb_getport_ops = {
+        .rpc_call_prepare       = rpcb_getport_prepare,
+        .rpc_call_done          = rpcb_getport_done,
+        .rpc_release            = rpcb_map_release,
+};
+
+static void rpcb_wake_rpcbind_waiters(struct rpc_xprt *xprt, int status)
+{
+        xprt_clear_binding(xprt);
+        rpc_wake_up_status(&xprt->binding, status);
+}
+
+static struct rpc_clnt *rpcb_create(char *hostname, struct sockaddr *srvaddr,
+                                        int proto, int version, int privileged)
+{
+        struct rpc_create_args args = {
+                .protocol       = proto,
+                .address        = srvaddr,
+                .addrsize       = sizeof(struct sockaddr_in),
+                .servername     = hostname,
+                .program        = &rpcb_program,
+                .version        = version,
+                .authflavor     = RPC_AUTH_UNIX,
+                .flags          = (RPC_CLNT_CREATE_ONESHOT |
+                                   RPC_CLNT_CREATE_NOPING),
+        };
+
+        ((struct sockaddr_in *)srvaddr)->sin_port = htons(RPCBIND_PORT);
+        if (!privileged)
+                args.flags |= RPC_CLNT_CREATE_NONPRIVPORT;
+        return rpc_create(&args);
+}
+
+/**
+ * rpcb_register - set or unset a port registration with the local rpcbind svc
+ * @prog: RPC program number to bind
+ * @vers: RPC version number to bind
+ * @prot: transport protocol to use to make this request
+ * @port: port value to register
+ * @okay: result code
+ *
+ * port == 0 means unregister, port != 0 means register.
+ *
+ * This routine supports only rpcbind version 2.
+ */
+int rpcb_register(u32 prog, u32 vers, int prot, unsigned short port, int *okay)
+{
+        struct sockaddr_in sin = {
+                .sin_family             = AF_INET,
+                .sin_addr.s_addr        = htonl(INADDR_LOOPBACK),
+        };
+        struct rpcbind_args map = {
+                .r_prog         = prog,
+                .r_vers         = vers,
+                .r_prot         = prot,
+                .r_port         = port,
+        };
+        struct rpc_message msg = {
+                .rpc_proc       = &rpcb_procedures2[port ?
+                                        RPCBPROC_SET : RPCBPROC_UNSET],
+                .rpc_argp       = &map,
+                .rpc_resp       = okay,
+        };
+        struct rpc_clnt *rpcb_clnt;
+        int error = 0;
+
+        dprintk("RPC:       %sregistering (%u, %u, %d, %u) with local "
+                        "rpcbind\n", (port ? "" : "un"),
+                        prog, vers, prot, port);
+
+        rpcb_clnt = rpcb_create("localhost", (struct sockaddr *) &sin,
+                                        IPPROTO_UDP, 2, 1);
+        if (IS_ERR(rpcb_clnt))
+                return PTR_ERR(rpcb_clnt);
+
+        error = rpc_call_sync(rpcb_clnt, &msg, 0);
+
+        if (error < 0)
+                printk(KERN_WARNING "RPC: failed to contact local rpcbind "
+                                "server (errno %d).\n", -error);
+        dprintk("RPC:       registration status %d/%d\n", error, *okay);
+
+        return error;
+}
+
+#ifdef CONFIG_ROOT_NFS
+/**
+ * rpcb_getport_external - obtain the port for an RPC service on a given host
+ * @sin: address of remote peer
+ * @prog: RPC program number to bind
+ * @vers: RPC version number to bind
+ * @prot: transport protocol to use to make this request
+ *
+ * Called from outside the RPC client in a synchronous task context.
+ *
+ * For now, this supports only version 2 queries, but is used only by
+ * mount_clnt for NFS_ROOT.
+ */
+int rpcb_getport_external(struct sockaddr_in *sin, __u32 prog,
+                                __u32 vers, int prot)
+{
+        struct rpcbind_args map = {
+                .r_prog         = prog,
+                .r_vers         = vers,
+                .r_prot         = prot,
+                .r_port         = 0,
+        };
+        struct rpc_message msg = {
+                .rpc_proc       = &rpcb_procedures2[RPCBPROC_GETPORT],
+                .rpc_argp       = &map,
+                .rpc_resp       = &map.r_port,
+        };
+        struct rpc_clnt *rpcb_clnt;
+        char hostname[40];
+        int status;
+
+        dprintk("RPC:       rpcb_getport_external(%u.%u.%u.%u, %u, %u, %d)\n",
+                        NIPQUAD(sin->sin_addr.s_addr), prog, vers, prot);
+
+        sprintf(hostname, "%u.%u.%u.%u", NIPQUAD(sin->sin_addr.s_addr));
+        rpcb_clnt = rpcb_create(hostname, (struct sockaddr *)sin, prot, 2, 0);
+        if (IS_ERR(rpcb_clnt))
+                return PTR_ERR(rpcb_clnt);
+
+        status = rpc_call_sync(rpcb_clnt, &msg, 0);
+
+        if (status >= 0) {
+                if (map.r_port != 0)
+                        return map.r_port;
+                status = -EACCES;
+        }
+        return status;
+}
+#endif
+
+/**
+ * rpcb_getport - obtain the port for a given RPC service on a given host
+ * @task: task that is waiting for portmapper request
+ *
+ * This one can be called for an ongoing RPC request, and can be used in
+ * an async (rpciod) context.
+ */
+void rpcb_getport(struct rpc_task *task)
+{
+        struct rpc_clnt *clnt = task->tk_client;
+        int bind_version;
+        struct rpc_xprt *xprt = task->tk_xprt;
+        struct rpc_clnt *rpcb_clnt;
+        static struct rpcbind_args *map;
+        struct rpc_task *child;
+        struct sockaddr addr;
+        int status;
+
+        dprintk("RPC: %5u rpcb_getport(%s, %u, %u, %d)\n",
+                        task->tk_pid, clnt->cl_server,
+                        clnt->cl_prog, clnt->cl_vers, xprt->prot);
+
+        /* Autobind on cloned rpc clients is discouraged */
+        BUG_ON(clnt->cl_parent != clnt);
+
+        if (xprt_test_and_set_binding(xprt)) {
+                status = -EACCES;               /* tell caller to check again */
+                dprintk("RPC: %5u rpcb_getport waiting for another binder\n",
+                                task->tk_pid);
+                goto bailout_nowake;
+        }
+
+        /* Put self on queue before sending rpcbind request, in case
+         * rpcb_getport_done completes before we return from rpc_run_task */
+        rpc_sleep_on(&xprt->binding, task, NULL, NULL);
+
+        /* Someone else may have bound if we slept */
+        if (xprt_bound(xprt)) {
+                status = 0;
+                dprintk("RPC: %5u rpcb_getport already bound\n", task->tk_pid);
+                goto bailout_nofree;
+        }
+
+        if (rpcb_next_version[xprt->bind_index].rpc_proc == NULL) {
+                xprt->bind_index = 0;
+                status = -EACCES;       /* tell caller to try again later */
+                dprintk("RPC: %5u rpcb_getport no more getport versions "
+                                "available\n", task->tk_pid);
+                goto bailout_nofree;
+        }
+        bind_version = rpcb_next_version[xprt->bind_index].rpc_vers;
+
+        dprintk("RPC: %5u rpcb_getport trying rpcbind version %u\n",
+                        task->tk_pid, bind_version);
+
+        map = kzalloc(sizeof(struct rpcbind_args), GFP_ATOMIC);
+        if (!map) {
+                status = -ENOMEM;
+                dprintk("RPC: %5u rpcb_getport no memory available\n",
+                                task->tk_pid);
+                goto bailout_nofree;
+        }
+        map->r_prog = clnt->cl_prog;
+        map->r_vers = clnt->cl_vers;
+        map->r_prot = xprt->prot;
+        map->r_port = 0;
+        map->r_xprt = xprt_get(xprt);
+        map->r_netid = (xprt->prot == IPPROTO_TCP) ? RPCB_NETID_TCP :
+                                                   RPCB_NETID_UDP;
+        memcpy(&map->r_addr, rpc_peeraddr2str(clnt, RPC_DISPLAY_ADDR),
+                        sizeof(map->r_addr));
+        map->r_owner = RPCB_OWNER_STRING;       /* ignored for GETADDR */
+
+        rpc_peeraddr(clnt, (void *)&addr, sizeof(addr));
+        rpcb_clnt = rpcb_create(clnt->cl_server, &addr, xprt->prot, bind_version, 0);
+        if (IS_ERR(rpcb_clnt)) {
+                status = PTR_ERR(rpcb_clnt);
+                dprintk("RPC: %5u rpcb_getport rpcb_create failed, error %ld\n",
+                                task->tk_pid, PTR_ERR(rpcb_clnt));
+                goto bailout;
+        }
+
+        child = rpc_run_task(rpcb_clnt, RPC_TASK_ASYNC, &rpcb_getport_ops, map);
+        if (IS_ERR(child)) {
+                status = -EIO;
+                dprintk("RPC: %5u rpcb_getport rpc_run_task failed\n",
+                                task->tk_pid);
+                goto bailout_nofree;
+        }
+        rpc_put_task(child);
+
+        task->tk_xprt->stat.bind_count++;
+        return;
+
+bailout:
+        kfree(map);
+        xprt_put(xprt);
+bailout_nofree:
+        rpcb_wake_rpcbind_waiters(xprt, status);
+bailout_nowake:
+        task->tk_status = status;
+}
+
+/*
+ * Rpcbind child task calls this callback via tk_exit.
+ */
+static void rpcb_getport_done(struct rpc_task *child, void *data)
+{
+        struct rpcbind_args *map = data;
+        struct rpc_xprt *xprt = map->r_xprt;
+        int status = child->tk_status;
+
+        /* rpcbind server doesn't support this rpcbind protocol version */
+        if (status == -EPROTONOSUPPORT)
+                xprt->bind_index++;
+
+        if (status < 0) {
+                /* rpcbind server not available on remote host? */
+                xprt->ops->set_port(xprt, 0);
+        } else if (map->r_port == 0) {
+                /* Requested RPC service wasn't registered on remote host */
+                xprt->ops->set_port(xprt, 0);
+                status = -EACCES;
+        } else {
+                /* Succeeded */
+                xprt->ops->set_port(xprt, map->r_port);
+                xprt_set_bound(xprt);
+                status = 0;
+        }
+
+        dprintk("RPC: %5u rpcb_getport_done(status %d, port %u)\n",
+                        child->tk_pid, status, map->r_port);
+
+        rpcb_wake_rpcbind_waiters(xprt, status);
+}
+
+static int rpcb_encode_mapping(struct rpc_rqst *req, __be32 *p,
+                               struct rpcbind_args *rpcb)
+{
+        dprintk("RPC:       rpcb_encode_mapping(%u, %u, %d, %u)\n",
+                        rpcb->r_prog, rpcb->r_vers, rpcb->r_prot, rpcb->r_port);
+        *p++ = htonl(rpcb->r_prog);
+        *p++ = htonl(rpcb->r_vers);
+        *p++ = htonl(rpcb->r_prot);
+        *p++ = htonl(rpcb->r_port);
+
+        req->rq_slen = xdr_adjust_iovec(req->rq_svec, p);
+        return 0;
+}
+
+static int rpcb_decode_getport(struct rpc_rqst *req, __be32 *p,
+                               unsigned short *portp)
+{
+        *portp = (unsigned short) ntohl(*p++);
+        dprintk("RPC:      rpcb_decode_getport result %u\n",
+                        *portp);
+        return 0;
+}
+
+static int rpcb_decode_set(struct rpc_rqst *req, __be32 *p,
+                           unsigned int *boolp)
+{
+        *boolp = (unsigned int) ntohl(*p++);
+        dprintk("RPC:      rpcb_decode_set result %u\n",
+                        *boolp);
+        return 0;
+}
+
+static int rpcb_encode_getaddr(struct rpc_rqst *req, __be32 *p,
+                               struct rpcbind_args *rpcb)
+{
+        dprintk("RPC:       rpcb_encode_getaddr(%u, %u, %s)\n",
+                        rpcb->r_prog, rpcb->r_vers, rpcb->r_addr);
+        *p++ = htonl(rpcb->r_prog);
+        *p++ = htonl(rpcb->r_vers);
+
+        p = xdr_encode_string(p, rpcb->r_netid);
+        p = xdr_encode_string(p, rpcb->r_addr);
+        p = xdr_encode_string(p, rpcb->r_owner);
+
+        req->rq_slen = xdr_adjust_iovec(req->rq_svec, p);
+
+        return 0;
+}
+
+static int rpcb_decode_getaddr(struct rpc_rqst *req, __be32 *p,
+                               unsigned short *portp)
+{
+        char *addr;
+        int addr_len, c, i, f, first, val;
+
+        *portp = 0;
+        addr_len = (unsigned int) ntohl(*p++);
+        if (addr_len > RPCB_MAXADDRLEN)                 /* sanity */
+                return -EINVAL;
+
+        dprintk("RPC:       rpcb_decode_getaddr returned string: '%s'\n",
+                        (char *) p);
+
+        addr = (char *)p;
+        val = 0;
+        first = 1;
+        f = 1;
+        for (i = addr_len - 1; i > 0; i--) {
+                c = addr[i];
+                if (c >= '0' && c <= '9') {
+                        val += (c - '0') * f;
+                        f *= 10;
+                } else if (c == '.') {
+                        if (first) {
+                                *portp = val;
+                                val = first = 0;
+                                f = 1;
+                        } else {
+                                *portp |= (val << 8);
+                                break;
+                        }
+                }
+        }
+
+        dprintk("RPC:       rpcb_decode_getaddr port=%u\n", *portp);
+        return 0;
+}
+
+#define RPCB_program_sz         (1u)
+#define RPCB_version_sz         (1u)
+#define RPCB_protocol_sz        (1u)
+#define RPCB_port_sz            (1u)
+#define RPCB_boolean_sz         (1u)
+
+#define RPCB_netid_sz           (1+XDR_QUADLEN(RPCB_MAXNETIDLEN))
+#define RPCB_addr_sz            (1+XDR_QUADLEN(RPCB_MAXADDRLEN))
+#define RPCB_ownerstring_sz     (1+XDR_QUADLEN(RPCB_MAXOWNERLEN))
+
+#define RPCB_mappingargs_sz     RPCB_program_sz+RPCB_version_sz+        \
+                                RPCB_protocol_sz+RPCB_port_sz
+#define RPCB_getaddrargs_sz     RPCB_program_sz+RPCB_version_sz+        \
+                                RPCB_netid_sz+RPCB_addr_sz+             \
+                                RPCB_ownerstring_sz
+
+#define RPCB_setres_sz          RPCB_boolean_sz
+#define RPCB_getportres_sz      RPCB_port_sz
+
+/*
+ * Note that RFC 1833 does not put any size restrictions on the
+ * address string returned by the remote rpcbind database.
+ */
+#define RPCB_getaddrres_sz      RPCB_addr_sz
+
+#define PROC(proc, argtype, restype)                                    \
+        [RPCBPROC_##proc] = {                                           \
+                .p_proc         = RPCBPROC_##proc,                      \
+                .p_encode       = (kxdrproc_t) rpcb_encode_##argtype,   \
+                .p_decode       = (kxdrproc_t) rpcb_decode_##restype,   \
+                .p_arglen       = RPCB_##argtype##args_sz,              \
+                .p_replen       = RPCB_##restype##res_sz,               \
+                .p_statidx      = RPCBPROC_##proc,                      \
+                .p_timer        = 0,                                    \
+                .p_name         = #proc,                                \
+        }
+
+/*
+ * Not all rpcbind procedures described in RFC 1833 are implemented
+ * since the Linux kernel RPC code requires only these.
+ */
+static struct rpc_procinfo rpcb_procedures2[] = {
+        PROC(SET,               mapping,        set),
+        PROC(UNSET,             mapping,        set),
+        PROC(GETADDR,           mapping,        getport),
+};
+
+static struct rpc_procinfo rpcb_procedures3[] = {
+        PROC(SET,               mapping,        set),
+        PROC(UNSET,             mapping,        set),
+        PROC(GETADDR,           getaddr,        getaddr),
+};
+
+static struct rpc_procinfo rpcb_procedures4[] = {
+        PROC(SET,               mapping,        set),
+        PROC(UNSET,             mapping,        set),
+        PROC(GETVERSADDR,       getaddr,        getaddr),
+};
+
+static struct rpcb_info rpcb_next_version[] = {
+#ifdef CONFIG_SUNRPC_BIND34
+        { 4, &rpcb_procedures4[RPCBPROC_GETVERSADDR] },
+        { 3, &rpcb_procedures3[RPCBPROC_GETADDR] },
+#endif
+        { 2, &rpcb_procedures2[RPCBPROC_GETPORT] },
+        { 0, NULL },
+};
+
+static struct rpc_version rpcb_version2 = {
+        .number         = 2,
+        .nrprocs        = RPCB_HIGHPROC_2,
+        .procs          = rpcb_procedures2
+};
+
+static struct rpc_version rpcb_version3 = {
+        .number         = 3,
+        .nrprocs        = RPCB_HIGHPROC_3,
+        .procs          = rpcb_procedures3
+};
+
+static struct rpc_version rpcb_version4 = {
+        .number         = 4,
+        .nrprocs        = RPCB_HIGHPROC_4,
+        .procs          = rpcb_procedures4
+};
+
+static struct rpc_version *rpcb_version[] = {
+        NULL,
+        NULL,
+        &rpcb_version2,
+        &rpcb_version3,
+        &rpcb_version4
+};
+
+static struct rpc_stat rpcb_stats;
+
+struct rpc_program rpcb_program = {
+        .name           = "rpcbind",
+        .number         = RPCBIND_PROGRAM,
+        .nrvers         = ARRAY_SIZE(rpcb_version),
+        .version        = rpcb_version,
+        .stats          = &rpcb_stats,
+};
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index 6d87320074b1..4a53e94f8134 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -741,50 +741,53 @@ static void rpc_async_schedule(struct work_struct *work)
  * @task: RPC task that will use this buffer
  * @size: requested byte size
  *
- * We try to ensure that some NFS reads and writes can always proceed
- * by using a mempool when allocating 'small' buffers.
+ * To prevent rpciod from hanging, this allocator never sleeps,
+ * returning NULL if the request cannot be serviced immediately.
+ * The caller can arrange to sleep in a way that is safe for rpciod.
+ *
+ * Most requests are 'small' (under 2KiB) and can be serviced from a
+ * mempool, ensuring that NFS reads and writes can always proceed,
+ * and that there is good locality of reference for these buffers.
+ *
  * In order to avoid memory starvation triggering more writebacks of
- * NFS requests, we use GFP_NOFS rather than GFP_KERNEL.
+ * NFS requests, we avoid using GFP_KERNEL.
  */
-void * rpc_malloc(struct rpc_task *task, size_t size)
+void *rpc_malloc(struct rpc_task *task, size_t size)
 {
-        struct rpc_rqst *req = task->tk_rqstp;
-        gfp_t   gfp;
+        size_t *buf;
+        gfp_t gfp = RPC_IS_SWAPPER(task) ? GFP_ATOMIC : GFP_NOWAIT;
 
-        if (task->tk_flags & RPC_TASK_SWAPPER)
-                gfp = GFP_ATOMIC;
+        size += sizeof(size_t);
+        if (size <= RPC_BUFFER_MAXSIZE)
+                buf = mempool_alloc(rpc_buffer_mempool, gfp);
         else
-                gfp = GFP_NOFS;
-
-        if (size > RPC_BUFFER_MAXSIZE) {
-                req->rq_buffer = kmalloc(size, gfp);
-                if (req->rq_buffer)
-                        req->rq_bufsize = size;
-        } else {
-                req->rq_buffer = mempool_alloc(rpc_buffer_mempool, gfp);
-                if (req->rq_buffer)
-                        req->rq_bufsize = RPC_BUFFER_MAXSIZE;
-        }
-        return req->rq_buffer;
+                buf = kmalloc(size, gfp);
+        *buf = size;
+        dprintk("RPC: %5u allocated buffer of size %u at %p\n",
+                        task->tk_pid, size, buf);
+        return (void *) ++buf;
 }
 
 /**
  * rpc_free - free buffer allocated via rpc_malloc
- * @task: RPC task with a buffer to be freed
+ * @buffer: buffer to free
  *
  */
-void rpc_free(struct rpc_task *task)
+void rpc_free(void *buffer)
 {
-        struct rpc_rqst *req = task->tk_rqstp;
+        size_t size, *buf = (size_t *) buffer;
 
-        if (req->rq_buffer) {
-                if (req->rq_bufsize == RPC_BUFFER_MAXSIZE)
-                        mempool_free(req->rq_buffer, rpc_buffer_mempool);
-                else
-                        kfree(req->rq_buffer);
-                req->rq_buffer = NULL;
-                req->rq_bufsize = 0;
-        }
+        if (!buffer)
+                return;
+        size = *buf;
+        buf--;
+
+        dprintk("RPC:       freeing buffer of size %u at %p\n",
+                        size, buf);
+        if (size <= RPC_BUFFER_MAXSIZE)
+                mempool_free(buf, rpc_buffer_mempool);
+        else
+                kfree(buf);
 }
 
 /*
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index b4db53ff1435..b7503c103ae8 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -757,7 +757,7 @@ svc_register(struct svc_serv *serv, int proto, unsigned short port)
                         if (progp->pg_vers[i]->vs_hidden)
                                 continue;
 
-                        error = rpc_register(progp->pg_prog, i, proto, port, &dummy);
+                        error = rpcb_register(progp->pg_prog, i, proto, port, &dummy);
                         if (error < 0)
                                 break;
                         if (port && !dummy) {
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 456a14510308..5b05b73e4c1d 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -823,7 +823,6 @@ static void xprt_request_init(struct rpc_task *task, struct rpc_xprt *xprt)
         req->rq_task    = task;
         req->rq_xprt    = xprt;
         req->rq_buffer  = NULL;
-        req->rq_bufsize = 0;
         req->rq_xid     = xprt_alloc_xid(xprt);
         req->rq_release_snd_buf = NULL;
         xprt_reset_majortimeo(req);
@@ -855,7 +854,7 @@ void xprt_release(struct rpc_task *task)
                 mod_timer(&xprt->timer,
                                 xprt->last_used + xprt->idle_timeout);
         spin_unlock_bh(&xprt->transport_lock);
-        xprt->ops->buf_free(task);
+        xprt->ops->buf_free(req->rq_buffer);
         task->tk_rqstp = NULL;
         if (req->rq_release_snd_buf)
                 req->rq_release_snd_buf(req);
@@ -928,6 +927,7 @@ struct rpc_xprt *xprt_create_transport(int proto, struct sockaddr *ap, size_t si
         xprt->timer.data = (unsigned long) xprt;
         xprt->last_used = jiffies;
         xprt->cwnd = RPC_INITCWND;
+        xprt->bind_index = 0;
 
         rpc_init_wait_queue(&xprt->binding, "xprt_binding");
         rpc_init_wait_queue(&xprt->pending, "xprt_pending");
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index a5a32029e728..cc33c5880abb 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -1476,7 +1476,7 @@ static struct rpc_xprt_ops xs_udp_ops = {
         .set_buffer_size        = xs_udp_set_buffer_size,
         .reserve_xprt           = xprt_reserve_xprt_cong,
         .release_xprt           = xprt_release_xprt_cong,
-        .rpcbind                = rpc_getport,
+        .rpcbind                = rpcb_getport,
         .set_port               = xs_set_port,
         .connect                = xs_connect,
         .buf_alloc              = rpc_malloc,
@@ -1493,7 +1493,7 @@ static struct rpc_xprt_ops xs_udp_ops = {
 static struct rpc_xprt_ops xs_tcp_ops = {
         .reserve_xprt           = xprt_reserve_xprt,
         .release_xprt           = xs_tcp_release_xprt,
-        .rpcbind                = rpc_getport,
+        .rpcbind                = rpcb_getport,
         .set_port               = xs_set_port,
         .connect                = xs_connect,
         .buf_alloc              = rpc_malloc,
diff --git a/net/tipc/Kconfig b/net/tipc/Kconfig
index 3891cc00087d..f9e367d946eb 100644
--- a/net/tipc/Kconfig
+++ b/net/tipc/Kconfig
@@ -18,7 +18,7 @@ config TIPC
           This protocol support is also available as a module ( = code which
           can be inserted in and removed from the running kernel whenever you
           want). The module will be called tipc. If you want to compile it
-          as a module, say M here and read <file:Documentation/modules.txt>.
+          as a module, say M here and read <file:Documentation/kbuild/modules.txt>.
 
           If in doubt, say N.
 
diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c
index 67bb29b44d1b..0ee6ded18f3a 100644
--- a/net/tipc/eth_media.c
+++ b/net/tipc/eth_media.c
@@ -120,16 +120,18 @@ static int recv_msg(struct sk_buff *buf, struct net_device *dev,
 
 static int enable_bearer(struct tipc_bearer *tb_ptr)
 {
-        struct net_device *dev = dev_base;
+        struct net_device *dev, *pdev;
         struct eth_bearer *eb_ptr = &eth_bearers[0];
         struct eth_bearer *stop = &eth_bearers[MAX_ETH_BEARERS];
         char *driver_name = strchr((const char *)tb_ptr->name, ':') + 1;
 
         /* Find device with specified name */
-
-        while (dev && dev->name && strncmp(dev->name, driver_name, IFNAMSIZ)) {
-                dev = dev->next;
-        }
+        dev = NULL;
+        for_each_netdev(pdev)
+                if (!strncmp(dev->name, driver_name, IFNAMSIZ)) {
+                        dev = pdev;
+                        break;
+                }
         if (!dev)
                 return -ENODEV;
 
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 263e34e45265..95271e8426a1 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -579,7 +579,7 @@ static inline int xfrm_byidx_should_resize(int total)
         return 0;
 }
 
-void xfrm_spd_getinfo(struct xfrm_spdinfo *si)
+void xfrm_spd_getinfo(struct xfrmk_spdinfo *si)
 {
         read_lock_bh(&xfrm_policy_lock);
         si->incnt = xfrm_policy_count[XFRM_POLICY_IN];
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index f3a61ebd8d65..9955ff4da0a2 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -421,7 +421,7 @@ restart:
 }
 EXPORT_SYMBOL(xfrm_state_flush);
 
-void xfrm_sad_getinfo(struct xfrm_sadinfo *si)
+void xfrm_sad_getinfo(struct xfrmk_sadinfo *si)
 {
         spin_lock_bh(&xfrm_state_lock);
         si->sadcnt = xfrm_state_num;
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 4210d91624cd..b14c7e590c31 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -674,7 +674,9 @@ static struct sk_buff *xfrm_state_netlink(struct sk_buff *in_skb,
 
 static int build_spdinfo(struct sk_buff *skb, u32 pid, u32 seq, u32 flags)
 {
-        struct xfrm_spdinfo si;
+        struct xfrmk_spdinfo si;
+        struct xfrmu_spdinfo spc;
+        struct xfrmu_spdhinfo sph;
         struct nlmsghdr *nlh;
         u32 *f;
 
@@ -685,23 +687,17 @@ static int build_spdinfo(struct sk_buff *skb, u32 pid, u32 seq, u32 flags)
         f = nlmsg_data(nlh);
         *f = flags;
         xfrm_spd_getinfo(&si);
-
-        if (flags & XFRM_SPD_HMASK)
-                NLA_PUT_U32(skb, XFRMA_SPDHMASK, si.spdhcnt);
-        if (flags & XFRM_SPD_HMAX)
-                NLA_PUT_U32(skb, XFRMA_SPDHMAX, si.spdhmcnt);
-        if (flags & XFRM_SPD_ICNT)
-                NLA_PUT_U32(skb, XFRMA_SPDICNT, si.incnt);
-        if (flags & XFRM_SPD_OCNT)
-                NLA_PUT_U32(skb, XFRMA_SPDOCNT, si.outcnt);
-        if (flags & XFRM_SPD_FCNT)
-                NLA_PUT_U32(skb, XFRMA_SPDFCNT, si.fwdcnt);
-        if (flags & XFRM_SPD_ISCNT)
-                NLA_PUT_U32(skb, XFRMA_SPDISCNT, si.inscnt);
-        if (flags & XFRM_SPD_OSCNT)
-                NLA_PUT_U32(skb, XFRMA_SPDOSCNT, si.inscnt);
-        if (flags & XFRM_SPD_FSCNT)
-                NLA_PUT_U32(skb, XFRMA_SPDFSCNT, si.inscnt);
+        spc.incnt = si.incnt;
+        spc.outcnt = si.outcnt;
+        spc.fwdcnt = si.fwdcnt;
+        spc.inscnt = si.inscnt;
+        spc.outscnt = si.outscnt;
+        spc.fwdscnt = si.fwdscnt;
+        sph.spdhcnt = si.spdhcnt;
+        sph.spdhmcnt = si.spdhmcnt;
+
+        NLA_PUT(skb, XFRMA_SPD_INFO, sizeof(spc), &spc);
+        NLA_PUT(skb, XFRMA_SPD_HINFO, sizeof(sph), &sph);
 
         return nlmsg_end(skb, nlh);
 
@@ -719,23 +715,8 @@ static int xfrm_get_spdinfo(struct sk_buff *skb, struct nlmsghdr *nlh,
         u32 seq = nlh->nlmsg_seq;
         int len = NLMSG_LENGTH(sizeof(u32));
 
-
-        if (*flags & XFRM_SPD_HMASK)
-                len += RTA_SPACE(sizeof(u32));
-        if (*flags & XFRM_SPD_HMAX)
-                len += RTA_SPACE(sizeof(u32));
-        if (*flags & XFRM_SPD_ICNT)
-                len += RTA_SPACE(sizeof(u32));
-        if (*flags & XFRM_SPD_OCNT)
-                len += RTA_SPACE(sizeof(u32));
-        if (*flags & XFRM_SPD_FCNT)
-                len += RTA_SPACE(sizeof(u32));
-        if (*flags & XFRM_SPD_ISCNT)
-                len += RTA_SPACE(sizeof(u32));
-        if (*flags & XFRM_SPD_OSCNT)
-                len += RTA_SPACE(sizeof(u32));
-        if (*flags & XFRM_SPD_FSCNT)
-                len += RTA_SPACE(sizeof(u32));
+        len += RTA_SPACE(sizeof(struct xfrmu_spdinfo));
+        len += RTA_SPACE(sizeof(struct xfrmu_spdhinfo));
 
         r_skb = alloc_skb(len, GFP_ATOMIC);
         if (r_skb == NULL)
@@ -749,7 +730,8 @@ static int xfrm_get_spdinfo(struct sk_buff *skb, struct nlmsghdr *nlh,
 
 static int build_sadinfo(struct sk_buff *skb, u32 pid, u32 seq, u32 flags)
 {
-        struct xfrm_sadinfo si;
+        struct xfrmk_sadinfo si;
+        struct xfrmu_sadhinfo sh;
         struct nlmsghdr *nlh;
         u32 *f;
 
@@ -761,12 +743,11 @@ static int build_sadinfo(struct sk_buff *skb, u32 pid, u32 seq, u32 flags)
         *f = flags;
         xfrm_sad_getinfo(&si);
 
-        if (flags & XFRM_SAD_HMASK)
-                NLA_PUT_U32(skb, XFRMA_SADHMASK, si.sadhcnt);
-        if (flags & XFRM_SAD_HMAX)
-                NLA_PUT_U32(skb, XFRMA_SADHMAX, si.sadhmcnt);
-        if (flags & XFRM_SAD_CNT)
-                NLA_PUT_U32(skb, XFRMA_SADCNT, si.sadcnt);
+        sh.sadhmcnt = si.sadhmcnt;
+        sh.sadhcnt = si.sadhcnt;
+
+        NLA_PUT_U32(skb, XFRMA_SAD_CNT, si.sadcnt);
+        NLA_PUT(skb, XFRMA_SAD_HINFO, sizeof(sh), &sh);
 
         return nlmsg_end(skb, nlh);
 
@@ -784,12 +765,8 @@ static int xfrm_get_sadinfo(struct sk_buff *skb, struct nlmsghdr *nlh,
         u32 seq = nlh->nlmsg_seq;
         int len = NLMSG_LENGTH(sizeof(u32));
 
-        if (*flags & XFRM_SAD_HMASK)
-                len += RTA_SPACE(sizeof(u32));
-        if (*flags & XFRM_SAD_HMAX)
-                len += RTA_SPACE(sizeof(u32));
-        if (*flags & XFRM_SAD_CNT)
-                len += RTA_SPACE(sizeof(u32));
+        len += RTA_SPACE(sizeof(struct xfrmu_sadhinfo));
+        len += RTA_SPACE(sizeof(u32));
 
         r_skb = alloc_skb(len, GFP_ATOMIC);