CVS commit: src/sys/dev/usb

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Sat Mar 30 03:17:34 UTC 2013

Modified Files:
        src/sys/dev/usb: if_run.c if_urtwn.c

Log Message:
replace macro with inline function


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/usb/if_run.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/usb/if_urtwn.c

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_run.c
diff -u src/sys/dev/usb/if_run.c:1.8 src/sys/dev/usb/if_run.c:1.9
--- src/sys/dev/usb/if_run.c:1.8	Tue Jan 22 07:40:42 2013
+++ src/sys/dev/usb/if_run.c	Fri Mar 29 23:17:33 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_run.c,v 1.8 2013/01/22 12:40:42 jmcneill Exp $	*/
+/*	$NetBSD: if_run.c,v 1.9 2013/03/30 03:17:33 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.8 2013/01/22 12:40:42 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.9 2013/03/30 03:17:33 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/sockio.h>
@@ -2251,7 +2251,7 @@ run_tx(struct run_softc *sc, struct mbuf
 #endif
 	type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK;
 
-	if ((hasqos = IEEE80211_QOS_HAS_SEQ(wh))) {
+	if ((hasqos = ieee80211_has_qos(wh))) {
 		qos = ((struct ieee80211_qosframe *)wh)->i_qos[0];
 		tid = qos & IEEE80211_QOS_TID;
 		qid = TID_TO_WME_AC(tid);

Index: src/sys/dev/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.22 src/sys/dev/usb/if_urtwn.c:1.23
--- src/sys/dev/usb/if_urtwn.c:1.22	Tue Mar 12 10:19:34 2013
+++ src/sys/dev/usb/if_urtwn.c	Fri Mar 29 23:17:33 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_urtwn.c,v 1.22 2013/03/12 14:19:34 christos Exp $	*/
+/*	$NetBSD: if_urtwn.c,v 1.23 2013/03/30 03:17:33 christos Exp $	*/
 /*	$OpenBSD: if_urtwn.c,v 1.20 2011/11/26 06:39:33 ckuethe Exp $	*/
 
 /*-
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.22 2013/03/12 14:19:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.23 2013/03/30 03:17:33 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -2197,7 +2197,7 @@ urtwn_tx(struct urtwn_softc *sc, struct 
 		bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m);
 	}
 
-	if ((hasqos = IEEE80211_QOS_HAS_SEQ(wh))) {
+	if ((hasqos = ieee80211_has_qos(wh))) {
 		/* data frames in 11n mode */
 		struct ieee80211_qosframe *qwh = (void *)wh;
 		tid = qwh->i_qos[0] & IEEE80211_QOS_TID;