[src/trunk]: src/sys/dev/pci replace function with macro

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

details:   https://anonhg.NetBSD.org/src/rev/ea2572453885
branches:  trunk
changeset: 785801:ea2572453885
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Mar 30 03:21:43 2013 +0000

description:
replace function with macro

diffstat:

 sys/dev/pci/if_iwn.c |  8 ++++----
 sys/dev/pci/if_wpi.c |  6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r e76e728248f5 -r ea2572453885 sys/dev/pci/if_iwn.c
--- a/sys/dev/pci/if_iwn.c      Sat Mar 30 03:21:02 2013 +0000
+++ b/sys/dev/pci/if_iwn.c      Sat Mar 30 03:21:43 2013 +0000
@@ -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 @@
        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 @@
 
        /* 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;
        }
diff -r e76e728248f5 -r ea2572453885 sys/dev/pci/if_wpi.c
--- a/sys/dev/pci/if_wpi.c      Sat Mar 30 03:21:02 2013 +0000
+++ b/sys/dev/pci/if_wpi.c      Sat Mar 30 03:21:43 2013 +0000
@@ -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 @@
 
        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;
        }