From f83b0dac3652830f33e53ab2d11a9d0945cb4a86 Mon Sep 17 00:00:00 2001
From: Martin Pieuchot <mpi@cvs.openbsd.org>
Date: Tue, 24 Nov 2015 13:45:08 +0000
Subject: 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.
---
 sys/dev/ic/acx100.c       | 3 +--
 sys/dev/ic/acx111.c       | 3 +--
 sys/dev/ic/ar5008.c       | 3 +--
 sys/dev/ic/ar5416.c       | 3 +--
 sys/dev/ic/ar5xxx.h       | 3 +--
 sys/dev/ic/ar9003.c       | 3 +--
 sys/dev/ic/ar9280.c       | 3 +--
 sys/dev/ic/ar9285.c       | 3 +--
 sys/dev/ic/ar9287.c       | 3 +--
 sys/dev/ic/ar9380.c       | 3 +--
 sys/dev/ic/if_wi_hostap.c | 3 +--
 sys/dev/ic/pgt.c          | 3 +--
 12 files changed, 12 insertions(+), 24 deletions(-)

(limited to 'sys/dev/ic')

diff --git a/sys/dev/ic/acx100.c b/sys/dev/ic/acx100.c
index 7dd25fe1524..640b5872f9a 100644
--- a/sys/dev/ic/acx100.c
+++ b/sys/dev/ic/acx100.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acx100.c,v 1.25 2014/12/22 02:28:51 tedu Exp $ */
+/*	$OpenBSD: acx100.c,v 1.26 2015/11/24 13:45:06 mpi Exp $ */
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -62,7 +62,6 @@
 #include <machine/bus.h>
 
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_media.h>
 
 #include <netinet/in.h>
diff --git a/sys/dev/ic/acx111.c b/sys/dev/ic/acx111.c
index efd7a4c1b7e..29f8da85542 100644
--- a/sys/dev/ic/acx111.c
+++ b/sys/dev/ic/acx111.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acx111.c,v 1.22 2014/12/22 02:28:51 tedu Exp $ */
+/*	$OpenBSD: acx111.c,v 1.23 2015/11/24 13:45:06 mpi Exp $ */
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -61,7 +61,6 @@
 #include <machine/bus.h>
 
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_media.h>
 
 #include <netinet/in.h>
diff --git a/sys/dev/ic/ar5008.c b/sys/dev/ic/ar5008.c
index fd2968ef4d2..8fdc2031b41 100644
--- a/sys/dev/ic/ar5008.c
+++ b/sys/dev/ic/ar5008.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar5008.c,v 1.31 2015/11/24 13:33:17 mpi Exp $	*/
+/*	$OpenBSD: ar5008.c,v 1.32 2015/11/24 13:45:06 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -44,7 +44,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/ic/ar5416.c b/sys/dev/ic/ar5416.c
index ebfd793f5f8..1850a8c8fcd 100644
--- a/sys/dev/ic/ar5416.c
+++ b/sys/dev/ic/ar5416.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar5416.c,v 1.16 2015/11/24 13:33:17 mpi Exp $	*/
+/*	$OpenBSD: ar5416.c,v 1.17 2015/11/24 13:45:06 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -44,7 +44,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/ic/ar5xxx.h b/sys/dev/ic/ar5xxx.h
index fc9ae6e8a94..e479620d1ff 100644
--- a/sys/dev/ic/ar5xxx.h
+++ b/sys/dev/ic/ar5xxx.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar5xxx.h,v 1.53 2014/12/26 05:46:32 tedu Exp $	*/
+/*	$OpenBSD: ar5xxx.h,v 1.54 2015/11/24 13:45:06 mpi Exp $	*/
 
 /*
  * Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
@@ -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/dev/ic/ar9003.c b/sys/dev/ic/ar9003.c
index ab0de2edceb..e5ff4d6e3e6 100644
--- a/sys/dev/ic/ar9003.c
+++ b/sys/dev/ic/ar9003.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9003.c,v 1.35 2015/11/24 13:33:17 mpi Exp $	*/
+/*	$OpenBSD: ar9003.c,v 1.36 2015/11/24 13:45:06 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -44,7 +44,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/ic/ar9280.c b/sys/dev/ic/ar9280.c
index 80c9618028a..282fd3c8b30 100644
--- a/sys/dev/ic/ar9280.c
+++ b/sys/dev/ic/ar9280.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9280.c,v 1.22 2015/11/24 13:33:17 mpi Exp $	*/
+/*	$OpenBSD: ar9280.c,v 1.23 2015/11/24 13:45:06 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -44,7 +44,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/ic/ar9285.c b/sys/dev/ic/ar9285.c
index 1e56a49549e..fbea63af535 100644
--- a/sys/dev/ic/ar9285.c
+++ b/sys/dev/ic/ar9285.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9285.c,v 1.23 2015/11/24 13:33:17 mpi Exp $	*/
+/*	$OpenBSD: ar9285.c,v 1.24 2015/11/24 13:45:06 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2009-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -45,7 +45,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/ic/ar9287.c b/sys/dev/ic/ar9287.c
index 95cc5c2745d..baeb83c66b0 100644
--- a/sys/dev/ic/ar9287.c
+++ b/sys/dev/ic/ar9287.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9287.c,v 1.21 2015/11/24 13:33:17 mpi Exp $	*/
+/*	$OpenBSD: ar9287.c,v 1.22 2015/11/24 13:45:06 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -44,7 +44,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/ic/ar9380.c b/sys/dev/ic/ar9380.c
index c3954edadc5..3bf2eb936e8 100644
--- a/sys/dev/ic/ar9380.c
+++ b/sys/dev/ic/ar9380.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9380.c,v 1.21 2015/11/24 13:33:17 mpi Exp $	*/
+/*	$OpenBSD: ar9380.c,v 1.22 2015/11/24 13:45:06 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2011 Damien Bergamini <damien.bergamini@free.fr>
@@ -42,7 +42,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/ic/if_wi_hostap.c b/sys/dev/ic/if_wi_hostap.c
index 86595020359..d6552ea9241 100644
--- a/sys/dev/ic/if_wi_hostap.c
+++ b/sys/dev/ic/if_wi_hostap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi_hostap.c,v 1.49 2015/11/24 13:33:17 mpi Exp $	*/
+/*	$OpenBSD: if_wi_hostap.c,v 1.50 2015/11/24 13:45:06 mpi Exp $	*/
 
 /*
  * Copyright (c) 2002
@@ -56,7 +56,6 @@
 #include <machine/bus.h>
 
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/ic/pgt.c b/sys/dev/ic/pgt.c
index 900a1f9e513..e6f08ec555a 100644
--- a/sys/dev/ic/pgt.c
+++ b/sys/dev/ic/pgt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pgt.c,v 1.81 2015/11/24 13:33:17 mpi Exp $  */
+/*	$OpenBSD: pgt.c,v 1.82 2015/11/24 13:45:06 mpi Exp $  */
 
 /*
  * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -63,7 +63,6 @@
 #include <machine/intr.h>
 
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_llc.h>
 #include <net/if_media.h>
-- 
cgit v1.2.3