Module Name: src
Committed By: christos
Date: Mon Aug 20 07:32:49 UTC 2012
Modified Files:
src/sys/dev/usb: if_otus.c if_otusvar.h if_run.c if_urtwnvar.h
Log Message:
remove duplicated QoS definitions
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/usb/if_otus.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/usb/if_otusvar.h
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/usb/if_run.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/usb/if_urtwnvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_otus.c
diff -u src/sys/dev/usb/if_otus.c:1.11 src/sys/dev/usb/if_otus.c:1.12
--- src/sys/dev/usb/if_otus.c:1.11 Sun Aug 19 03:55:54 2012
+++ src/sys/dev/usb/if_otus.c Mon Aug 20 03:32:49 2012
@@ -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 @@ otus_tx(struct otus_softc *sc, struct mb
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)) {
Index: src/sys/dev/usb/if_otusvar.h
diff -u src/sys/dev/usb/if_otusvar.h:1.2 src/sys/dev/usb/if_otusvar.h:1.3
--- src/sys/dev/usb/if_otusvar.h:1.2 Sun Aug 19 03:55:54 2012
+++ src/sys/dev/usb/if_otusvar.h Mon Aug 20 03:32:49 2012
@@ -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 @@ enum ieee80211_edca_ac {
};
#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)
{
Index: src/sys/dev/usb/if_run.c
diff -u src/sys/dev/usb/if_run.c:1.3 src/sys/dev/usb/if_run.c:1.4
--- src/sys/dev/usb/if_run.c:1.3 Fri Jun 1 09:19:39 2012
+++ src/sys/dev/usb/if_run.c Mon Aug 20 03:32:49 2012
@@ -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 @@ run_tx(struct run_softc *sc, struct mbuf
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)) {
Index: src/sys/dev/usb/if_urtwnvar.h
diff -u src/sys/dev/usb/if_urtwnvar.h:1.1 src/sys/dev/usb/if_urtwnvar.h:1.2
--- src/sys/dev/usb/if_urtwnvar.h:1.1 Sat Mar 24 20:11:16 2012
+++ src/sys/dev/usb/if_urtwnvar.h Mon Aug 20 03:32:49 2012
@@ -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 @@ struct urtwn_host_cmd_ring {
};
#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
