summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2018-09-11 10:23:41 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2018-09-11 10:23:41 +0000
commit7a22397806b0a36170bb0e7eb91fffa33648998c (patch)
treea6f0392fa4f878403ad768cd39452a5b8e3734b3 /sys
parentfa62ae282b08a84c327a8106b5acd04709ce2fdf (diff)
Nuke some trailing spaces that wandered into the
crosshairs.
Diffstat (limited to 'sys')
-rw-r--r--sys/net/if.c4
-rw-r--r--sys/net80211/ieee80211_proto.c16
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/net/if.c b/sys/net/if.c
index 0e0c767cc3b..78d7d3f3af6 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if.c,v 1.563 2018/09/10 16:18:34 sashan Exp $ */
+/* $OpenBSD: if.c,v 1.564 2018/09/11 10:23:40 krw Exp $ */
/* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */
/*
@@ -689,7 +689,7 @@ if_enqueue(struct ifnet *ifp, struct mbuf *m)
#if NPF > 0
if (m->m_pkthdr.pf.delay > 0)
return (pf_delay_pkt(m, ifp->if_index));
-#endif
+#endif
#if NBRIDGE > 0
if (ifp->if_bridgeport && (m->m_flags & M_PROTO1) == 0) {
diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c
index c1832f7f60b..c6bea58320d 100644
--- a/sys/net80211/ieee80211_proto.c
+++ b/sys/net80211/ieee80211_proto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_proto.c,v 1.89 2018/08/13 15:19:52 stsp Exp $ */
+/* $OpenBSD: ieee80211_proto.c,v 1.90 2018/09/11 10:23:40 krw Exp $ */
/* $NetBSD: ieee80211_proto.c,v 1.8 2004/04/30 23:58:20 dyoung Exp $ */
/*-
@@ -542,7 +542,7 @@ ieee80211_ht_negotiate(struct ieee80211com *ic, struct ieee80211_node *ni)
{
int i;
- ni->ni_flags &= ~IEEE80211_NODE_HT;
+ ni->ni_flags &= ~IEEE80211_NODE_HT;
/* Check if we support HT. */
if ((ic->ic_modecaps & (1 << IEEE80211_MODE_11N)) == 0)
@@ -552,7 +552,7 @@ ieee80211_ht_negotiate(struct ieee80211com *ic, struct ieee80211_node *ni)
if ((ic->ic_flags & IEEE80211_F_HTON) == 0)
return;
- /*
+ /*
* Check if the peer supports HT.
* Require at least one of the mandatory MCS.
* MCS 0-7 are mandatory but some APs have particular MCS disabled.
@@ -573,7 +573,7 @@ ieee80211_ht_negotiate(struct ieee80211com *ic, struct ieee80211_node *ni)
}
}
- /*
+ /*
* Don't allow group cipher (includes WEP) or TKIP
* for pairwise encryption (see 802.11-2012 11.1.6).
*/
@@ -588,7 +588,7 @@ ieee80211_ht_negotiate(struct ieee80211com *ic, struct ieee80211_node *ni)
return;
}
- ni->ni_flags |= IEEE80211_NODE_HT;
+ ni->ni_flags |= IEEE80211_NODE_HT;
}
void
@@ -748,7 +748,7 @@ ieee80211_try_another_bss(struct ieee80211com *ic)
/* Try a different AP from the same ESS if available. */
if (ic->ic_caps & IEEE80211_C_SCANALLBAND) {
- /*
+ /*
* Make sure we will consider APs on all bands during
* access point selection in ieee80211_node_choose_bss().
* During multi-band scans, our previous AP may be trying
@@ -825,7 +825,7 @@ ieee80211_auth_open(struct ieee80211com *ic, const struct ieee80211_frame *wh,
ni->ni_chan = ic->ic_bss->ni_chan;
}
- /*
+ /*
* Drivers may want to set up state before confirming.
* In which case this returns EBUSY and the driver will
* later call ieee80211_auth_open_confirm() by itself.
@@ -880,7 +880,7 @@ ieee80211_set_beacon_miss_threshold(struct ieee80211com *ic)
{
struct ifnet *ifp = &ic->ic_if;
- /*
+ /*
* Scale the missed beacon counter threshold to the AP's actual
* beacon interval. Give the AP at least 700 ms to time out and
* round up to ensure that at least one beacon may be missed.