libipw: switch from ieee80211_* to libipw_* naming policy

This eliminates the dual definition of ieee80211_channel (and possibly
others), further clarifying who defines what and paving the way for
inclusion of cfg80211.h.

Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 99 insertions, 99 deletions

diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index dee50ed0897d..33bdb20e9f1e 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -1673,7 +1673,7 @@ static int ipw2100_start_scan(struct ipw2100_priv *priv)
         return err;
 }
 
-static const struct ieee80211_geo ipw_geos[] = {
+static const struct libipw_geo ipw_geos[] = {
         {                       /* Restricted */
          "---",
          .bg_channels = 14,
@@ -1694,7 +1694,7 @@ static int ipw2100_up(struct ipw2100_priv *priv, int deferred)
 
         /* Age scan list entries found before suspend */
         if (priv->suspend_time) {
-                ieee80211_networks_age(priv->ieee, priv->suspend_time);
+                libipw_networks_age(priv->ieee, priv->suspend_time);
                 priv->suspend_time = 0;
         }
 
@@ -1752,11 +1752,11 @@ static int ipw2100_up(struct ipw2100_priv *priv, int deferred)
         }
 
         /* Initialize the geo */
-        if (ieee80211_set_geo(priv->ieee, &ipw_geos[0])) {
+        if (libipw_set_geo(priv->ieee, &ipw_geos[0])) {
                 printk(KERN_WARNING DRV_NAME "Could not set geo\n");
                 return 0;
         }
-        priv->ieee->freq_band = IEEE80211_24GHZ_BAND;
+        priv->ieee->freq_band = LIBIPW_24GHZ_BAND;
 
         lock = LOCK_NONE;
         if (ipw2100_set_ordinal(priv, IPW_ORD_PERS_DB_LOCK, &lock, &ord_len)) {
@@ -1817,7 +1817,7 @@ static int ipw2100_up(struct ipw2100_priv *priv, int deferred)
 /* Called by register_netdev() */
 static int ipw2100_net_init(struct net_device *dev)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         return ipw2100_up(priv, 1);
 }
 
@@ -2340,8 +2340,8 @@ static u32 ipw2100_match_buf(struct ipw2100_priv *priv, u8 * in_buf,
  *
  * When packet is provided by the firmware, it contains the following:
  *
- * .  ieee80211_hdr
- * .  ieee80211_snap_hdr
+ * .  libipw_hdr
+ * .  libipw_snap_hdr
  *
  * The size of the constructed ethernet
  *
@@ -2396,7 +2396,7 @@ static void ipw2100_corruption_detected(struct ipw2100_priv *priv, int i)
 }
 
 static void isr_rx(struct ipw2100_priv *priv, int i,
-                          struct ieee80211_rx_stats *stats)
+                          struct libipw_rx_stats *stats)
 {
         struct net_device *dev = priv->net_dev;
         struct ipw2100_status *status = &priv->status_queue.drv[i];
@@ -2435,13 +2435,13 @@ static void isr_rx(struct ipw2100_priv *priv, int i,
 
 #ifdef IPW2100_RX_DEBUG
         /* Make a copy of the frame so we can dump it to the logs if
-         * ieee80211_rx fails */
+         * libipw_rx fails */
         skb_copy_from_linear_data(packet->skb, packet_data,
                                   min_t(u32, status->frame_size,
                                              IPW_RX_NIC_BUFFER_LENGTH));
 #endif
 
-        if (!ieee80211_rx(priv->ieee, packet->skb, stats)) {
+        if (!libipw_rx(priv->ieee, packet->skb, stats)) {
 #ifdef IPW2100_RX_DEBUG
                 IPW_DEBUG_DROP("%s: Non consumed packet:\n",
                                dev->name);
@@ -2449,7 +2449,7 @@ static void isr_rx(struct ipw2100_priv *priv, int i,
 #endif
                 dev->stats.rx_errors++;
 
-                /* ieee80211_rx failed, so it didn't free the SKB */
+                /* libipw_rx failed, so it didn't free the SKB */
                 dev_kfree_skb_any(packet->skb);
                 packet->skb = NULL;
         }
@@ -2470,7 +2470,7 @@ static void isr_rx(struct ipw2100_priv *priv, int i,
 #ifdef CONFIG_IPW2100_MONITOR
 
 static void isr_rx_monitor(struct ipw2100_priv *priv, int i,
-                   struct ieee80211_rx_stats *stats)
+                   struct libipw_rx_stats *stats)
 {
         struct net_device *dev = priv->net_dev;
         struct ipw2100_status *status = &priv->status_queue.drv[i];
@@ -2528,10 +2528,10 @@ static void isr_rx_monitor(struct ipw2100_priv *priv, int i,
 
         skb_put(packet->skb, status->frame_size + sizeof(struct ipw_rt_hdr));
 
-        if (!ieee80211_rx(priv->ieee, packet->skb, stats)) {
+        if (!libipw_rx(priv->ieee, packet->skb, stats)) {
                 dev->stats.rx_errors++;
 
-                /* ieee80211_rx failed, so it didn't free the SKB */
+                /* libipw_rx failed, so it didn't free the SKB */
                 dev_kfree_skb_any(packet->skb);
                 packet->skb = NULL;
         }
@@ -2615,7 +2615,7 @@ static void __ipw2100_rx_process(struct ipw2100_priv *priv)
         u16 frame_type;
         u32 r, w, i, s;
         struct ipw2100_rx *u;
-        struct ieee80211_rx_stats stats = {
+        struct libipw_rx_stats stats = {
                 .mac_time = jiffies,
         };
 
@@ -2661,8 +2661,8 @@ static void __ipw2100_rx_process(struct ipw2100_priv *priv)
 
                 stats.mask = 0;
                 if (stats.rssi != 0)
-                        stats.mask |= IEEE80211_STATMASK_RSSI;
-                stats.freq = IEEE80211_24GHZ_BAND;
+                        stats.mask |= LIBIPW_STATMASK_RSSI;
+                stats.freq = LIBIPW_24GHZ_BAND;
 
                 IPW_DEBUG_RX("%s: '%s' frame type received (%d).\n",
                              priv->net_dev->name, frame_types[frame_type],
@@ -2686,11 +2686,11 @@ static void __ipw2100_rx_process(struct ipw2100_priv *priv)
                                 break;
                         }
 #endif
-                        if (stats.len < sizeof(struct ieee80211_hdr_3addr))
+                        if (stats.len < sizeof(struct libipw_hdr_3addr))
                                 break;
                         switch (WLAN_FC_GET_TYPE(le16_to_cpu(u->rx_data.header.frame_ctl))) {
                         case IEEE80211_FTYPE_MGMT:
-                                ieee80211_rx_mgt(priv->ieee,
+                                libipw_rx_mgt(priv->ieee,
                                                  &u->rx_data.header, &stats);
                                 break;
 
@@ -2884,7 +2884,7 @@ static int __ipw2100_tx_process(struct ipw2100_priv *priv)
                                          tbd->buf_length, PCI_DMA_TODEVICE);
                 }
 
-                ieee80211_txb_free(packet->info.d_struct.txb);
+                libipw_txb_free(packet->info.d_struct.txb);
                 packet->info.d_struct.txb = NULL;
 
                 list_add_tail(element, &priv->tx_free_list);
@@ -3028,7 +3028,7 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv)
         int next = txq->next;
         int i = 0;
         struct ipw2100_data_header *ipw_hdr;
-        struct ieee80211_hdr_3addr *hdr;
+        struct libipw_hdr_3addr *hdr;
 
         while (!list_empty(&priv->tx_pend_list)) {
                 /* if there isn't enough space in TBD queue, then
@@ -3062,7 +3062,7 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv)
                 packet->index = txq->next;
 
                 ipw_hdr = packet->info.d_struct.data;
-                hdr = (struct ieee80211_hdr_3addr *)packet->info.d_struct.txb->
+                hdr = (struct libipw_hdr_3addr *)packet->info.d_struct.txb->
                     fragments[0]->data;
 
                 if (priv->ieee->iw_mode == IW_MODE_INFRA) {
@@ -3086,7 +3086,7 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv)
                 if (packet->info.d_struct.txb->nr_frags > 1)
                         ipw_hdr->fragment_size =
                             packet->info.d_struct.txb->frag_size -
-                            IEEE80211_3ADDR_LEN;
+                            LIBIPW_3ADDR_LEN;
                 else
                         ipw_hdr->fragment_size = 0;
 
@@ -3119,13 +3119,13 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv)
                                     IPW_BD_STATUS_TX_FRAME_NOT_LAST_FRAGMENT;
 
                         tbd->buf_length = packet->info.d_struct.txb->
-                            fragments[i]->len - IEEE80211_3ADDR_LEN;
+                            fragments[i]->len - LIBIPW_3ADDR_LEN;
 
                         tbd->host_addr = pci_map_single(priv->pci_dev,
                                                         packet->info.d_struct.
                                                         txb->fragments[i]->
                                                         data +
-                                                        IEEE80211_3ADDR_LEN,
+                                                        LIBIPW_3ADDR_LEN,
                                                         tbd->buf_length,
                                                         PCI_DMA_TODEVICE);
 
@@ -3330,10 +3330,10 @@ static irqreturn_t ipw2100_interrupt(int irq, void *data)
         return IRQ_NONE;
 }
 
-static int ipw2100_tx(struct ieee80211_txb *txb, struct net_device *dev,
+static int ipw2100_tx(struct libipw_txb *txb, struct net_device *dev,
                       int pri)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         struct list_head *element;
         struct ipw2100_tx_packet *packet;
         unsigned long flags;
@@ -4488,7 +4488,7 @@ static void ipw2100_tx_initialize(struct ipw2100_priv *priv)
                 /* We simply drop any SKBs that have been queued for
                  * transmit */
                 if (priv->tx_buffers[i].info.d_struct.txb) {
-                        ieee80211_txb_free(priv->tx_buffers[i].info.d_struct.
+                        libipw_txb_free(priv->tx_buffers[i].info.d_struct.
                                            txb);
                         priv->tx_buffers[i].info.d_struct.txb = NULL;
                 }
@@ -4527,7 +4527,7 @@ static void ipw2100_tx_free(struct ipw2100_priv *priv)
 
         for (i = 0; i < TX_PENDED_QUEUE_LENGTH; i++) {
                 if (priv->tx_buffers[i].info.d_struct.txb) {
-                        ieee80211_txb_free(priv->tx_buffers[i].info.d_struct.
+                        libipw_txb_free(priv->tx_buffers[i].info.d_struct.
                                            txb);
                         priv->tx_buffers[i].info.d_struct.txb = NULL;
                 }
@@ -5558,9 +5558,9 @@ static void ipw2100_security_work(struct work_struct *work)
 }
 
 static void shim__set_security(struct net_device *dev,
-                               struct ieee80211_security *sec)
+                               struct libipw_security *sec)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         int i, force_update = 0;
 
         mutex_lock(&priv->action_mutex);
@@ -5753,7 +5753,7 @@ static int ipw2100_adapter_setup(struct ipw2100_priv *priv)
  * method as well) to talk to the firmware */
 static int ipw2100_set_address(struct net_device *dev, void *p)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         struct sockaddr *addr = p;
         int err = 0;
 
@@ -5781,7 +5781,7 @@ static int ipw2100_set_address(struct net_device *dev, void *p)
 
 static int ipw2100_open(struct net_device *dev)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         unsigned long flags;
         IPW_DEBUG_INFO("dev->open\n");
 
@@ -5797,7 +5797,7 @@ static int ipw2100_open(struct net_device *dev)
 
 static int ipw2100_close(struct net_device *dev)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         unsigned long flags;
         struct list_head *element;
         struct ipw2100_tx_packet *packet;
@@ -5818,7 +5818,7 @@ static int ipw2100_close(struct net_device *dev)
                 list_del(element);
                 DEC_STAT(&priv->tx_pend_stat);
 
-                ieee80211_txb_free(packet->info.d_struct.txb);
+                libipw_txb_free(packet->info.d_struct.txb);
                 packet->info.d_struct.txb = NULL;
 
                 list_add_tail(element, &priv->tx_free_list);
@@ -5836,7 +5836,7 @@ static int ipw2100_close(struct net_device *dev)
  */
 static void ipw2100_tx_timeout(struct net_device *dev)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
 
         dev->stats.tx_errors++;
 
@@ -5861,8 +5861,8 @@ static int ipw2100_wpa_enable(struct ipw2100_priv *priv, int value)
 static int ipw2100_wpa_set_auth_algs(struct ipw2100_priv *priv, int value)
 {
 
-        struct ieee80211_device *ieee = priv->ieee;
-        struct ieee80211_security sec = {
+        struct libipw_device *ieee = priv->ieee;
+        struct libipw_security sec = {
                 .flags = SEC_AUTH_MODE,
         };
         int ret = 0;
@@ -5907,7 +5907,7 @@ static void ipw2100_wpa_assoc_frame(struct ipw2100_priv *priv,
 static void ipw_ethtool_get_drvinfo(struct net_device *dev,
                                     struct ethtool_drvinfo *info)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         char fw_ver[64], ucode_ver[64];
 
         strcpy(info->driver, DRV_NAME);
@@ -5924,7 +5924,7 @@ static void ipw_ethtool_get_drvinfo(struct net_device *dev,
 
 static u32 ipw2100_ethtool_get_link(struct net_device *dev)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         return (priv->status & STATUS_ASSOCIATED) ? 1 : 0;
 }
 
@@ -6011,8 +6011,8 @@ static void ipw2100_irq_tasklet(struct ipw2100_priv *priv);
 static const struct net_device_ops ipw2100_netdev_ops = {
         .ndo_open               = ipw2100_open,
         .ndo_stop               = ipw2100_close,
-        .ndo_start_xmit         = ieee80211_xmit,
-        .ndo_change_mtu         = ieee80211_change_mtu,
+        .ndo_start_xmit         = libipw_xmit,
+        .ndo_change_mtu         = libipw_change_mtu,
         .ndo_init               = ipw2100_net_init,
         .ndo_tx_timeout         = ipw2100_tx_timeout,
         .ndo_set_mac_address    = ipw2100_set_address,
@@ -6032,7 +6032,7 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev,
         dev = alloc_ieee80211(sizeof(struct ipw2100_priv));
         if (!dev)
                 return NULL;
-        priv = ieee80211_priv(dev);
+        priv = libipw_priv(dev);
         priv->ieee = netdev_priv(dev);
         priv->pci_dev = pci_dev;
         priv->net_dev = dev;
@@ -6046,7 +6046,7 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev,
         dev->netdev_ops = &ipw2100_netdev_ops;
         dev->ethtool_ops = &ipw2100_ethtool_ops;
         dev->wireless_handlers = &ipw2100_wx_handler_def;
-        priv->wireless_data.ieee80211 = priv->ieee;
+        priv->wireless_data.libipw = priv->ieee;
         dev->wireless_data = &priv->wireless_data;
         dev->watchdog_timeo = 3 * HZ;
         dev->irq = 0;
@@ -6202,7 +6202,7 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
                 return err;
         }
 
-        priv = ieee80211_priv(dev);
+        priv = libipw_priv(dev);
 
         pci_set_master(pci_dev);
         pci_set_drvdata(pci_dev, priv);
@@ -6629,7 +6629,7 @@ static int ipw2100_wx_get_name(struct net_device *dev,
          * This can be called at any time.  No action lock required
          */
 
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         if (!(priv->status & STATUS_ASSOCIATED))
                 strcpy(wrqu->name, "unassociated");
         else
@@ -6643,7 +6643,7 @@ static int ipw2100_wx_set_freq(struct net_device *dev,
                                struct iw_request_info *info,
                                union iwreq_data *wrqu, char *extra)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         struct iw_freq *fwrq = &wrqu->freq;
         int err = 0;
 
@@ -6693,7 +6693,7 @@ static int ipw2100_wx_get_freq(struct net_device *dev,
          * This can be called at any time.  No action lock required
          */
 
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
 
         wrqu->freq.e = 0;
 
@@ -6714,7 +6714,7 @@ static int ipw2100_wx_set_mode(struct net_device *dev,
                                struct iw_request_info *info,
                                union iwreq_data *wrqu, char *extra)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         int err = 0;
 
         IPW_DEBUG_WX("SET Mode -> %d \n", wrqu->mode);
@@ -6757,7 +6757,7 @@ static int ipw2100_wx_get_mode(struct net_device *dev,
          * This can be called at any time.  No action lock required
          */
 
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
 
         wrqu->mode = priv->ieee->iw_mode;
         IPW_DEBUG_WX("GET Mode -> %d\n", wrqu->mode);
@@ -6792,7 +6792,7 @@ static int ipw2100_wx_get_range(struct net_device *dev,
          * This can be called at any time.  No action lock required
          */
 
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         struct iw_range *range = (struct iw_range *)extra;
         u16 val;
         int i, level;
@@ -6913,7 +6913,7 @@ static int ipw2100_wx_set_wap(struct net_device *dev,
                               struct iw_request_info *info,
                               union iwreq_data *wrqu, char *extra)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         int err = 0;
 
         static const unsigned char any[] = {
@@ -6962,7 +6962,7 @@ static int ipw2100_wx_get_wap(struct net_device *dev,
          * This can be called at any time.  No action lock required
          */
 
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
 
         /* If we are associated, trying to associate, or have a statically
          * configured BSSID then return that; otherwise return ANY */
@@ -6980,7 +6980,7 @@ static int ipw2100_wx_set_essid(struct net_device *dev,
                                 struct iw_request_info *info,
                                 union iwreq_data *wrqu, char *extra)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         char *essid = "";       /* ANY */
         int length = 0;
         int err = 0;
@@ -7035,7 +7035,7 @@ static int ipw2100_wx_get_essid(struct net_device *dev,
          * This can be called at any time.  No action lock required
          */
 
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         DECLARE_SSID_BUF(ssid);
 
         /* If we are associated, trying to associate, or have a statically
@@ -7063,7 +7063,7 @@ static int ipw2100_wx_set_nick(struct net_device *dev,
          * This can be called at any time.  No action lock required
          */
 
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
 
         if (wrqu->data.length > IW_ESSID_MAX_SIZE)
                 return -E2BIG;
@@ -7085,7 +7085,7 @@ static int ipw2100_wx_get_nick(struct net_device *dev,
          * This can be called at any time.  No action lock required
          */
 
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
 
         wrqu->data.length = strlen(priv->nick);
         memcpy(extra, priv->nick, wrqu->data.length);
@@ -7100,7 +7100,7 @@ static int ipw2100_wx_set_rate(struct net_device *dev,
                                struct iw_request_info *info,
                                union iwreq_data *wrqu, char *extra)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         u32 target_rate = wrqu->bitrate.value;
         u32 rate;
         int err = 0;
@@ -7140,7 +7140,7 @@ static int ipw2100_wx_get_rate(struct net_device *dev,
                                struct iw_request_info *info,
                                union iwreq_data *wrqu, char *extra)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         int val;
         unsigned int len = sizeof(val);
         int err = 0;
@@ -7192,7 +7192,7 @@ static int ipw2100_wx_set_rts(struct net_device *dev,
                               struct iw_request_info *info,
                               union iwreq_data *wrqu, char *extra)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         int value, err;
 
         /* Auto RTS not yet supported */
@@ -7231,7 +7231,7 @@ static int ipw2100_wx_get_rts(struct net_device *dev,
          * This can be called at any time.  No action lock required
          */
 
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
 
         wrqu->rts.value = priv->rts_threshold & ~RTS_DISABLED;
         wrqu->rts.fixed = 1;    /* no auto select */
@@ -7248,7 +7248,7 @@ static int ipw2100_wx_set_txpow(struct net_device *dev,
                                 struct iw_request_info *info,
                                 union iwreq_data *wrqu, char *extra)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         int err = 0, value;
         
         if (ipw_radio_kill_sw(priv, wrqu->txpower.disabled))
@@ -7293,7 +7293,7 @@ static int ipw2100_wx_get_txpow(struct net_device *dev,
          * This can be called at any time.  No action lock required
          */
 
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
 
         wrqu->txpower.disabled = (priv->status & STATUS_RF_KILL_MASK) ? 1 : 0;
 
@@ -7320,7 +7320,7 @@ static int ipw2100_wx_set_frag(struct net_device *dev,
          * This can be called at any time.  No action lock required
          */
 
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
 
         if (!wrqu->frag.fixed)
                 return -EINVAL;
@@ -7350,7 +7350,7 @@ static int ipw2100_wx_get_frag(struct net_device *dev,
          * This can be called at any time.  No action lock required
          */
 
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         wrqu->frag.value = priv->frag_threshold & ~FRAG_DISABLED;
         wrqu->frag.fixed = 0;   /* no auto select */
         wrqu->frag.disabled = (priv->frag_threshold & FRAG_DISABLED) ? 1 : 0;
@@ -7364,7 +7364,7 @@ static int ipw2100_wx_set_retry(struct net_device *dev,
                                 struct iw_request_info *info,
                                 union iwreq_data *wrqu, char *extra)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         int err = 0;
 
         if (wrqu->retry.flags & IW_RETRY_LIFETIME || wrqu->retry.disabled)
@@ -7412,7 +7412,7 @@ static int ipw2100_wx_get_retry(struct net_device *dev,
          * This can be called at any time.  No action lock required
          */
 
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
 
         wrqu->retry.disabled = 0;       /* can't be disabled */
 
@@ -7440,7 +7440,7 @@ static int ipw2100_wx_set_scan(struct net_device *dev,
                                struct iw_request_info *info,
                                union iwreq_data *wrqu, char *extra)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         int err = 0;
 
         mutex_lock(&priv->action_mutex);
@@ -7472,8 +7472,8 @@ static int ipw2100_wx_get_scan(struct net_device *dev,
          * This can be called at any time.  No action lock required
          */
 
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
-        return ieee80211_wx_get_scan(priv->ieee, info, wrqu, extra);
+        struct ipw2100_priv *priv = libipw_priv(dev);
+        return libipw_wx_get_scan(priv->ieee, info, wrqu, extra);
 }
 
 /*
@@ -7487,8 +7487,8 @@ static int ipw2100_wx_set_encode(struct net_device *dev,
          * No check of STATUS_INITIALIZED required
          */
 
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
-        return ieee80211_wx_set_encode(priv->ieee, info, wrqu, key);
+        struct ipw2100_priv *priv = libipw_priv(dev);
+        return libipw_wx_set_encode(priv->ieee, info, wrqu, key);
 }
 
 static int ipw2100_wx_get_encode(struct net_device *dev,
@@ -7499,15 +7499,15 @@ static int ipw2100_wx_get_encode(struct net_device *dev,
          * This can be called at any time.  No action lock required
          */
 
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
-        return ieee80211_wx_get_encode(priv->ieee, info, wrqu, key);
+        struct ipw2100_priv *priv = libipw_priv(dev);
+        return libipw_wx_get_encode(priv->ieee, info, wrqu, key);
 }
 
 static int ipw2100_wx_set_power(struct net_device *dev,
                                 struct iw_request_info *info,
                                 union iwreq_data *wrqu, char *extra)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         int err = 0;
 
         mutex_lock(&priv->action_mutex);
@@ -7556,7 +7556,7 @@ static int ipw2100_wx_get_power(struct net_device *dev,
          * This can be called at any time.  No action lock required
          */
 
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
 
         if (!(priv->power_mode & IPW_POWER_ENABLED))
                 wrqu->power.disabled = 1;
@@ -7580,8 +7580,8 @@ static int ipw2100_wx_set_genie(struct net_device *dev,
                                 union iwreq_data *wrqu, char *extra)
 {
 
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
-        struct ieee80211_device *ieee = priv->ieee;
+        struct ipw2100_priv *priv = libipw_priv(dev);
+        struct libipw_device *ieee = priv->ieee;
         u8 *buf;
 
         if (!ieee->wpa_enabled)
@@ -7615,8 +7615,8 @@ static int ipw2100_wx_get_genie(struct net_device *dev,
                                 struct iw_request_info *info,
                                 union iwreq_data *wrqu, char *extra)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
-        struct ieee80211_device *ieee = priv->ieee;
+        struct ipw2100_priv *priv = libipw_priv(dev);
+        struct libipw_device *ieee = priv->ieee;
 
         if (ieee->wpa_ie_len == 0 || ieee->wpa_ie == NULL) {
                 wrqu->data.length = 0;
@@ -7637,8 +7637,8 @@ static int ipw2100_wx_set_auth(struct net_device *dev,
                                struct iw_request_info *info,
                                union iwreq_data *wrqu, char *extra)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
-        struct ieee80211_device *ieee = priv->ieee;
+        struct ipw2100_priv *priv = libipw_priv(dev);
+        struct libipw_device *ieee = priv->ieee;
         struct iw_param *param = &wrqu->param;
         struct lib80211_crypt_data *crypt;
         unsigned long flags;
@@ -7682,7 +7682,7 @@ static int ipw2100_wx_set_auth(struct net_device *dev,
                          * can use this to determine if the CAP_PRIVACY_ON bit should
                          * be set.
                          */
-                        struct ieee80211_security sec = {
+                        struct libipw_security sec = {
                                 .flags = SEC_ENABLED,
                                 .enabled = param->value,
                         };
@@ -7730,8 +7730,8 @@ static int ipw2100_wx_get_auth(struct net_device *dev,
                                struct iw_request_info *info,
                                union iwreq_data *wrqu, char *extra)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
-        struct ieee80211_device *ieee = priv->ieee;
+        struct ipw2100_priv *priv = libipw_priv(dev);
+        struct libipw_device *ieee = priv->ieee;
         struct lib80211_crypt_data *crypt;
         struct iw_param *param = &wrqu->param;
         int ret = 0;
@@ -7792,8 +7792,8 @@ static int ipw2100_wx_set_encodeext(struct net_device *dev,
                                     struct iw_request_info *info,
                                     union iwreq_data *wrqu, char *extra)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
-        return ieee80211_wx_set_encodeext(priv->ieee, info, wrqu, extra);
+        struct ipw2100_priv *priv = libipw_priv(dev);
+        return libipw_wx_set_encodeext(priv->ieee, info, wrqu, extra);
 }
 
 /* SIOCGIWENCODEEXT */
@@ -7801,8 +7801,8 @@ static int ipw2100_wx_get_encodeext(struct net_device *dev,
                                     struct iw_request_info *info,
                                     union iwreq_data *wrqu, char *extra)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
-        return ieee80211_wx_get_encodeext(priv->ieee, info, wrqu, extra);
+        struct ipw2100_priv *priv = libipw_priv(dev);
+        return libipw_wx_get_encodeext(priv->ieee, info, wrqu, extra);
 }
 
 /* SIOCSIWMLME */
@@ -7810,7 +7810,7 @@ static int ipw2100_wx_set_mlme(struct net_device *dev,
                                struct iw_request_info *info,
                                union iwreq_data *wrqu, char *extra)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         struct iw_mlme *mlme = (struct iw_mlme *)extra;
         __le16 reason;
 
@@ -7841,7 +7841,7 @@ static int ipw2100_wx_set_promisc(struct net_device *dev,
                                   struct iw_request_info *info,
                                   union iwreq_data *wrqu, char *extra)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         int *parms = (int *)extra;
         int enable = (parms[0] > 0);
         int err = 0;
@@ -7872,7 +7872,7 @@ static int ipw2100_wx_reset(struct net_device *dev,
                             struct iw_request_info *info,
                             union iwreq_data *wrqu, char *extra)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         if (priv->status & STATUS_INITIALIZED)
                 schedule_reset(priv);
         return 0;
@@ -7884,7 +7884,7 @@ static int ipw2100_wx_set_powermode(struct net_device *dev,
                                     struct iw_request_info *info,
                                     union iwreq_data *wrqu, char *extra)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         int err = 0, mode = *(int *)extra;
 
         mutex_lock(&priv->action_mutex);
@@ -7912,7 +7912,7 @@ static int ipw2100_wx_get_powermode(struct net_device *dev,
          * This can be called at any time.  No action lock required
          */
 
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         int level = IPW_POWER_LEVEL(priv->power_mode);
         s32 timeout, period;
 
@@ -7948,7 +7948,7 @@ static int ipw2100_wx_set_preamble(struct net_device *dev,
                                    struct iw_request_info *info,
                                    union iwreq_data *wrqu, char *extra)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         int err, mode = *(int *)extra;
 
         mutex_lock(&priv->action_mutex);
@@ -7981,7 +7981,7 @@ static int ipw2100_wx_get_preamble(struct net_device *dev,
          * This can be called at any time.  No action lock required
          */
 
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
 
         if (priv->config & CFG_LONG_PREAMBLE)
                 snprintf(wrqu->name, IFNAMSIZ, "long (1)");
@@ -7996,7 +7996,7 @@ static int ipw2100_wx_set_crc_check(struct net_device *dev,
                                     struct iw_request_info *info,
                                     union iwreq_data *wrqu, char *extra)
 {
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         int err, mode = *(int *)extra;
 
         mutex_lock(&priv->action_mutex);
@@ -8028,7 +8028,7 @@ static int ipw2100_wx_get_crc_check(struct net_device *dev,
          * This can be called at any time.  No action lock required
          */
 
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
 
         if (priv->config & CFG_CRC_CHECK)
                 snprintf(wrqu->name, IFNAMSIZ, "CRC checked (1)");
@@ -8181,7 +8181,7 @@ static struct iw_statistics *ipw2100_wx_wireless_stats(struct net_device *dev)
         int beacon_qual;
         int quality;
 
-        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ipw2100_priv *priv = libipw_priv(dev);
         struct iw_statistics *wstats;
         u32 rssi, tx_retries, missed_beacons, tx_failures;
         u32 ord_len = sizeof(u32);