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

libertas: kill lbs_process_tx() by merging it into lbs_hard_start_xmit()

Browse Source 
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-09 12:57:14 -05:00
committed by David S. Miller
parent a9bdce6564
commit 8af23b2f96
1 changed files with 13 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,8 +56,9 @@ static u32 convert_radiotap_rate_to_mv(u8 rate)
* @param skb A pointer to skb which includes TX packet * @param skb A pointer to skb which includes TX packet
* @return 0 or -1 * @return 0 or -1
*/ */
static int lbs_process_tx(struct lbs_private *priv, struct sk_buff *skb) int lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct lbs_private *priv = dev->priv;
int ret = -1; int ret = -1;
struct txpd localtxpd; struct txpd localtxpd;
struct txpd *plocaltxpd = &localtxpd; struct txpd *plocaltxpd = &localtxpd;
@@ -70,12 +71,21 @@ static int lbs_process_tx(struct lbs_private *priv, struct sk_buff *skb)
lbs_deb_hex(LBS_DEB_TX, "TX Data", skb->data, min_t(unsigned int, skb->len, 100)); lbs_deb_hex(LBS_DEB_TX, "TX Data", skb->data, min_t(unsigned int, skb->len, 100));
netif_stop_queue(priv->dev);
if (priv->mesh_dev)
netif_stop_queue(priv->mesh_dev);
if (priv->dnld_sent) { if (priv->dnld_sent) {
lbs_pr_alert( "TX error: dnld_sent = %d, not sending\n", lbs_pr_alert( "TX error: dnld_sent = %d, not sending\n",
priv->dnld_sent); priv->dnld_sent);
goto done; goto done;
} }
if (priv->currenttxskb) {
lbs_pr_err("%s while TX skb pending\n", __func__);
goto done;
}
if ((priv->psstate == PS_STATE_SLEEP) || if ((priv->psstate == PS_STATE_SLEEP) ||
(priv->psstate == PS_STATE_PRE_SLEEP)) { (priv->psstate == PS_STATE_PRE_SLEEP)) {
lbs_pr_alert("TX error: packet xmit in %ssleep mode\n", lbs_pr_alert("TX error: packet xmit in %ssleep mode\n",
@@ -154,6 +164,8 @@ done_tx:
if (!ret) { if (!ret) {
priv->stats.tx_packets++; priv->stats.tx_packets++;
priv->stats.tx_bytes += skb->len; priv->stats.tx_bytes += skb->len;
dev->trans_start = jiffies;
} else { } else {
priv->stats.tx_dropped++; priv->stats.tx_dropped++;
priv->stats.tx_errors++; priv->stats.tx_errors++;
@@ -179,37 +191,6 @@ done:
return ret; return ret;
} }
int lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
int ret = 0;
struct lbs_private *priv = dev->priv;
lbs_deb_enter(LBS_DEB_TX);
/* We could return NETDEV_TX_BUSY here, but I'd actually
like to get the point where we can BUG() */
if (priv->dnld_sent) {
lbs_pr_err("%s while dnld_sent\n", __func__);
priv->stats.tx_dropped++;
goto done;
}
if (priv->currenttxskb) {
lbs_pr_err("%s while TX skb pending\n", __func__);
priv->stats.tx_dropped++;
goto done;
}
netif_stop_queue(priv->dev);
if (priv->mesh_dev)
netif_stop_queue(priv->mesh_dev);
if (lbs_process_tx(priv, skb) == 0)
dev->trans_start = jiffies;
done:
lbs_deb_leave_args(LBS_DEB_TX, "ret %d", ret);
return ret;
}
/** /**
* @brief This function sends to the host the last transmitted packet, * @brief This function sends to the host the last transmitted packet,
* filling the radiotap headers with transmission information. * filling the radiotap headers with transmission information.