Index | Thread | Search

From:
jan@openbsd.org
Subject:
remove useless includes of ip.h/ip6.h
To:
tech@openbsd.org
Date:
Wed, 10 Apr 2024 23:12:57 +0200

Download raw body.

Thread
Hi,

We don't need the includes of ip{6}.h in most interfaces any more.  Due
to the last improvements of ether_extract_headers().

ok?

bye,
jan

Index: dev/pci/if_bnxt.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/if_bnxt.c,v
diff -u -p -r1.47 if_bnxt.c
--- dev/pci/if_bnxt.c	14 Feb 2024 22:41:48 -0000	1.47
+++ dev/pci/if_bnxt.c	10 Apr 2024 21:06:12 -0000
@@ -76,8 +76,6 @@
 #endif
 
 #include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/ip6.h>
 #include <netinet/if_ether.h>
 #include <netinet/tcp.h>
 #include <netinet/tcp_timer.h>
Index: dev/pci/if_igc.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/if_igc.c,v
diff -u -p -r1.19 if_igc.c
--- dev/pci/if_igc.c	25 Mar 2024 20:25:13 -0000	1.19
+++ dev/pci/if_igc.c	10 Apr 2024 20:41:14 -0000
@@ -48,8 +48,6 @@
 
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#include <netinet/ip.h>
-#include <netinet/ip6.h>
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
Index: dev/pci/if_ixl.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/if_ixl.c,v
diff -u -p -r1.97 if_ixl.c
--- dev/pci/if_ixl.c	14 Feb 2024 22:41:48 -0000	1.97
+++ dev/pci/if_ixl.c	10 Apr 2024 21:04:20 -0000
@@ -83,13 +83,11 @@
 #endif
 
 #include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/ip6.h>
+#include <netinet/if_ether.h>
 #include <netinet/tcp.h>
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
 #include <netinet/udp.h>
-#include <netinet/if_ether.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
Index: dev/pci/if_ngbe.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/if_ngbe.c,v
diff -u -p -r1.2 if_ngbe.c
--- dev/pci/if_ngbe.c	10 Nov 2023 15:51:20 -0000	1.2
+++ dev/pci/if_ngbe.c	10 Apr 2024 21:04:33 -0000
@@ -37,8 +37,6 @@
 
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#include <netinet/ip.h>
-#include <netinet/ip6.h>
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
Index: dev/pci/ixgbe.h
===================================================================
RCS file: /cvs/src/sys/dev/pci/ixgbe.h,v
diff -u -p -r1.34 ixgbe.h
--- dev/pci/ixgbe.h	18 May 2023 08:22:37 -0000	1.34
+++ dev/pci/ixgbe.h	10 Apr 2024 21:06:49 -0000
@@ -65,8 +65,6 @@
 
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#include <netinet/ip.h>
-#include <netinet/ip6.h>
 #include <netinet/tcp.h>
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>