summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/hostap/hostap_80211.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-31 10:03:19 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-31 10:03:19 -0500
commitea19006f583b2128ce8338e6bb43aa0eb724a4b9 (patch)
tree4c859976b6acc1301d2c8822be6f21b0381f45fc /drivers/net/wireless/hostap/hostap_80211.h
parent8b316a3973f05e572b4edeeda9072987f6bbaa44 (diff)
parenta0f067802576d4eb4c65d40b8ee7d6ea3c81dd61 (diff)
Merge branch 'master'
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_80211.h')
-rw-r--r--drivers/net/wireless/hostap/hostap_80211.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/hostap/hostap_80211.h b/drivers/net/wireless/hostap/hostap_80211.h
index 1fc72fe511e..cc1ee7f4f5f 100644
--- a/drivers/net/wireless/hostap/hostap_80211.h
+++ b/drivers/net/wireless/hostap/hostap_80211.h
@@ -92,8 +92,6 @@ void hostap_dump_rx_80211(const char *name, struct sk_buff *skb,
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);
-struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb,
- struct ieee80211_crypt_data *crypt);
int hostap_master_start_xmit(struct sk_buff *skb, struct net_device *dev);
#endif /* HOSTAP_80211_H */