diff options
| -rw-r--r-- | sys/dev/ic/rt2860.c | 5 | ||||
| -rw-r--r-- | sys/dev/pci/if_iwn.c | 5 | ||||
| -rw-r--r-- | sys/dev/pci/if_wpi.c | 5 | ||||
| -rw-r--r-- | sys/dev/usb/if_run.c | 5 |
4 files changed, 8 insertions, 12 deletions
diff --git a/sys/dev/ic/rt2860.c b/sys/dev/ic/rt2860.c index 56b1c9642b6..9ab4a655e34 100644 --- a/sys/dev/ic/rt2860.c +++ b/sys/dev/ic/rt2860.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rt2860.c,v 1.31 2008/12/29 13:59:00 damien Exp $ */ +/* $OpenBSD: rt2860.c,v 1.32 2009/01/26 19:18:52 damien Exp $ */ /*- * Copyright (c) 2007, 2008 @@ -1440,8 +1440,7 @@ rt2860_tx(struct rt2860_softc *sc, struct mbuf *m, struct ieee80211_node *ni) txwi->txop = RT2860_TX_TXOP_BACKOFF; if (!IEEE80211_IS_MULTICAST(wh->i_addr1) && - (!hasqos || (qos & IEEE80211_QOS_ACK_POLICY_MASK) >> - IEEE80211_QOS_ACK_POLICY_SHIFT != + (!hasqos || (qos & IEEE80211_QOS_ACK_POLICY_MASK) != IEEE80211_QOS_ACK_POLICY_NOACK)) { txwi->xflags |= RT2860_TX_ACK; diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c index 23074007fea..6ab337672e4 100644 --- a/sys/dev/pci/if_iwn.c +++ b/sys/dev/pci/if_iwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwn.c,v 1.45 2008/12/22 18:20:47 damien Exp $ */ +/* $OpenBSD: if_iwn.c,v 1.46 2009/01/26 19:18:52 damien Exp $ */ /*- * Copyright (c) 2007, 2008 @@ -2457,8 +2457,7 @@ iwn_tx(struct iwn_softc *sc, struct mbuf *m, struct ieee80211_node *ni) flags = 0; if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) { /* Unicast frame, check if an ACK is expected. */ - if (!hasqos || (qos & IEEE80211_QOS_ACK_POLICY_MASK) >> - IEEE80211_QOS_ACK_POLICY_SHIFT != + if (!hasqos || (qos & IEEE80211_QOS_ACK_POLICY_MASK) != IEEE80211_QOS_ACK_POLICY_NOACK) flags |= IWN_TX_NEED_ACK; } diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c index 5e0f5ad7963..bf4a7fe9c75 100644 --- a/sys/dev/pci/if_wpi.c +++ b/sys/dev/pci/if_wpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wpi.c,v 1.81 2009/01/03 10:11:55 damien Exp $ */ +/* $OpenBSD: if_wpi.c,v 1.82 2009/01/26 19:18:52 damien Exp $ */ /*- * Copyright (c) 2006-2008 @@ -1779,8 +1779,7 @@ wpi_tx(struct wpi_softc *sc, struct mbuf *m, struct ieee80211_node *ni) flags = 0; if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) { /* Unicast frame, check if an ACK is expected. */ - if (!hasqos || (qos & IEEE80211_QOS_ACK_POLICY_MASK) >> - IEEE80211_QOS_ACK_POLICY_SHIFT != + if (!hasqos || (qos & IEEE80211_QOS_ACK_POLICY_MASK) != IEEE80211_QOS_ACK_POLICY_NOACK) flags |= WPI_TX_NEED_ACK; } diff --git a/sys/dev/usb/if_run.c b/sys/dev/usb/if_run.c index d13bc3764e3..5e37db62208 100644 --- a/sys/dev/usb/if_run.c +++ b/sys/dev/usb/if_run.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_run.c,v 1.5 2009/01/07 11:12:27 jsg Exp $ */ +/* $OpenBSD: if_run.c,v 1.6 2009/01/26 19:18:52 damien Exp $ */ /*- * Copyright (c) 2008,2009 Damien Bergamini <damien.bergamini@free.fr> @@ -1990,8 +1990,7 @@ run_tx(struct run_softc *sc, struct mbuf *m, struct ieee80211_node *ni) txwi->txop = RT2860_TX_TXOP_BACKOFF; if (!IEEE80211_IS_MULTICAST(wh->i_addr1) && - (!hasqos || (qos & IEEE80211_QOS_ACK_POLICY_MASK) >> - IEEE80211_QOS_ACK_POLICY_SHIFT != + (!hasqos || (qos & IEEE80211_QOS_ACK_POLICY_MASK) != IEEE80211_QOS_ACK_POLICY_NOACK)) { txwi->xflags |= RT2860_TX_ACK; if (ic->ic_flags & IEEE80211_F_SHPREAMBLE) |