diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 11:33:59 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 11:33:59 +1000 |
| commit | 4f130f0d56141feae10c8a1140a74f8d227c0638 (patch) | |
| tree | 845fb5ac2d240489ad4b68af6ca57aa34b71e048 /drivers/net/wireless/hostap/hostap_80211.h | |
| parent | 81957a36b93cd372fb4cfb476c0481d4a9c08ded (diff) | |
| parent | 55f9d6786de2f9cf37db50dbe8ae16f887f3ad7f (diff) | |
Merge commit 'net/master'
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_80211.h')
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_80211.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/net/wireless/hostap/hostap_80211.h b/drivers/net/wireless/hostap/hostap_80211.h index 2e9fb0f383fc..7f9d8d976aa8 100644 --- a/drivers/net/wireless/hostap/hostap_80211.h +++ b/drivers/net/wireless/hostap/hostap_80211.h @@ -3,6 +3,7 @@ #include <linux/types.h> #include <linux/skbuff.h> +#include <linux/netdevice.h> struct hostap_ieee80211_mgmt { __le16 frame_control; @@ -85,8 +86,11 @@ void hostap_dump_rx_80211(const char *name, struct sk_buff *skb, struct hostap_80211_rx_status *rx_stats); void hostap_dump_tx_80211(const char *name, struct sk_buff *skb); -int hostap_data_start_xmit(struct sk_buff *skb, struct net_device *dev); -int hostap_mgmt_start_xmit(struct sk_buff *skb, struct net_device *dev); -int hostap_master_start_xmit(struct sk_buff *skb, struct net_device *dev); +netdev_tx_t hostap_data_start_xmit(struct sk_buff *skb, + struct net_device *dev); +netdev_tx_t hostap_mgmt_start_xmit(struct sk_buff *skb, + struct net_device *dev); +netdev_tx_t hostap_master_start_xmit(struct sk_buff *skb, + struct net_device *dev); #endif /* HOSTAP_80211_H */ |