[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/join.c b/drivers/net/wireless/libertas/join.c
index 0edce849e4ad..8c578ec452e4 100644
--- a/drivers/net/wireless/libertas/join.c
+++ b/drivers/net/wireless/libertas/join.c
@@ -804,8 +804,8 @@ int libertas_ret_80211_associate(wlan_private * priv,
         adapter->nextSNRNF = 0;
         adapter->numSNRNF = 0;
 
-        netif_carrier_on(priv->wlan_dev.netdev);
-        netif_wake_queue(priv->wlan_dev.netdev);
+        netif_carrier_on(priv->dev);
+        netif_wake_queue(priv->dev);
 
         netif_carrier_on(priv->mesh_dev);
         netif_wake_queue(priv->mesh_dev);
@@ -814,7 +814,7 @@ int libertas_ret_80211_associate(wlan_private * priv,
 
         memcpy(wrqu.ap_addr.sa_data, adapter->curbssparams.bssid, ETH_ALEN);
         wrqu.ap_addr.sa_family = ARPHRD_ETHER;
-        wireless_send_event(priv->wlan_dev.netdev, SIOCGIWAP, &wrqu, NULL);
+        wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
 
 done:
         lbs_deb_leave_args(LBS_DEB_JOIN, "ret %d", ret);
@@ -899,8 +899,8 @@ int libertas_ret_80211_ad_hoc_start(wlan_private * priv,
         memcpy(&adapter->curbssparams.ssid,
                &pbssdesc->ssid, sizeof(struct WLAN_802_11_SSID));
 
-        netif_carrier_on(priv->wlan_dev.netdev);
-        netif_wake_queue(priv->wlan_dev.netdev);
+        netif_carrier_on(priv->dev);
+        netif_wake_queue(priv->dev);
 
         netif_carrier_on(priv->mesh_dev);
         netif_wake_queue(priv->mesh_dev);
@@ -908,7 +908,7 @@ int libertas_ret_80211_ad_hoc_start(wlan_private * priv,
         memset(&wrqu, 0, sizeof(wrqu));
         memcpy(wrqu.ap_addr.sa_data, adapter->curbssparams.bssid, ETH_ALEN);
         wrqu.ap_addr.sa_family = ARPHRD_ETHER;
-        wireless_send_event(priv->wlan_dev.netdev, SIOCGIWAP, &wrqu, NULL);
+        wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
 
         lbs_deb_join("ADHOC_RESP: - Joined/Started Ad Hoc\n");
         lbs_deb_join("ADHOC_RESP: channel = %d\n", adapter->adhocchannel);