diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-06-20 11:19:40 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-06-20 11:19:40 -0400 |
| commit | d636b2798732f2cfba48d94aa19b7ba206268a83 (patch) | |
| tree | 40dc52126ab5a1570a000321d93ca4bb03312684 /include/net/ieee80211.h | |
| parent | 9f5aa2a921797ce6eb4542c7517915bd1d5fbd0b (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
| download | kernel-crypto-d636b2798732f2cfba48d94aa19b7ba206268a83.tar.gz kernel-crypto-d636b2798732f2cfba48d94aa19b7ba206268a83.tar.xz kernel-crypto-d636b2798732f2cfba48d94aa19b7ba206268a83.zip | |
Merge branch 'master'
Diffstat (limited to 'include/net/ieee80211.h')
| -rw-r--r-- | include/net/ieee80211.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index d5926bfb1fc..d5147770ad4 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 @@ -1075,6 +1078,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, @@ -1243,7 +1247,8 @@ extern int ieee80211_set_encryption(struct ieee80211_device *ieee); extern int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev); extern void ieee80211_txb_free(struct ieee80211_txb *); extern int ieee80211_tx_frame(struct ieee80211_device *ieee, - struct ieee80211_hdr *frame, int len); + struct ieee80211_hdr *frame, int hdr_len, + int total_len, int encrypt_mpdu); /* ieee80211_rx.c */ extern int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, |