Module Name: src
Committed By: joerg
Date: Fri Sep 13 20:19:53 UTC 2013
Modified Files:
src/sys/net80211: files.net80211 ieee80211_crypto.c ieee80211_input.c
src/sys/rump/net/lib/libnet80211: Makefile
Log Message:
GC unused functions. Don't bother building ieee80211_acl.c, nothing in
it is non-static.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/net80211/files.net80211
cvs rdiff -u -r1.15 -r1.16 src/sys/net80211/ieee80211_crypto.c
cvs rdiff -u -r1.76 -r1.77 src/sys/net80211/ieee80211_input.c
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/net/lib/libnet80211/Makefile
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/files.net80211
diff -u src/sys/net80211/files.net80211:1.2 src/sys/net80211/files.net80211:1.3
--- src/sys/net80211/files.net80211:1.2 Tue Oct 31 21:53:41 2006
+++ src/sys/net80211/files.net80211 Fri Sep 13 20:19:53 2013
@@ -1,7 +1,6 @@
-# $NetBSD: files.net80211,v 1.2 2006/10/31 21:53:41 joerg Exp $
+# $NetBSD: files.net80211,v 1.3 2013/09/13 20:19:53 joerg Exp $
file net80211/ieee80211.c wlan
-file net80211/ieee80211_acl.c wlan
file net80211/ieee80211_amrr.c wlan
file net80211/ieee80211_crypto.c wlan
file net80211/ieee80211_crypto_ccmp.c wlan
Index: src/sys/net80211/ieee80211_crypto.c
diff -u src/sys/net80211/ieee80211_crypto.c:1.15 src/sys/net80211/ieee80211_crypto.c:1.16
--- src/sys/net80211/ieee80211_crypto.c:1.15 Mon May 23 15:37:36 2011
+++ src/sys/net80211/ieee80211_crypto.c Fri Sep 13 20:19:53 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_crypto.c,v 1.15 2011/05/23 15:37:36 drochner Exp $ */
+/* $NetBSD: ieee80211_crypto.c,v 1.16 2013/09/13 20:19:53 joerg Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,7 +36,7 @@
__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_crypto.c,v 1.12 2005/08/08 18:46:35 sam Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_crypto.c,v 1.15 2011/05/23 15:37:36 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_crypto.c,v 1.16 2013/09/13 20:19:53 joerg Exp $");
#endif
#include "opt_inet.h"
@@ -128,12 +128,6 @@ cipher_detach(struct ieee80211_key *key)
key->wk_cipher->ic_detach(key);
}
-static __inline void *
-cipher_attach(struct ieee80211com *ic, struct ieee80211_key *key)
-{
- return key->wk_cipher->ic_attach(ic, key);
-}
-
/*
* Wrappers for driver key management methods.
*/
Index: src/sys/net80211/ieee80211_input.c
diff -u src/sys/net80211/ieee80211_input.c:1.76 src/sys/net80211/ieee80211_input.c:1.77
--- src/sys/net80211/ieee80211_input.c:1.76 Sat Mar 30 19:03:02 2013
+++ src/sys/net80211/ieee80211_input.c Fri Sep 13 20:19:53 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_input.c,v 1.76 2013/03/30 19:03:02 christos Exp $ */
+/* $NetBSD: ieee80211_input.c,v 1.77 2013/09/13 20:19:53 joerg 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.76 2013/03/30 19:03:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_input.c,v 1.77 2013/09/13 20:19:53 joerg Exp $");
#endif
#include "opt_inet.h"
@@ -1378,12 +1378,6 @@ iswmeinfo(const u_int8_t *frm)
frm[6] == WME_INFO_OUI_SUBTYPE;
}
-static __inline int
-isatherosoui(const u_int8_t *frm)
-{
- return frm[1] > 3 && LE_READ_4(frm+2) == ((ATH_OUI_TYPE<<24)|ATH_OUI);
-}
-
/*
* Convert a WPA cipher selector OUI to an internal
* cipher algorithm. Where appropriate we also
Index: src/sys/rump/net/lib/libnet80211/Makefile
diff -u src/sys/rump/net/lib/libnet80211/Makefile:1.2 src/sys/rump/net/lib/libnet80211/Makefile:1.3
--- src/sys/rump/net/lib/libnet80211/Makefile:1.2 Tue Feb 16 20:42:47 2010
+++ src/sys/rump/net/lib/libnet80211/Makefile Fri Sep 13 20:19:53 2013
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2010/02/16 20:42:47 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2013/09/13 20:19:53 joerg Exp $
#
.PATH: ${.CURDIR}/../../../../net80211
LIB= rumpnet_net80211
-SRCS= ieee80211.c ieee80211_acl.c ieee80211_amrr.c ieee80211_crypto.c \
+SRCS= ieee80211.c ieee80211_amrr.c ieee80211_crypto.c \
ieee80211_crypto_ccmp.c ieee80211_crypto_none.c \
ieee80211_crypto_tkip.c ieee80211_crypto_wep.c ieee80211_input.c\
ieee80211_ioctl.c ieee80211_netbsd.c ieee80211_node.c \
