diff options
| author | christos <christos@NetBSD.org> | 2013-03-30 03:21:43 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2013-03-30 03:21:43 +0000 |
| commit | d76a2f4cd2a5d528dac5c5d0eaf3f94ece815d07 (patch) | |
| tree | 232cee5adc17fd9a994b98a787100d3cfac76b0d /sys | |
| parent | d074ebd85c679e8fbe5f3abab94b804f419ad5ab (diff) | |
replace function with macro
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/if_iwn.c | 8 | ||||
| -rw-r--r-- | sys/dev/pci/if_wpi.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c index 780f79bc8d8..b964d7dc4db 100644 --- a/sys/dev/pci/if_iwn.c +++ b/sys/dev/pci/if_iwn.c @@ -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 *m, struct ieee80211_node *ni, int ac) 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 *m, struct ieee80211_node *ni, int ac) /* 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 --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c index 9203f8984de..15b00a0d818 100644 --- a/sys/dev/pci/if_wpi.c +++ b/sys/dev/pci/if_wpi.c @@ -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 mbuf *m0, struct ieee80211_node *ni, 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; } |
