summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/tx.c
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2007-12-10 00:49:26 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 15:06:32 -0800
commit6f93a8e7e41c2d29749242f983f41e3f6a75b40b (patch)
tree69f4acfc1ff4b7b5e94b3f8f33d9fc472da922b6 /drivers/net/wireless/libertas/tx.c
parent7bf02c2985ced746f8b8956dbe4b0384edb41846 (diff)
libertas: kill lbs_upload_tx_packet()
It replaces two lines of code. And even for those it has to make inferences about things (i.e. which device) which the caller would have just known. Signed-off-by: David Woodhouse <dwmw2@infradead.org> 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.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/tx.c b/drivers/net/wireless/libertas/tx.c
index e2141f0a67d..8a1a3965f1c 100644
--- a/drivers/net/wireless/libertas/tx.c
+++ b/drivers/net/wireless/libertas/tx.c
@@ -2,6 +2,7 @@
* This file contains the handling of TX in wlan driver.
*/
#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
#include "hostcmd.h"
#include "radiotap.h"
@@ -203,7 +204,12 @@ void lbs_send_tx_feedback(struct lbs_private *priv)
try_count = (status >> 16) & 0xff;
radiotap_hdr->data_retries = (try_count) ?
(1 + priv->txretrycount - try_count) : 0;
- lbs_upload_rx_packet(priv, priv->currenttxskb);
+
+
+ priv->currenttxskb->protocol = eth_type_trans(priv->currenttxskb,
+ priv->rtap_net_dev);
+ netif_rx(priv->currenttxskb);
+
priv->currenttxskb = NULL;
if (priv->connect_status == LBS_CONNECTED)