summaryrefslogtreecommitdiff
path: root/sys/net80211
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2014-11-18 02:37:32 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2014-11-18 02:37:32 +0000
commit9bd6b7ef7200376e760a05281171c9f8e23f80ab (patch)
tree27251bbc9c3dbbc43744ce06dbbae62846a166d2 /sys/net80211
parentf4c8f66da2946c9a6e025a16d60740b159b20bab (diff)
move arc4random prototype to systm.h. more appropriate for most code
to include that than rdnvar.h. ok deraadt dlg
Diffstat (limited to 'sys/net80211')
-rw-r--r--sys/net80211/ieee80211_crypto.c3
-rw-r--r--sys/net80211/ieee80211_crypto_wep.c3
-rw-r--r--sys/net80211/ieee80211_node.c4
-rw-r--r--sys/net80211/ieee80211_pae_input.c4
-rw-r--r--sys/net80211/ieee80211_proto.c4
5 files changed, 5 insertions, 13 deletions
diff --git a/sys/net80211/ieee80211_crypto.c b/sys/net80211/ieee80211_crypto.c
index 0f59b34521a..3ea269c68a4 100644
--- a/sys/net80211/ieee80211_crypto.c
+++ b/sys/net80211/ieee80211_crypto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_crypto.c,v 1.63 2014/09/14 14:17:26 jsg Exp $ */
+/* $OpenBSD: ieee80211_crypto.c,v 1.64 2014/11/18 02:37:31 tedu Exp $ */
/*-
* Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -40,7 +40,6 @@
#include <net80211/ieee80211_var.h>
#include <net80211/ieee80211_priv.h>
-#include <dev/rndvar.h>
#include <crypto/arc4.h>
#include <crypto/md5.h>
#include <crypto/sha1.h>
diff --git a/sys/net80211/ieee80211_crypto_wep.c b/sys/net80211/ieee80211_crypto_wep.c
index 8ba9e93c319..4b3752db24c 100644
--- a/sys/net80211/ieee80211_crypto_wep.c
+++ b/sys/net80211/ieee80211_crypto_wep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_crypto_wep.c,v 1.10 2014/07/12 18:44:22 tedu Exp $ */
+/* $OpenBSD: ieee80211_crypto_wep.c,v 1.11 2014/11/18 02:37:31 tedu Exp $ */
/*-
* Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -42,7 +42,6 @@
#include <net80211/ieee80211_var.h>
#include <net80211/ieee80211_crypto.h>
-#include <dev/rndvar.h>
#include <crypto/arc4.h>
/* WEP software crypto context */
diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c
index c864b1c2e76..8cebd85f895 100644
--- a/sys/net80211/ieee80211_node.c
+++ b/sys/net80211/ieee80211_node.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_node.c,v 1.84 2014/09/14 14:17:26 jsg Exp $ */
+/* $OpenBSD: ieee80211_node.c,v 1.85 2014/11/18 02:37:31 tedu Exp $ */
/* $NetBSD: ieee80211_node.c,v 1.14 2004/05/09 09:18:47 dyoung Exp $ */
/*-
@@ -66,8 +66,6 @@
#include <net80211/ieee80211_var.h>
#include <net80211/ieee80211_priv.h>
-#include <dev/rndvar.h>
-
struct ieee80211_node *ieee80211_node_alloc(struct ieee80211com *);
void ieee80211_node_free(struct ieee80211com *, struct ieee80211_node *);
void ieee80211_node_copy(struct ieee80211com *, struct ieee80211_node *,
diff --git a/sys/net80211/ieee80211_pae_input.c b/sys/net80211/ieee80211_pae_input.c
index dc70f580ba0..417bd447986 100644
--- a/sys/net80211/ieee80211_pae_input.c
+++ b/sys/net80211/ieee80211_pae_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_pae_input.c,v 1.21 2014/09/14 14:17:26 jsg Exp $ */
+/* $OpenBSD: ieee80211_pae_input.c,v 1.22 2014/11/18 02:37:31 tedu Exp $ */
/*-
* Copyright (c) 2007,2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -43,8 +43,6 @@
#include <net80211/ieee80211_var.h>
#include <net80211/ieee80211_priv.h>
-#include <dev/rndvar.h>
-
void ieee80211_recv_4way_msg1(struct ieee80211com *,
struct ieee80211_eapol_key *, struct ieee80211_node *);
#ifndef IEEE80211_STA_ONLY
diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c
index ada4584a455..4c8c7f7f48f 100644
--- a/sys/net80211/ieee80211_proto.c
+++ b/sys/net80211/ieee80211_proto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_proto.c,v 1.48 2014/09/14 14:17:26 jsg Exp $ */
+/* $OpenBSD: ieee80211_proto.c,v 1.49 2014/11/18 02:37:31 tedu Exp $ */
/* $NetBSD: ieee80211_proto.c,v 1.8 2004/04/30 23:58:20 dyoung Exp $ */
/*-
@@ -64,8 +64,6 @@
#include <net80211/ieee80211_var.h>
#include <net80211/ieee80211_priv.h>
-#include <dev/rndvar.h>
-
const char * const ieee80211_mgt_subtype_name[] = {
"assoc_req", "assoc_resp", "reassoc_req", "reassoc_resp",
"probe_req", "probe_resp", "reserved#6", "reserved#7",