summaryrefslogtreecommitdiff
path: root/drivers/staging/cw1200/txrx.c
diff options
context:
space:
mode:
authorDmitry Tarnyagin <dmitry.tarnyagin@stericsson.com>2011-07-11 17:18:10 +0200
committerPhilippe LANGLAIS <philippe.langlais@stericsson.com>2011-10-12 13:49:05 +0200
commitdad01fd59c51d1385303d788d4bf05a024fb082e (patch)
tree74ad72e085b55f24933f2c26230e72d23632424d /drivers/staging/cw1200/txrx.c
parent65ff576e01f45a0ec7db8db367bec0be32e50206 (diff)
cw1200: Aligning mac80211 API with compat-wireless-3.0-rc4-1
Signed-off-by: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com> Change-Id: I8bf50cd2f97dcb5677b2db8efc89757d74eb3f55 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/27073 Reviewed-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com> Tested-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33480 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
Diffstat (limited to 'drivers/staging/cw1200/txrx.c')
-rw-r--r--drivers/staging/cw1200/txrx.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/cw1200/txrx.c b/drivers/staging/cw1200/txrx.c
index 65a29fef8ff..9b2864c8bde 100644
--- a/drivers/staging/cw1200/txrx.c
+++ b/drivers/staging/cw1200/txrx.c
@@ -412,7 +412,7 @@ int cw1200_skb_to_wsm(struct cw1200_common *priv, struct sk_buff *skb,
/* ******************************************************************** */
-int cw1200_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
+void cw1200_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
{
struct cw1200_common *priv = dev->priv;
unsigned queue = skb_get_queue_mapping(skb);
@@ -516,16 +516,16 @@ int cw1200_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
else
goto err;
- return NETDEV_TX_OK;
+ return;
err:
/* TODO: Update TX failure counters */
dev_kfree_skb_any(skb);
- return NETDEV_TX_OK;
+ return;
drop:
dev_kfree_skb_any(skb);
- return NETDEV_TX_OK;
+ return;
}
/* ******************************************************************** */