aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/hostap/hostap_80211.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-17 19:46:46 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-17 19:46:46 -0800
commitd1138cf035ad5a8dc0796b213bd078a2fb92eb7c (patch)
tree72a4640fe87720ebfc118f2b3c7f140f5d19d6b7 /drivers/net/wireless/hostap/hostap_80211.h
parent15578eeb6cd4b74492f26e60624aa1a9a52ddd7b (diff)
parent77783a78ded96a56e3a1a0c03bbe87c56896fe6e (diff)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_80211.h')
-rw-r--r--drivers/net/wireless/hostap/hostap_80211.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/hostap/hostap_80211.h b/drivers/net/wireless/hostap/hostap_80211.h
index bf506f50d72..1fc72fe511e 100644
--- a/drivers/net/wireless/hostap/hostap_80211.h
+++ b/drivers/net/wireless/hostap/hostap_80211.h
@@ -1,6 +1,9 @@
#ifndef HOSTAP_80211_H
#define HOSTAP_80211_H
+#include <linux/types.h>
+#include <net/ieee80211_crypt.h>
+
struct hostap_ieee80211_mgmt {
u16 frame_control;
u16 duration;