Module Name: src
Committed By: christos
Date: Sat Mar 30 03:24:55 UTC 2013
Modified Files:
src/sys/net80211: ieee80211_crypto_ccmp.c ieee80211_input.c
Log Message:
remove trailing space
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/net80211/ieee80211_crypto_ccmp.c
cvs rdiff -u -r1.73 -r1.74 src/sys/net80211/ieee80211_input.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net80211/ieee80211_crypto_ccmp.c
diff -u src/sys/net80211/ieee80211_crypto_ccmp.c:1.8 src/sys/net80211/ieee80211_crypto_ccmp.c:1.9
--- src/sys/net80211/ieee80211_crypto_ccmp.c:1.8 Wed Dec 17 15:51:37 2008
+++ src/sys/net80211/ieee80211_crypto_ccmp.c Fri Mar 29 23:24:55 2013
@@ -34,7 +34,7 @@
__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_crypto_ccmp.c,v 1.7 2005/07/11 03:06:23 sam Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_crypto_ccmp.c,v 1.8 2008/12/17 20:51:37 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_crypto_ccmp.c,v 1.9 2013/03/30 03:24:55 christos Exp $");
#endif
/*
@@ -45,8 +45,8 @@ __KERNEL_RCSID(0, "$NetBSD: ieee80211_cr
* it's license is included below.
*/
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
Index: src/sys/net80211/ieee80211_input.c
diff -u src/sys/net80211/ieee80211_input.c:1.73 src/sys/net80211/ieee80211_input.c:1.74
--- src/sys/net80211/ieee80211_input.c:1.73 Thu Jan 10 12:40:10 2013
+++ src/sys/net80211/ieee80211_input.c Fri Mar 29 23:24:55 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_input.c,v 1.73 2013/01/10 17:40:10 christos Exp $ */
+/* $NetBSD: ieee80211_input.c,v 1.74 2013/03/30 03:24:55 christos Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,7 +36,7 @@
__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.81 2005/08/10 16:22:29 sam Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_input.c,v 1.73 2013/01/10 17:40:10 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_input.c,v 1.74 2013/03/30 03:24:55 christos Exp $");
#endif
#include "opt_inet.h"
@@ -46,11 +46,11 @@ __KERNEL_RCSID(0, "$NetBSD: ieee80211_in
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/mbuf.h>
+#include <sys/mbuf.h>
#include <sys/malloc.h>
#include <sys/endian.h>
#include <sys/kernel.h>
-
+
#include <sys/socket.h>
#include <sys/sockio.h>
#include <sys/endian.h>
@@ -70,7 +70,7 @@ __KERNEL_RCSID(0, "$NetBSD: ieee80211_in
#include <net/bpf.h>
#ifdef INET
-#include <netinet/in.h>
+#include <netinet/in.h>
#include <net/if_ether.h>
#endif
@@ -919,7 +919,7 @@ ieee80211_auth_open(struct ieee80211com
ic->ic_stats.is_rx_bad_auth++; /* XXX */
if (ic->ic_opmode == IEEE80211_M_HOSTAP) {
/* XXX hack to workaround calling convention */
- ieee80211_send_error(ic, ni, wh->i_addr2,
+ ieee80211_send_error(ic, ni, wh->i_addr2,
IEEE80211_FC0_SUBTYPE_AUTH,
(seq + 1) | (IEEE80211_STATUS_ALG<<16));
}
@@ -1340,7 +1340,7 @@ ieee80211_ssid_mismatch(struct ieee80211
} while (0)
#endif /* !IEEE80211_DEBUG */
-/* unalligned little endian access */
+/* unalligned little endian access */
#define LE_READ_2(p) \
((u_int16_t) \
((((const u_int8_t *)(p))[0] ) | \
@@ -1618,7 +1618,7 @@ ieee80211_parse_rsn(struct ieee80211com
int n;
/*
- * Check the length once for fixed parts:
+ * Check the length once for fixed parts:
* version, mcast cipher, and 2 selector counts.
* Other, variable-length data, must be checked separately.
*/
@@ -1686,7 +1686,7 @@ ieee80211_parse_rsn(struct ieee80211com
n = LE_READ_2(frm);
frm += 2, len -= 2;
if (len < n*4) {
- IEEE80211_DISCARD_IE(ic,
+ IEEE80211_DISCARD_IE(ic,
IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA,
wh, "RSN", "key mgmt alg data too short; len %u, n %u",
len, n);
@@ -1861,7 +1861,7 @@ ieee80211_recv_mgmt(struct ieee80211com
* updates such as 802.11g slot time), or
* o adhoc mode (to discover neighbors)
* Frames otherwise received are discarded.
- */
+ */
if (!((ic->ic_flags & IEEE80211_F_SCAN) ||
(ic->ic_opmode == IEEE80211_M_STA && ni->ni_associd) ||
ic->ic_opmode == IEEE80211_M_IBSS)) {
@@ -2249,7 +2249,7 @@ ieee80211_recv_mgmt(struct ieee80211com
}
#endif /* !IEEE80211_NO_HOSTAP */
return;
- }
+ }
break;
}
@@ -2348,7 +2348,7 @@ ieee80211_recv_mgmt(struct ieee80211com
ieee80211_node_leave(ic, ni);
/* XXX distinguish WPA/RSN? */
ic->ic_stats.is_rx_assoc_badwpaie++;
- return;
+ return;
}
if (wpa != NULL) {
/*
@@ -2723,7 +2723,7 @@ ieee80211_node_pwrsave(struct ieee80211_
IEEE80211_NODE_SAVEQ_DEQUEUE(ni, m, qlen);
if (m == NULL)
break;
- /*
+ /*
* If this is the last packet, turn off the TIM bit.
* If there are more packets, set the more packets bit
* in the mbuf so ieee80211_encap will mark the 802.11
@@ -2786,7 +2786,7 @@ ieee80211_recv_pspoll(struct ieee80211co
ic->ic_set_tim(ni, 0); /* just in case */
return;
}
- /*
+ /*
* If there are more packets, set the more packets bit
* in the packet dispatched to the station; otherwise
* turn off the TIM bit.
