[PATCH] libertas: remove unused variables in wlan_dev_t

Actually, this patch removev wlan_dev_t totally and puts the used variables
of it directly into wlan_private. That reduces one level of indirection and
looks a little bit simpler. It's now "priv->card" and not
"priv->wlan_dev.card" and "priv->dev" instead of "priv->wlan_dev.netdev"

Changed two occurences of "((wlan_private *) dev->priv)->wlan_dev.netdev"
into "dev", because I didn't see the point in doing pointer-ping-pong.

The variables "ioport", "upld_rcv" and "upld_type" where unused. They have
been removed.

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index 1efdc4beb7f0..45459d4ba684 100644
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -42,15 +42,15 @@ void libertas_mac_event_disconnected(wlan_private * priv)
          */
 
         msleep_interruptible(1000);
-        wireless_send_event(priv->wlan_dev.netdev, SIOCGIWAP, &wrqu, NULL);
+        wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
 
         /* Free Tx and Rx packets */
         kfree_skb(priv->adapter->currenttxskb);
         priv->adapter->currenttxskb = NULL;
 
         /* report disconnect to upper layer */
-        netif_stop_queue(priv->wlan_dev.netdev);
-        netif_carrier_off(priv->wlan_dev.netdev);
+        netif_stop_queue(priv->dev);
+        netif_carrier_off(priv->dev);
 
         /* reset SNR/NF/RSSI values */
         memset(adapter->SNR, 0x00, sizeof(adapter->SNR));
@@ -218,7 +218,7 @@ static int wlan_ret_get_hw_spec(wlan_private * priv,
                         ETH_ALEN);
         }
 
-        memcpy(priv->wlan_dev.netdev->dev_addr, adapter->current_addr, ETH_ALEN);
+        memcpy(priv->dev->dev_addr, adapter->current_addr, ETH_ALEN);
         if (priv->mesh_dev)
                 memcpy(priv->mesh_dev->dev_addr, adapter->current_addr,
                        ETH_ALEN);
@@ -774,14 +774,14 @@ int libertas_process_rx_command(wlan_private * priv)
         resp = (struct cmd_ds_command *)(adapter->cur_cmd->bufvirtualaddr);
 
         lbs_dbg_hex("CMD_RESP:", adapter->cur_cmd->bufvirtualaddr,
-                priv->wlan_dev.upld_len);
+                priv->upld_len);
 
         respcmd = le16_to_cpu(resp->command);
 
         result = le16_to_cpu(resp->result);
 
         lbs_deb_cmd("CMD_RESP: %x result: %d length: %d\n", respcmd,
-               result, priv->wlan_dev.upld_len);
+               result, priv->upld_len);
 
         if (!(respcmd & 0x8000)) {
                 lbs_deb_cmd("Invalid response to command!");