diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 15:50:57 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 04:14:04 -0400 |
commit | d0cf9c0dadcdc89a755bcb301cfc9c796eb28ccf (patch) | |
tree | c201ed345e104100288d57c8b3ae46d486b56118 /net/mac80211/tx.c | |
parent | 0fc480987e69f22b9212f087545b4d1ca6950807 (diff) |
wireless: convert drivers to netdev_tx_t
Mostly just simple conversions:
* ray_cs had bogus return of NET_TX_LOCKED but driver
was not using NETIF_F_LLTX
* hostap and ipw2x00 had some code that returned value
from a called function that also had to change to return netdev_tx_t
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r-- | net/mac80211/tx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 0c08d1e60cb5..5143d203256b 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
@@ -1483,8 +1483,8 @@ static void ieee80211_xmit(struct ieee80211_sub_if_data *sdata, | |||
1483 | dev_put(sdata->dev); | 1483 | dev_put(sdata->dev); |
1484 | } | 1484 | } |
1485 | 1485 | ||
1486 | int ieee80211_monitor_start_xmit(struct sk_buff *skb, | 1486 | netdev_tx_t ieee80211_monitor_start_xmit(struct sk_buff *skb, |
1487 | struct net_device *dev) | 1487 | struct net_device *dev) |
1488 | { | 1488 | { |
1489 | struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); | 1489 | struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); |
1490 | struct ieee80211_channel *chan = local->hw.conf.channel; | 1490 | struct ieee80211_channel *chan = local->hw.conf.channel; |
@@ -1568,8 +1568,8 @@ fail: | |||
1568 | * encapsulated packet will then be passed to master interface, wlan#.11, for | 1568 | * encapsulated packet will then be passed to master interface, wlan#.11, for |
1569 | * transmission (through low-level driver). | 1569 | * transmission (through low-level driver). |
1570 | */ | 1570 | */ |
1571 | int ieee80211_subif_start_xmit(struct sk_buff *skb, | 1571 | netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, |
1572 | struct net_device *dev) | 1572 | struct net_device *dev) |
1573 | { | 1573 | { |
1574 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); | 1574 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); |
1575 | struct ieee80211_local *local = sdata->local; | 1575 | struct ieee80211_local *local = sdata->local; |