diff options
author | David Woodhouse <dwmw2@infradead.org> | 2007-12-09 12:52:19 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:06:24 -0500 |
commit | a9bdce6564b25268af7315d3dd17f4f5b6435a45 (patch) | |
tree | 1d6c27d8f024573a510cdba173a077bd4fb2b9a3 /drivers/net/wireless/libertas/main.c | |
parent | 6b4a7e0fbd772495572e038d296853a741e0454b (diff) |
libertas: move lbs_hard_start_xmit() into tx.c
... where it can shortly be merged with lbs_process_tx()...
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/main.c')
-rw-r--r-- | drivers/net/wireless/libertas/main.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index c63899518249..d311d5773f04 100644 --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c | |||
@@ -515,38 +515,6 @@ static int lbs_close(struct net_device *dev) | |||
515 | return 0; | 515 | return 0; |
516 | } | 516 | } |
517 | 517 | ||
518 | |||
519 | static int lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | ||
520 | { | ||
521 | int ret = 0; | ||
522 | struct lbs_private *priv = dev->priv; | ||
523 | |||
524 | lbs_deb_enter(LBS_DEB_TX); | ||
525 | |||
526 | /* We could return NETDEV_TX_BUSY here, but I'd actually | ||
527 | like to get the point where we can BUG() */ | ||
528 | if (priv->dnld_sent) { | ||
529 | lbs_pr_err("%s while dnld_sent\n", __func__); | ||
530 | priv->stats.tx_dropped++; | ||
531 | goto done; | ||
532 | } | ||
533 | if (priv->currenttxskb) { | ||
534 | lbs_pr_err("%s while TX skb pending\n", __func__); | ||
535 | priv->stats.tx_dropped++; | ||
536 | goto done; | ||
537 | } | ||
538 | |||
539 | netif_stop_queue(priv->dev); | ||
540 | if (priv->mesh_dev) | ||
541 | netif_stop_queue(priv->mesh_dev); | ||
542 | |||
543 | if (lbs_process_tx(priv, skb) == 0) | ||
544 | dev->trans_start = jiffies; | ||
545 | done: | ||
546 | lbs_deb_leave_args(LBS_DEB_TX, "ret %d", ret); | ||
547 | return ret; | ||
548 | } | ||
549 | |||
550 | /** | 518 | /** |
551 | * @brief Mark mesh packets and handover them to lbs_hard_start_xmit | 519 | * @brief Mark mesh packets and handover them to lbs_hard_start_xmit |
552 | * | 520 | * |