Module Name: src
Committed By: christos
Date: Sat Mar 30 15:12:28 UTC 2013
Modified Files:
src/sys/net80211: ieee80211_crypto_ccmp.c ieee80211_input.c
ieee80211_proto.h
Log Message:
remove trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/net80211/ieee80211_crypto_ccmp.c
cvs rdiff -u -r1.74 -r1.75 src/sys/net80211/ieee80211_input.c
cvs rdiff -u -r1.21 -r1.22 src/sys/net80211/ieee80211_proto.h
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.9 src/sys/net80211/ieee80211_crypto_ccmp.c:1.10
--- src/sys/net80211/ieee80211_crypto_ccmp.c:1.9 Fri Mar 29 23:24:55 2013
+++ src/sys/net80211/ieee80211_crypto_ccmp.c Sat Mar 30 11:12:28 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.9 2013/03/30 03:24:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_crypto_ccmp.c,v 1.10 2013/03/30 15:12:28 christos Exp $");
#endif
/*
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: ieee80211_cr
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/mbuf.h>
+#include <sys/mbuf.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
@@ -303,7 +303,7 @@ ccmp_init_blocks(rijndael_ctx *ctx, stru
{
#define IS_4ADDRESS(wh) \
((wh->i_fc[1] & IEEE80211_FC1_DIR_MASK) == IEEE80211_FC1_DIR_DSTODS)
-#define IS_QOS_DATA(wh) IEEE80211_QOS_HAS_SEQ(wh)
+#define IS_QOS_DATA(wh) ieee80211_has_qos(wh)
/* CCM Initial Block:
* Flag (Include authentication header, M=3 (8-octet MIC),
Index: src/sys/net80211/ieee80211_input.c
diff -u src/sys/net80211/ieee80211_input.c:1.74 src/sys/net80211/ieee80211_input.c:1.75
--- src/sys/net80211/ieee80211_input.c:1.74 Fri Mar 29 23:24:55 2013
+++ src/sys/net80211/ieee80211_input.c Sat Mar 30 11:12:28 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_input.c,v 1.74 2013/03/30 03:24:55 christos Exp $ */
+/* $NetBSD: ieee80211_input.c,v 1.75 2013/03/30 15:12:28 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.74 2013/03/30 03:24:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_input.c,v 1.75 2013/03/30 15:12:28 christos Exp $");
#endif
#include "opt_inet.h"
@@ -46,7 +46,7 @@ __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>
@@ -282,7 +282,7 @@ ieee80211_input(struct ieee80211com *ic,
ni->ni_rstamp = rstamp;
if (HAS_SEQ(type)) {
u_int8_t tid;
- if (IEEE80211_QOS_HAS_SEQ(wh)) {
+ if (ieee80211_has_qos(wh)) {
tid = ((struct ieee80211_qosframe *)wh)->
i_qos[0] & IEEE80211_QOS_TID;
if (TID_TO_WME_AC(tid) >= WME_AC_VI)
@@ -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] ) | \
Index: src/sys/net80211/ieee80211_proto.h
diff -u src/sys/net80211/ieee80211_proto.h:1.21 src/sys/net80211/ieee80211_proto.h:1.22
--- src/sys/net80211/ieee80211_proto.h:1.21 Fri Mar 29 21:06:37 2013
+++ src/sys/net80211/ieee80211_proto.h Sat Mar 30 11:12:28 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_proto.h,v 1.21 2013/03/30 01:06:37 christos Exp $ */
+/* $NetBSD: ieee80211_proto.h,v 1.22 2013/03/30 15:12:28 christos Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -106,7 +106,7 @@ ieee80211_hdrsize(const void *data)
("%s: control frame", __func__));
if ((wh->i_fc[1] & IEEE80211_FC1_DIR_MASK) == IEEE80211_FC1_DIR_DSTODS)
size += IEEE80211_ADDR_LEN;
- if (IEEE80211_QOS_HAS_SEQ(wh))
+ if (ieee80211_has_qos(wh))
size += sizeof(u_int16_t);
return size;
}
