lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libertas: kill lbs_upload_tx_packet()

Browse Source 
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>
This commit is contained in:
David Woodhouse
2007-12-10 00:49:26 -05:00
committed by David S. Miller
parent 7bf02c2985
commit 6f93a8e7e4
3 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/libertas/decl.h
View File

@@ -46,8 +46,6 @@ void lbs_get_fwversion(struct lbs_private *priv,
char *fwversion, char *fwversion,
int maxlen); int maxlen);
void lbs_upload_rx_packet(struct lbs_private *priv, struct sk_buff *skb);
/** The proc fs interface */ /** The proc fs interface */
int lbs_process_rx_command(struct lbs_private *priv); int lbs_process_rx_command(struct lbs_private *priv);
void __lbs_cleanup_and_insert_cmd(struct lbs_private *priv, void __lbs_cleanup_and_insert_cmd(struct lbs_private *priv,

32
drivers/net/wireless/libertas/rx.c
View File

@@ -131,22 +131,6 @@ static void lbs_compute_rssi(struct lbs_private *priv, struct rxpd *p_rx_pd)
lbs_deb_leave(LBS_DEB_RX); lbs_deb_leave(LBS_DEB_RX);
} }
void lbs_upload_rx_packet(struct lbs_private *priv, struct sk_buff *skb)
{
lbs_deb_rx("skb->data %p\n", skb->data);
if (priv->monitormode != LBS_MONITOR_OFF) {
skb->protocol = eth_type_trans(skb, priv->rtap_net_dev);
} else {
if (priv->mesh_dev && IS_MESH_FRAME(skb))
skb->protocol = eth_type_trans(skb, priv->mesh_dev);
else
skb->protocol = eth_type_trans(skb, priv->dev);
}
skb->ip_summed = CHECKSUM_NONE;
netif_rx(skb);
}
/** /**
* @brief This function processes received packet and forwards it * @brief This function processes received packet and forwards it
* to kernel/upper layer * to kernel/upper layer
@@ -158,7 +142,7 @@ void lbs_upload_rx_packet(struct lbs_private *priv, struct sk_buff *skb)
int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *skb) int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *skb)
{ {
int ret = 0; int ret = 0;
struct net_device *dev = priv->dev;
struct rxpackethdr *p_rx_pkt; struct rxpackethdr *p_rx_pkt;
struct rxpd *p_rx_pd; struct rxpd *p_rx_pd;
@@ -169,15 +153,15 @@ int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *skb)
lbs_deb_enter(LBS_DEB_RX); lbs_deb_enter(LBS_DEB_RX);
skb->ip_summed = CHECKSUM_NONE;
if (priv->monitormode != LBS_MONITOR_OFF) if (priv->monitormode != LBS_MONITOR_OFF)
return process_rxed_802_11_packet(priv, skb); return process_rxed_802_11_packet(priv, skb);
p_rx_pkt = (struct rxpackethdr *) skb->data; p_rx_pkt = (struct rxpackethdr *) skb->data;
p_rx_pd = &p_rx_pkt->rx_pd; p_rx_pd = &p_rx_pkt->rx_pd;
if (p_rx_pd->rx_control & RxPD_MESH_FRAME) if (priv->mesh_dev && (p_rx_pd->rx_control & RxPD_MESH_FRAME))
SET_MESH_FRAME(skb); dev = priv->mesh_dev;
else
UNSET_MESH_FRAME(skb);
lbs_deb_hex(LBS_DEB_RX, "RX Data: Before chop rxpd", skb->data, lbs_deb_hex(LBS_DEB_RX, "RX Data: Before chop rxpd", skb->data,
min_t(unsigned int, skb->len, 100)); min_t(unsigned int, skb->len, 100));
@@ -262,7 +246,8 @@ int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *skb)
priv->stats.rx_bytes += skb->len; priv->stats.rx_bytes += skb->len;
priv->stats.rx_packets++; priv->stats.rx_packets++;
lbs_upload_rx_packet(priv, skb); skb->protocol = eth_type_trans(skb, dev);
netif_rx(skb);
ret = 0; ret = 0;
done: done:
@@ -404,7 +389,8 @@ static int process_rxed_802_11_packet(struct lbs_private *priv,
priv->stats.rx_bytes += skb->len; priv->stats.rx_bytes += skb->len;
priv->stats.rx_packets++; priv->stats.rx_packets++;
lbs_upload_rx_packet(priv, skb); skb->protocol = eth_type_trans(skb, priv->rtap_net_dev);
netif_rx(skb);
ret = 0; ret = 0;

8
drivers/net/wireless/libertas/tx.c
View File

@@ -2,6 +2,7 @@
* This file contains the handling of TX in wlan driver. * This file contains the handling of TX in wlan driver.
*/ */
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include "hostcmd.h" #include "hostcmd.h"
#include "radiotap.h" #include "radiotap.h"
@@ -203,7 +204,12 @@ void lbs_send_tx_feedback(struct lbs_private *priv)
try_count = (status >> 16) & 0xff; try_count = (status >> 16) & 0xff;
radiotap_hdr->data_retries = (try_count) ? radiotap_hdr->data_retries = (try_count) ?
(1 + priv->txretrycount - try_count) : 0; (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; priv->currenttxskb = NULL;
if (priv->connect_status == LBS_CONNECTED) if (priv->connect_status == LBS_CONNECTED)