[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, 2 insertions, 2 deletions

diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c
index 0b7854d797c4..ec64f6c174bb 100644
--- a/drivers/net/wireless/libertas/rx.c
+++ b/drivers/net/wireless/libertas/rx.c
@@ -143,8 +143,8 @@ void libertas_upload_rx_packet(wlan_private * priv, struct sk_buff *skb)
         if (priv->mesh_dev && IS_MESH_FRAME(skb))
                 skb->dev = priv->mesh_dev;
         else
-                skb->dev = priv->wlan_dev.netdev;
-        skb->protocol = eth_type_trans(skb, priv->wlan_dev.netdev);
+                skb->dev = priv->dev;
+        skb->protocol = eth_type_trans(skb, priv->dev);
         skb->ip_summed = CHECKSUM_UNNECESSARY;
 
         netif_rx(skb);