summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorStefan Sperling <stsp@cvs.openbsd.org>2016-09-22 08:27:57 +0000
committerStefan Sperling <stsp@cvs.openbsd.org>2016-09-22 08:27:57 +0000
commit6b1f5e8c6d9c1fd6f57723123999656439141d19 (patch)
tree6c82ead966a765a679eb69eacaa66144d7e792df /sys
parentf986313a171dbc7e92effbdd1b43b9e430e68cff (diff)
Simplify assignment of sgi_ok variable in iwm_setrates(). No functional change.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/if_iwm.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c
index 11352012643..2480762ad24 100644
--- a/sys/dev/pci/if_iwm.c
+++ b/sys/dev/pci/if_iwm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_iwm.c,v 1.139 2016/09/21 14:02:33 stsp Exp $ */
+/* $OpenBSD: if_iwm.c,v 1.140 2016/09/22 08:27:56 stsp Exp $ */
/*
* Copyright (c) 2014, 2016 genua gmbh <info@genua.de>
@@ -5303,10 +5303,8 @@ iwm_setrates(struct iwm_node *in)
memset(lq, 0, sizeof(*lq));
lq->sta_id = IWM_STATION_ID;
- if (ni->ni_flags & IEEE80211_NODE_HT)
- sgi_ok = (ni->ni_htcaps & IEEE80211_HTCAP_SGI20);
- else
- sgi_ok = 0;
+ sgi_ok = ((ni->ni_flags & IEEE80211_NODE_HT) &&
+ (ni->ni_htcaps & IEEE80211_HTCAP_SGI20));
/*
* Fill the LQ rate selection table with legacy and/or HT rates