[src/trunk]: src/sys/dev/usb remove duplicated QoS definitions

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1dba17a7bdae
branches:  trunk
changeset: 781104:1dba17a7bdae
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Aug 20 07:32:49 2012 +0000

description:
remove duplicated QoS definitions

diffstat:

 sys/dev/usb/if_otus.c     |  8 ++++----
 sys/dev/usb/if_otusvar.h  |  6 +-----
 sys/dev/usb/if_run.c      |  5 ++---
 sys/dev/usb/if_urtwnvar.h |  3 +--
 4 files changed, 8 insertions(+), 14 deletions(-)

diffs (92 lines):

diff -r c13c74fc81ee -r 1dba17a7bdae sys/dev/usb/if_otus.c
--- a/sys/dev/usb/if_otus.c     Mon Aug 20 07:30:10 2012 +0000
+++ b/sys/dev/usb/if_otus.c     Mon Aug 20 07:32:49 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_otus.c,v 1.11 2012/08/19 07:55:54 christos Exp $    */
+/*     $NetBSD: if_otus.c,v 1.12 2012/08/20 07:32:49 christos Exp $    */
 /*     $OpenBSD: if_otus.c,v 1.18 2010/08/27 17:08:00 jsg Exp $        */
 
 /*-
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_otus.c,v 1.11 2012/08/19 07:55:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_otus.c,v 1.12 2012/08/20 07:32:49 christos Exp $");
 /*-
  * Driver for Atheros AR9001U chipset.
  * http://www.atheros.com/pt/bulletins/AR9001USBBulletin.pdf
@@ -1823,8 +1823,8 @@
        macctl = AR_TX_MAC_BACKOFF | AR_TX_MAC_HW_DUR | AR_TX_MAC_QID(qid);
 
        if (IEEE80211_IS_MULTICAST(wh->i_addr1) ||
-           (hasqos && ((qos & IEEE80211_QOS_ACK_POLICY_MASK) ==
-            IEEE80211_QOS_ACK_POLICY_NOACK)))
+           (hasqos && ((qos & IEEE80211_QOS_ACKPOLICY_MASK) ==
+            IEEE80211_QOS_ACKPOLICY_NOACK)))
                macctl |= AR_TX_MAC_NOACK;
 
        if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) {
diff -r c13c74fc81ee -r 1dba17a7bdae sys/dev/usb/if_otusvar.h
--- a/sys/dev/usb/if_otusvar.h  Mon Aug 20 07:30:10 2012 +0000
+++ b/sys/dev/usb/if_otusvar.h  Mon Aug 20 07:32:49 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_otusvar.h,v 1.2 2012/08/19 07:55:54 christos Exp $  */
+/*     $NetBSD: if_otusvar.h,v 1.3 2012/08/20 07:32:49 christos Exp $  */
 /*     $OpenBSD: if_otusreg.h,v 1.6 2009/04/06 18:17:01 damien Exp $   */
 
 /*-
@@ -53,10 +53,6 @@
 };
 #define EDCA_NUM_AC    4
 
-/* XXX: OpenBSD has more of these defined with the standard referenced */
-#define IEEE80211_QOS_ACK_POLICY_NOACK         0x0020
-#define IEEE80211_QOS_ACK_POLICY_MASK          0x0060
-
 static __inline int
 ieee80211_has_addr4(const struct ieee80211_frame *wh)
 {
diff -r c13c74fc81ee -r 1dba17a7bdae sys/dev/usb/if_run.c
--- a/sys/dev/usb/if_run.c      Mon Aug 20 07:30:10 2012 +0000
+++ b/sys/dev/usb/if_run.c      Mon Aug 20 07:32:49 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_run.c,v 1.3 2012/06/01 13:19:39 nonaka Exp $        */
+/*     $NetBSD: if_run.c,v 1.4 2012/08/20 07:32:49 christos Exp $      */
 /*     $OpenBSD: if_run.c,v 1.90 2012/03/24 15:11:04 jsg Exp $ */
 
 /*-
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.3 2012/06/01 13:19:39 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.4 2012/08/20 07:32:49 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/sockio.h>
@@ -2308,7 +2308,6 @@
 
        txwi->txop = RT2860_TX_TXOP_BACKOFF;
 
-#define IEEE80211_QOS_ACKPOLICY_NOACK  0x20
        if (!IEEE80211_IS_MULTICAST(wh->i_addr1) &&
            (!hasqos || (qos & IEEE80211_QOS_ACKPOLICY) !=
            IEEE80211_QOS_ACKPOLICY_NOACK)) {
diff -r c13c74fc81ee -r 1dba17a7bdae sys/dev/usb/if_urtwnvar.h
--- a/sys/dev/usb/if_urtwnvar.h Mon Aug 20 07:30:10 2012 +0000
+++ b/sys/dev/usb/if_urtwnvar.h Mon Aug 20 07:32:49 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_urtwnvar.h,v 1.1 2012/03/25 00:11:16 nonaka Exp $   */
+/*     $NetBSD: if_urtwnvar.h,v 1.2 2012/08/20 07:32:49 christos Exp $ */
 /*     $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $  */
 
 /*-
@@ -94,7 +94,6 @@
 };
 
 #if 1  /* XXX: sys/net80211/ieee80211.h */
-#define        IEEE80211_QOS_ACKPOLICY_BA      0x60    /* Block ACK */
 
 #define        IEEE80211_HTINFO_2NDCHAN        0x03    /* secondary/ext chan offset */
 #define        IEEE80211_HTINFO_2NDCHAN_S      0