diff options
Diffstat (limited to 'drivers/net/wireless/libertas/tx.c')
-rw-r--r-- | drivers/net/wireless/libertas/tx.c | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/tx.c b/drivers/net/wireless/libertas/tx.c index 10596f3bb59a..336544cdeca6 100644 --- a/drivers/net/wireless/libertas/tx.c +++ b/drivers/net/wireless/libertas/tx.c | |||
@@ -56,7 +56,7 @@ static u32 convert_radiotap_rate_to_mv(u8 rate) | |||
56 | * @param skb A pointer to skb which includes TX packet | 56 | * @param skb A pointer to skb which includes TX packet |
57 | * @return 0 or -1 | 57 | * @return 0 or -1 |
58 | */ | 58 | */ |
59 | int lbs_process_tx(struct lbs_private *priv, struct sk_buff *skb) | 59 | static int lbs_process_tx(struct lbs_private *priv, struct sk_buff *skb) |
60 | { | 60 | { |
61 | int ret = -1; | 61 | int ret = -1; |
62 | struct txpd localtxpd; | 62 | struct txpd localtxpd; |
@@ -179,6 +179,37 @@ done: | |||
179 | return ret; | 179 | return ret; |
180 | } | 180 | } |
181 | 181 | ||
182 | int lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | ||
183 | { | ||
184 | int ret = 0; | ||
185 | struct lbs_private *priv = dev->priv; | ||
186 | |||
187 | lbs_deb_enter(LBS_DEB_TX); | ||
188 | |||
189 | /* We could return NETDEV_TX_BUSY here, but I'd actually | ||
190 | like to get the point where we can BUG() */ | ||
191 | if (priv->dnld_sent) { | ||
192 | lbs_pr_err("%s while dnld_sent\n", __func__); | ||
193 | priv->stats.tx_dropped++; | ||
194 | goto done; | ||
195 | } | ||
196 | if (priv->currenttxskb) { | ||
197 | lbs_pr_err("%s while TX skb pending\n", __func__); | ||
198 | priv->stats.tx_dropped++; | ||
199 | goto done; | ||
200 | } | ||
201 | |||
202 | netif_stop_queue(priv->dev); | ||
203 | if (priv->mesh_dev) | ||
204 | netif_stop_queue(priv->mesh_dev); | ||
205 | |||
206 | if (lbs_process_tx(priv, skb) == 0) | ||
207 | dev->trans_start = jiffies; | ||
208 | done: | ||
209 | lbs_deb_leave_args(LBS_DEB_TX, "ret %d", ret); | ||
210 | return ret; | ||
211 | } | ||
212 | |||
182 | /** | 213 | /** |
183 | * @brief This function sends to the host the last transmitted packet, | 214 | * @brief This function sends to the host the last transmitted packet, |
184 | * filling the radiotap headers with transmission information. | 215 | * filling the radiotap headers with transmission information. |