summaryrefslogtreecommitdiff
path: root/sys/net80211
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2015-11-24 13:45:08 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2015-11-24 13:45:08 +0000
commitf83b0dac3652830f33e53ab2d11a9d0945cb4a86 (patch)
treecab30afb1f72b5c2b352cf80fec675f53d330d4b /sys/net80211
parent37a6daf2960b4307d7f92853384985b2f9725837 (diff)
No need to include <net/if_arp.h>
This header is only needed because <netinet/if_ether.h> declares a structure that needs it. But it turns out that <net/if.h> already includes it as workaround. A proper solution would be to stop declarting "struct ether_arp" there. But no driver should need this header.
Diffstat (limited to 'sys/net80211')
-rw-r--r--sys/net80211/ieee80211_crypto.c3
-rw-r--r--sys/net80211/ieee80211_crypto_bip.c3
-rw-r--r--sys/net80211/ieee80211_crypto_ccmp.c3
-rw-r--r--sys/net80211/ieee80211_crypto_tkip.c3
-rw-r--r--sys/net80211/ieee80211_crypto_wep.c3
-rw-r--r--sys/net80211/ieee80211_node.c3
-rw-r--r--sys/net80211/ieee80211_pae_output.c3
-rw-r--r--sys/net80211/ieee80211_proto.c3
-rw-r--r--sys/net80211/ieee80211_regdomain.c3
9 files changed, 9 insertions, 18 deletions
diff --git a/sys/net80211/ieee80211_crypto.c b/sys/net80211/ieee80211_crypto.c
index 8c03087e5fa..33d33a008ba 100644
--- a/sys/net80211/ieee80211_crypto.c
+++ b/sys/net80211/ieee80211_crypto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_crypto.c,v 1.65 2014/12/23 03:24:08 tedu Exp $ */
+/* $OpenBSD: ieee80211_crypto.c,v 1.66 2015/11/24 13:45:06 mpi Exp $ */
/*-
* Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -30,7 +30,6 @@
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_media.h>
-#include <net/if_arp.h>
#include <netinet/in.h>
#include <netinet/if_ether.h>
diff --git a/sys/net80211/ieee80211_crypto_bip.c b/sys/net80211/ieee80211_crypto_bip.c
index 03fe214de4d..6ab5fb676bf 100644
--- a/sys/net80211/ieee80211_crypto_bip.c
+++ b/sys/net80211/ieee80211_crypto_bip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_crypto_bip.c,v 1.6 2014/12/23 03:24:08 tedu Exp $ */
+/* $OpenBSD: ieee80211_crypto_bip.c,v 1.7 2015/11/24 13:45:06 mpi Exp $ */
/*-
* Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -32,7 +32,6 @@
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_media.h>
-#include <net/if_arp.h>
#include <netinet/in.h>
#include <netinet/if_ether.h>
diff --git a/sys/net80211/ieee80211_crypto_ccmp.c b/sys/net80211/ieee80211_crypto_ccmp.c
index 92c6a63935a..7a0ccb53337 100644
--- a/sys/net80211/ieee80211_crypto_ccmp.c
+++ b/sys/net80211/ieee80211_crypto_ccmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_crypto_ccmp.c,v 1.17 2015/11/15 01:43:21 stsp Exp $ */
+/* $OpenBSD: ieee80211_crypto_ccmp.c,v 1.18 2015/11/24 13:45:06 mpi Exp $ */
/*-
* Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -32,7 +32,6 @@
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_media.h>
-#include <net/if_arp.h>
#include <netinet/in.h>
#include <netinet/if_ether.h>
diff --git a/sys/net80211/ieee80211_crypto_tkip.c b/sys/net80211/ieee80211_crypto_tkip.c
index 33fb71f88e2..20b84f15821 100644
--- a/sys/net80211/ieee80211_crypto_tkip.c
+++ b/sys/net80211/ieee80211_crypto_tkip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_crypto_tkip.c,v 1.24 2015/07/15 22:16:42 deraadt Exp $ */
+/* $OpenBSD: ieee80211_crypto_tkip.c,v 1.25 2015/11/24 13:45:06 mpi Exp $ */
/*-
* Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -33,7 +33,6 @@
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_media.h>
-#include <net/if_arp.h>
#include <netinet/in.h>
#include <netinet/if_ether.h>
diff --git a/sys/net80211/ieee80211_crypto_wep.c b/sys/net80211/ieee80211_crypto_wep.c
index d7bb980e2df..2e7958899a9 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.13 2015/07/15 22:16:42 deraadt Exp $ */
+/* $OpenBSD: ieee80211_crypto_wep.c,v 1.14 2015/11/24 13:45:06 mpi Exp $ */
/*-
* Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -32,7 +32,6 @@
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_media.h>
-#include <net/if_arp.h>
#include <netinet/in.h>
#include <netinet/if_ether.h>
diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c
index 69b3ff70eb9..aa6d5c97a7b 100644
--- a/sys/net80211/ieee80211_node.c
+++ b/sys/net80211/ieee80211_node.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_node.c,v 1.91 2015/11/15 11:14:17 stsp Exp $ */
+/* $OpenBSD: ieee80211_node.c,v 1.92 2015/11/24 13:45:06 mpi Exp $ */
/* $NetBSD: ieee80211_node.c,v 1.14 2004/05/09 09:18:47 dyoung Exp $ */
/*-
@@ -47,7 +47,6 @@
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_media.h>
-#include <net/if_arp.h>
#include <netinet/in.h>
#include <netinet/if_ether.h>
diff --git a/sys/net80211/ieee80211_pae_output.c b/sys/net80211/ieee80211_pae_output.c
index 04c165a01f8..210371496f2 100644
--- a/sys/net80211/ieee80211_pae_output.c
+++ b/sys/net80211/ieee80211_pae_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_pae_output.c,v 1.24 2015/10/12 13:17:58 dlg Exp $ */
+/* $OpenBSD: ieee80211_pae_output.c,v 1.25 2015/11/24 13:45:06 mpi Exp $ */
/*-
* Copyright (c) 2007,2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -34,7 +34,6 @@
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_media.h>
-#include <net/if_arp.h>
#include <net/if_llc.h>
#include <netinet/in.h>
diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c
index 9f1d6ebbf9e..6417a197978 100644
--- a/sys/net80211/ieee80211_proto.c
+++ b/sys/net80211/ieee80211_proto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_proto.c,v 1.55 2015/11/15 12:34:07 stsp Exp $ */
+/* $OpenBSD: ieee80211_proto.c,v 1.56 2015/11/24 13:45:06 mpi Exp $ */
/* $NetBSD: ieee80211_proto.c,v 1.8 2004/04/30 23:58:20 dyoung Exp $ */
/*-
@@ -47,7 +47,6 @@
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_media.h>
-#include <net/if_arp.h>
#include <net/if_llc.h>
#include <netinet/in.h>
diff --git a/sys/net80211/ieee80211_regdomain.c b/sys/net80211/ieee80211_regdomain.c
index 29cadc7db4b..0d3060b0c64 100644
--- a/sys/net80211/ieee80211_regdomain.c
+++ b/sys/net80211/ieee80211_regdomain.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_regdomain.c,v 1.9 2014/12/23 03:24:08 tedu Exp $ */
+/* $OpenBSD: ieee80211_regdomain.c,v 1.10 2015/11/24 13:45:06 mpi Exp $ */
/*
* Copyright (c) 2004, 2005 Reyk Floeter <reyk@openbsd.org>
@@ -32,7 +32,6 @@
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_media.h>
-#include <net/if_arp.h>
#include <net/if_llc.h>
#include <netinet/in.h>