CVS commit: src/sys/dev/pci

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Sat Mar 30 03:21:43 UTC 2013

Modified Files:
        src/sys/dev/pci: if_iwn.c if_wpi.c

Log Message:
replace function with macro


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/pci/if_iwn.c
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/pci/if_wpi.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/pci/if_iwn.c
diff -u src/sys/dev/pci/if_iwn.c:1.63 src/sys/dev/pci/if_iwn.c:1.64
--- src/sys/dev/pci/if_iwn.c:1.63	Fri Mar 29 23:21:05 2013
+++ src/sys/dev/pci/if_iwn.c	Fri Mar 29 23:21:43 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_iwn.c,v 1.63 2013/03/30 03:21:05 christos Exp $	*/
+/*	$NetBSD: if_iwn.c,v 1.64 2013/03/30 03:21:43 christos Exp $	*/
 /*	$OpenBSD: if_iwn.c,v 1.96 2010/05/13 09:25:03 damien Exp $	*/
 
 /*-
@@ -22,7 +22,7 @@
  * adapters.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.63 2013/03/30 03:21:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.64 2013/03/30 03:21:43 christos Exp $");
 
 #define IWN_USE_RBUF	/* Use local storage for RX */
 #undef IWN_HWCRYPTO	/* XXX does not even compile yet */
@@ -2726,7 +2726,7 @@ iwn_tx(struct iwn_softc *sc, struct mbuf
 	hdrlen = ieee80211_anyhdrsize(wh);
 	type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK;
 
-	hdrlen2 = (IEEE80211_QOS_HAS_SEQ(wh)) ?
+	hdrlen2 = (ieee80211_has_qos(wh)) ?
 	    sizeof (struct ieee80211_qosframe) :
 	    sizeof (struct ieee80211_frame);
 
@@ -2736,7 +2736,7 @@ iwn_tx(struct iwn_softc *sc, struct mbuf
 
 	/* XXX OpenBSD sets a different tid when using QOS */
 	tid = 0;
-	if (IEEE80211_QOS_HAS_SEQ(wh)) {
+	if (ieee80211_has_qos(wh)) {
 		cap = &ic->ic_wme.wme_chanParams;
 		noack = cap->cap_wmeParams[ac].wmep_noackPolicy;
 	}

Index: src/sys/dev/pci/if_wpi.c
diff -u src/sys/dev/pci/if_wpi.c:1.55 src/sys/dev/pci/if_wpi.c:1.56
--- src/sys/dev/pci/if_wpi.c:1.55	Fri Mar 29 23:21:08 2013
+++ src/sys/dev/pci/if_wpi.c	Fri Mar 29 23:21:43 2013
@@ -1,4 +1,4 @@
-/*  $NetBSD: if_wpi.c,v 1.55 2013/03/30 03:21:08 christos Exp $    */
+/*  $NetBSD: if_wpi.c,v 1.56 2013/03/30 03:21:43 christos Exp $    */
 
 /*-
  * Copyright (c) 2006, 2007
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.55 2013/03/30 03:21:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.56 2013/03/30 03:21:43 christos Exp $");
 
 /*
  * Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
@@ -1833,7 +1833,7 @@ wpi_tx_data(struct wpi_softc *sc, struct
 
 	wh = mtod(m0, struct ieee80211_frame *);
 
-	if (IEEE80211_QOS_HAS_SEQ(wh)) {
+	if (ieee80211_has_qos(wh)) {
 		cap = &ic->ic_wme.wme_chanParams;
 		noack = cap->cap_wmeParams[ac].wmep_noackPolicy;
 	}