diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-10-20 16:07:19 +0100 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-10-20 16:07:19 +0100 |
| commit | 61e0e79ee3c609eb34edf2fe023708cba6a79b1f (patch) | |
| tree | 663deacffd4071120dc9badb70428fe5f124c7b9 /net/mac80211/wme.h | |
| parent | c15895ef30c2c03e99802951787183039a349d32 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'master' into for-upstream
Conflicts:
Documentation/ABI/testing/sysfs-bus-usb
drivers/Makefile
Diffstat (limited to 'net/mac80211/wme.h')
| -rw-r--r-- | net/mac80211/wme.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/mac80211/wme.h b/net/mac80211/wme.h index 04de28c071a..bc62f28a4d3 100644 --- a/net/mac80211/wme.h +++ b/net/mac80211/wme.h @@ -1,5 +1,4 @@ /* - * IEEE 802.11 driver (80211.o) - QoS datatypes * Copyright 2004, Instant802 Networks, Inc. * Copyright 2005, Devicescape Software, Inc. * @@ -14,8 +13,6 @@ #include <linux/netdevice.h> #include "ieee80211_i.h" -#define QOS_CONTROL_LEN 2 - #define QOS_CONTROL_ACK_POLICY_NORMAL 0 #define QOS_CONTROL_ACK_POLICY_NOACK 1 |