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>

1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/net/wireless/libertas/tx.c b/drivers/net/wireless/libertas/tx.c
index e2141f0a67d4..8a1a3965f1c5 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)