diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-26 14:18:15 +0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-26 14:18:15 +0400 |
| commit | 00355cd938bac2a6006efa140352958784431f1f (patch) | |
| tree | 4f8bd8f9117a5ea180da97fd889b5305738b3be2 /include | |
| parent | 45de6fd958d7f407bdb5fdc6914b3262519d891c (diff) | |
| parent | 3c304956755fa63ee80ca51ce38078fe1c4e8818 (diff) | |
| download | linux-00355cd938bac2a6006efa140352958784431f1f.tar.xz | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/ieee80211.h | 6 | ||||
| -rw-r--r-- | include/net/ieee80211softmac_wx.h | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index 4725ff861c57..4087dfc47094 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h @@ -29,7 +29,7 @@ #include <linux/kernel.h> /* ARRAY_SIZE */ #include <linux/wireless.h> -#define IEEE80211_VERSION "git-1.1.7" +#define IEEE80211_VERSION "git-1.1.13" #define IEEE80211_DATA_LEN 2304 /* Maximum size for the MA-UNITDATA primitive, 802.11 standard section @@ -104,6 +104,9 @@ #define IEEE80211_SCTL_FRAG 0x000F #define IEEE80211_SCTL_SEQ 0xFFF0 +/* QOS control */ +#define IEEE80211_QCTL_TID 0x000F + /* debug macros */ #ifdef CONFIG_IEEE80211_DEBUG @@ -1073,6 +1076,7 @@ struct ieee80211_device { int (*handle_management) (struct net_device * dev, struct ieee80211_network * network, u16 type); + int (*is_qos_active) (struct net_device *dev, struct sk_buff *skb); /* Typical STA methods */ int (*handle_auth) (struct net_device * dev, diff --git a/include/net/ieee80211softmac_wx.h b/include/net/ieee80211softmac_wx.h index 3e0be453ecea..4ee3ad57283f 100644 --- a/include/net/ieee80211softmac_wx.h +++ b/include/net/ieee80211softmac_wx.h @@ -91,4 +91,9 @@ ieee80211softmac_wx_get_genie(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra); +extern int +ieee80211softmac_wx_set_mlme(struct net_device *dev, + struct iw_request_info *info, + union iwreq_data *wrqu, + char *extra); #endif /* _IEEE80211SOFTMAC_WX */ |