aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/tx.c
diff options
context:
space:
mode:
authorHolger Schurig <hs4233@mail.mn-solutions.de>2007-05-25 13:05:16 -0400
committerJohn W. Linville <linville@tuxdriver.com>2007-06-11 14:28:40 -0400
commit634b8f49c11f49272b09d13a34b22a17b8c3d419 (patch)
tree75ccd1d8160390235ada42d1c311710534392a02 /drivers/net/wireless/libertas/tx.c
parentec3eef28d9bc3fbcc5d3dd668dffcaa675015b11 (diff)
[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>
Diffstat (limited to 'drivers/net/wireless/libertas/tx.c')
-rw-r--r--drivers/net/wireless/libertas/tx.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/libertas/tx.c b/drivers/net/wireless/libertas/tx.c
index 138668ea9cf6..b6cb675f730d 100644
--- a/drivers/net/wireless/libertas/tx.c
+++ b/drivers/net/wireless/libertas/tx.c
@@ -157,7 +157,7 @@ done:
157 received from FW */ 157 received from FW */
158 skb_orphan(skb); 158 skb_orphan(skb);
159 /* stop processing outgoing pkts */ 159 /* stop processing outgoing pkts */
160 netif_stop_queue(priv->wlan_dev.netdev); 160 netif_stop_queue(priv->dev);
161 netif_stop_queue(priv->mesh_dev); 161 netif_stop_queue(priv->mesh_dev);
162 /* freeze any packets already in our queues */ 162 /* freeze any packets already in our queues */
163 priv->adapter->TxLockFlag = 1; 163 priv->adapter->TxLockFlag = 1;
@@ -196,10 +196,10 @@ static void wlan_tx_queue(wlan_private *priv, struct sk_buff *skb)
196 WARN_ON(priv->adapter->tx_queue_idx >= NR_TX_QUEUE); 196 WARN_ON(priv->adapter->tx_queue_idx >= NR_TX_QUEUE);
197 adapter->tx_queue_ps[adapter->tx_queue_idx++] = skb; 197 adapter->tx_queue_ps[adapter->tx_queue_idx++] = skb;
198 if (adapter->tx_queue_idx == NR_TX_QUEUE) { 198 if (adapter->tx_queue_idx == NR_TX_QUEUE) {
199 netif_stop_queue(priv->wlan_dev.netdev); 199 netif_stop_queue(priv->dev);
200 netif_stop_queue(priv->mesh_dev); 200 netif_stop_queue(priv->mesh_dev);
201 } else { 201 } else {
202 netif_start_queue(priv->wlan_dev.netdev); 202 netif_start_queue(priv->dev);
203 netif_start_queue(priv->mesh_dev); 203 netif_start_queue(priv->mesh_dev);
204 } 204 }
205 205
@@ -220,9 +220,9 @@ int libertas_process_tx(wlan_private * priv, struct sk_buff *skb)
220 lbs_deb_enter(LBS_DEB_TX); 220 lbs_deb_enter(LBS_DEB_TX);
221 lbs_dbg_hex("TX Data", skb->data, min_t(unsigned int, skb->len, 100)); 221 lbs_dbg_hex("TX Data", skb->data, min_t(unsigned int, skb->len, 100));
222 222
223 if (priv->wlan_dev.dnld_sent) { 223 if (priv->dnld_sent) {
224 lbs_pr_alert( "TX error: dnld_sent = %d, not sending\n", 224 lbs_pr_alert( "TX error: dnld_sent = %d, not sending\n",
225 priv->wlan_dev.dnld_sent); 225 priv->dnld_sent);
226 goto done; 226 goto done;
227 } 227 }
228 228
@@ -283,7 +283,7 @@ void libertas_send_tx_feedback(wlan_private * priv)
283 adapter->currenttxskb = NULL; 283 adapter->currenttxskb = NULL;
284 priv->adapter->TxLockFlag = 0; 284 priv->adapter->TxLockFlag = 0;
285 if (priv->adapter->connect_status == libertas_connected) { 285 if (priv->adapter->connect_status == libertas_connected) {
286 netif_wake_queue(priv->wlan_dev.netdev); 286 netif_wake_queue(priv->dev);
287 netif_wake_queue(priv->mesh_dev); 287 netif_wake_queue(priv->mesh_dev);
288 } 288 }
289} 289}