unifdef some more INET. v4 4life.

diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index 08f6a98..bb1f1f1 100644 (file)
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pfvar.h,v 1.405 2014/12/19 13:04:08 reyk Exp $ */
+/*     $OpenBSD: pfvar.h,v 1.406 2014/12/23 03:24:08 tedu Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -229,23 +229,16 @@ struct pfi_dynaddr {
  */
 
 #ifdef _KERNEL
-#ifdef INET
 #ifndef INET6
 #define PF_INET_ONLY
 #endif /* ! INET6 */
-#endif /* INET */
 
 #ifdef INET6
-#ifndef INET
-#define PF_INET6_ONLY
-#endif /* ! INET */
 #endif /* INET6 */
 
-#ifdef INET
 #ifdef INET6
 #define PF_INET_INET6
 #endif /* INET6 */
-#endif /* INET */
 
 #else
 

diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c
index 714b80e..0767bff 100644 (file)
--- a/sys/net80211/ieee80211.c
+++ b/sys/net80211/ieee80211.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ieee80211.c,v 1.42 2014/09/14 14:17:26 jsg Exp $      */
+/*     $OpenBSD: ieee80211.c,v 1.43 2014/12/23 03:24:08 tedu Exp $     */
 /*     $NetBSD: ieee80211.c,v 1.19 2004/06/06 05:45:29 dyoung Exp $    */
 
 /*-
@@ -54,10 +54,8 @@
 #include <net/bpf.h>
 #endif
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_priv.h>

diff --git a/sys/net80211/ieee80211_amrr.c b/sys/net80211/ieee80211_amrr.c
index 91bacf6..9754e4d 100644 (file)
--- a/sys/net80211/ieee80211_amrr.c
+++ b/sys/net80211/ieee80211_amrr.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ieee80211_amrr.c,v 1.7 2011/03/02 08:48:59 fgsch Exp $        */
+/*     $OpenBSD: ieee80211_amrr.c,v 1.8 2014/12/23 03:24:08 tedu Exp $ */
 
 /*-
  * Copyright (c) 2006
@@ -25,10 +25,8 @@
 #include <net/if.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_priv.h>

diff --git a/sys/net80211/ieee80211_crypto.c b/sys/net80211/ieee80211_crypto.c
index 3ea269c..8c03087 100644 (file)
--- a/sys/net80211/ieee80211_crypto.c
+++ b/sys/net80211/ieee80211_crypto.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ieee80211_crypto.c,v 1.64 2014/11/18 02:37:31 tedu Exp $      */
+/*     $OpenBSD: ieee80211_crypto.c,v 1.65 2014/12/23 03:24:08 tedu Exp $      */
 
 /*-
  * Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -32,10 +32,8 @@
 #include <net/if_media.h>
 #include <net/if_arp.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_priv.h>

diff --git a/sys/net80211/ieee80211_crypto_bip.c b/sys/net80211/ieee80211_crypto_bip.c
index 3b76c29..03fe214 100644 (file)
--- 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.5 2014/07/12 18:44:22 tedu Exp $   */
+/*     $OpenBSD: ieee80211_crypto_bip.c,v 1.6 2014/12/23 03:24:08 tedu Exp $   */
 
 /*-
  * Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -34,10 +34,8 @@
 #include <net/if_media.h>
 #include <net/if_arp.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_crypto.h>

diff --git a/sys/net80211/ieee80211_crypto_ccmp.c b/sys/net80211/ieee80211_crypto_ccmp.c
index 72c55b4..69f482a 100644 (file)
--- 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.14 2014/07/12 18:44:22 tedu Exp $ */
+/*     $OpenBSD: ieee80211_crypto_ccmp.c,v 1.15 2014/12/23 03:24:08 tedu Exp $ */
 
 /*-
  * Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -34,10 +34,8 @@
 #include <net/if_media.h>
 #include <net/if_arp.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_crypto.h>

diff --git a/sys/net80211/ieee80211_crypto_tkip.c b/sys/net80211/ieee80211_crypto_tkip.c
index 101212a..762b3c4 100644 (file)
--- 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.22 2014/07/12 18:44:22 tedu Exp $ */
+/*     $OpenBSD: ieee80211_crypto_tkip.c,v 1.23 2014/12/23 03:24:08 tedu Exp $ */
 
 /*-
  * Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -35,10 +35,8 @@
 #include <net/if_media.h>
 #include <net/if_arp.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_crypto.h>

diff --git a/sys/net80211/ieee80211_crypto_wep.c b/sys/net80211/ieee80211_crypto_wep.c
index 4b3752d..5783436 100644 (file)
--- 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.11 2014/11/18 02:37:31 tedu Exp $  */
+/*     $OpenBSD: ieee80211_crypto_wep.c,v 1.12 2014/12/23 03:24:08 tedu Exp $  */
 
 /*-
  * Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -34,10 +34,8 @@
 #include <net/if_media.h>
 #include <net/if_arp.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_crypto.h>

diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c
index 27c3a98..4bbd9f1 100644 (file)
--- a/sys/net80211/ieee80211_input.c
+++ b/sys/net80211/ieee80211_input.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ieee80211_input.c,v 1.127 2014/09/14 14:17:26 jsg Exp $       */
+/*     $OpenBSD: ieee80211_input.c,v 1.128 2014/12/23 03:24:08 tedu Exp $      */
 
 /*-
  * Copyright (c) 2001 Atsushi Onoe
@@ -53,10 +53,8 @@
 #include <net/bpf.h>
 #endif
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_priv.h>

diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c
index bc93d15..5e2e3e1 100644 (file)
--- a/sys/net80211/ieee80211_ioctl.c
+++ b/sys/net80211/ieee80211_ioctl.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ieee80211_ioctl.c,v 1.37 2014/09/14 14:17:26 jsg Exp $        */
+/*     $OpenBSD: ieee80211_ioctl.c,v 1.38 2014/12/23 03:24:08 tedu Exp $       */
 /*     $NetBSD: ieee80211_ioctl.c,v 1.15 2004/05/06 02:58:16 dyoung Exp $      */
 
 /*-
@@ -45,10 +45,8 @@
 #include <net/if_arp.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_crypto.h>

diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c
index 8cebd85..1a1785e 100644 (file)
--- a/sys/net80211/ieee80211_node.c
+++ b/sys/net80211/ieee80211_node.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ieee80211_node.c,v 1.85 2014/11/18 02:37:31 tedu Exp $        */
+/*     $OpenBSD: ieee80211_node.c,v 1.86 2014/12/23 03:24:08 tedu Exp $        */
 /*     $NetBSD: ieee80211_node.c,v 1.14 2004/05/09 09:18:47 dyoung Exp $       */
 
 /*-
@@ -54,10 +54,8 @@
 #include <net/bpf.h>
 #endif
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #if NBRIDGE > 0
 #include <net/if_bridge.h>

diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c
index 4845b4e..fb41416 100644 (file)
--- a/sys/net80211/ieee80211_output.c
+++ b/sys/net80211/ieee80211_output.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ieee80211_output.c,v 1.92 2014/09/14 14:17:26 jsg Exp $       */
+/*     $OpenBSD: ieee80211_output.c,v 1.93 2014/12/23 03:24:08 tedu Exp $      */
 /*     $NetBSD: ieee80211_output.c,v 1.13 2004/05/31 11:02:55 dyoung Exp $     */
 
 /*-
@@ -50,14 +50,12 @@
 #include <net/if_llc.h>
 #include <net/bpf.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 #include <netinet/ip.h>
 #ifdef INET6
 #include <netinet/ip6.h>
 #endif
-#endif
 
 #if NVLAN > 0
 #include <net/if_types.h>
@@ -423,15 +421,12 @@ ieee80211_up_to_ac(struct ieee80211com *ic, int up)
 int
 ieee80211_classify(struct ieee80211com *ic, struct mbuf *m)
 {
-#ifdef INET
        struct ether_header *eh;
        u_int8_t ds_field;
-#endif
 #if NVLAN > 0
        if (m->m_flags & M_VLANTAG)     /* use VLAN 802.1D user-priority */
                return EVL_PRIOFTAG(m->m_pkthdr.ether_vtag);
 #endif
-#ifdef INET
        eh = mtod(m, struct ether_header *);
        if (eh->ether_type == htons(ETHERTYPE_IP)) {
                struct ip *ip = (struct ip *)&eh[1];
@@ -473,7 +468,6 @@ ieee80211_classify(struct ieee80211com *ic, struct mbuf *m)
        case IPTOS_PREC_NETCONTROL:
                return 7;
        }
-#endif /* INET */
        return 0;       /* default to Best-Effort */
 }
 

diff --git a/sys/net80211/ieee80211_pae_input.c b/sys/net80211/ieee80211_pae_input.c
index 417bd44..a736b87 100644 (file)
--- 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.22 2014/11/18 02:37:31 tedu Exp $   */
+/*     $OpenBSD: ieee80211_pae_input.c,v 1.23 2014/12/23 03:24:08 tedu Exp $   */
 
 /*-
  * Copyright (c) 2007,2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -35,10 +35,8 @@
 #include <net/if_media.h>
 #include <net/if_arp.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_priv.h>

diff --git a/sys/net80211/ieee80211_pae_output.c b/sys/net80211/ieee80211_pae_output.c
index 07a5acb..c34ce59 100644 (file)
--- 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.18 2014/09/14 14:17:26 jsg Exp $   */
+/*     $OpenBSD: ieee80211_pae_output.c,v 1.19 2014/12/23 03:24:08 tedu Exp $  */
 
 /*-
  * Copyright (c) 2007,2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -38,11 +38,9 @@
 #include <net/if_llc.h>
 #include <net/bpf.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 #include <netinet/ip.h>
-#endif
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_priv.h>

diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c
index 4c8c7f7..9412fdc 100644 (file)
--- a/sys/net80211/ieee80211_proto.c
+++ b/sys/net80211/ieee80211_proto.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ieee80211_proto.c,v 1.49 2014/11/18 02:37:31 tedu Exp $       */
+/*     $OpenBSD: ieee80211_proto.c,v 1.50 2014/12/23 03:24:08 tedu Exp $       */
 /*     $NetBSD: ieee80211_proto.c,v 1.8 2004/04/30 23:58:20 dyoung Exp $       */
 
 /*-
@@ -56,10 +56,8 @@
 #include <net/bpf.h>
 #endif
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_priv.h>

diff --git a/sys/net80211/ieee80211_regdomain.c b/sys/net80211/ieee80211_regdomain.c
index c9d34b3..29cadc7 100644 (file)
--- a/sys/net80211/ieee80211_regdomain.c
+++ b/sys/net80211/ieee80211_regdomain.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ieee80211_regdomain.c,v 1.8 2014/08/08 15:16:39 jasper Exp $  */
+/*     $OpenBSD: ieee80211_regdomain.c,v 1.9 2014/12/23 03:24:08 tedu Exp $    */
 
 /*
  * Copyright (c) 2004, 2005 Reyk Floeter <reyk@openbsd.org>
@@ -35,10 +35,8 @@
 #include <net/if_arp.h>
 #include <net/if_llc.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_regdomain.h>

diff --git a/sys/net80211/ieee80211_rssadapt.c b/sys/net80211/ieee80211_rssadapt.c
index d203080..7703c40 100644 (file)
--- a/sys/net80211/ieee80211_rssadapt.c
+++ b/sys/net80211/ieee80211_rssadapt.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ieee80211_rssadapt.c,v 1.10 2011/03/02 08:48:59 fgsch Exp $   */
+/*     $OpenBSD: ieee80211_rssadapt.c,v 1.11 2014/12/23 03:24:08 tedu Exp $    */
 /*     $NetBSD: ieee80211_rssadapt.c,v 1.7 2004/05/25 04:33:59 dyoung Exp $    */
 
 /*-
@@ -36,10 +36,8 @@
 #include <net/if.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_rssadapt.h>

diff --git a/sys/netinet/ip_ipsp.h b/sys/netinet/ip_ipsp.h
index 8145de1..6192a97 100644 (file)
--- a/sys/netinet/ip_ipsp.h
+++ b/sys/netinet/ip_ipsp.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ip_ipsp.h,v 1.157 2014/11/25 13:10:03 mpi Exp $       */
+/*     $OpenBSD: ip_ipsp.h,v 1.158 2014/12/23 03:24:08 tedu Exp $      */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr),
@@ -523,9 +523,7 @@ void        ipe4_input(struct mbuf *, ...);
 void   ipip_input(struct mbuf *, int, struct ifnet *, int);
 int    ipip_output(struct mbuf *, struct tdb *, struct mbuf **, int, int);
 
-#ifdef INET
 void   ip4_input(struct mbuf *, ...);
-#endif /* INET */
 
 #ifdef INET6
 int    ip4_input6(struct mbuf **, int *, int);
@@ -539,11 +537,9 @@ int        ah_input(struct mbuf *, struct tdb *, int, int);
 int    ah_output(struct mbuf *, struct tdb *, struct mbuf **, int, int);
 int    ah_sysctl(int *, u_int, void *, size_t *, void *, size_t);
 
-#ifdef INET
 void   ah4_input(struct mbuf *, ...);
 void   *ah4_ctlinput(int, struct sockaddr *, u_int, void *);
 void   *udpencap_ctlinput(int, struct sockaddr *, u_int, void *);
-#endif /* INET */
 
 #ifdef INET6
 int    ah6_input(struct mbuf **, int *, int);
@@ -557,10 +553,8 @@ int        esp_input(struct mbuf *, struct tdb *, int, int);
 int    esp_output(struct mbuf *, struct tdb *, struct mbuf **, int, int);
 int    esp_sysctl(int *, u_int, void *, size_t *, void *, size_t);
 
-#ifdef INET
 void   esp4_input(struct mbuf *, ...);
 void   *esp4_ctlinput(int, struct sockaddr *, u_int, void *);
-#endif /* INET */
 
 #ifdef INET6
 int    esp6_input(struct mbuf **, int *, int);
@@ -574,9 +568,7 @@ int ipcomp_input(struct mbuf *, struct tdb *, int, int);
 int    ipcomp_output(struct mbuf *, struct tdb *, struct mbuf **, int, int);
 int    ipcomp_sysctl(int *, u_int, void *, size_t *, void *, size_t);
 
-#ifdef INET
 void   ipcomp4_input(struct mbuf *, ...);
-#endif /* INET */
 
 #ifdef INET6
 int    ipcomp6_input(struct mbuf **, int *, int);

diff --git a/sys/netmpls/mpls_input.c b/sys/netmpls/mpls_input.c
index 3391aee..5328aec 100644 (file)
--- a/sys/netmpls/mpls_input.c
+++ b/sys/netmpls/mpls_input.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mpls_input.c,v 1.41 2014/12/05 15:50:04 mpi Exp $     */
+/*     $OpenBSD: mpls_input.c,v 1.42 2014/12/23 03:24:08 tedu Exp $    */
 
 /*
  * Copyright (c) 2008 Claudio Jeker <claudio@openbsd.org>
@@ -29,18 +29,13 @@
 #include <net/netisr.h>
 #include <net/route.h>
 
-#ifdef  INET
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip_icmp.h>
-#endif
 
 #ifdef INET6
 #include <netinet/ip6.h>
-#ifndef INET
-#include <netinet/in.h>
-#endif
 #endif /* INET6 */
 
 #include <netmpls/mpls.h>

diff --git a/sys/netmpls/mpls_output.c b/sys/netmpls/mpls_output.c
index 4043abe..1009ff1 100644 (file)
--- a/sys/netmpls/mpls_output.c
+++ b/sys/netmpls/mpls_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpls_output.c,v 1.19 2014/12/05 15:50:04 mpi Exp $ */
+/* $OpenBSD: mpls_output.c,v 1.20 2014/12/23 03:24:08 tedu Exp $ */
 
 /*
  * Copyright (c) 2008 Claudio Jeker <claudio@openbsd.org>
@@ -28,10 +28,8 @@
 
 #include <netmpls/mpls.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/ip.h>
-#endif
 
 #ifdef INET6
 #include <netinet/ip6.h>
@@ -169,7 +167,6 @@ bad:
 void
 mpls_do_cksum(struct mbuf *m)
 {
-#ifdef INET
        struct ip *ip;
        u_int16_t hlen;
 
@@ -181,7 +178,6 @@ mpls_do_cksum(struct mbuf *m)
                ip->ip_sum = in_cksum(m, hlen);
                m->m_pkthdr.csum_flags &= ~M_IPV4_CSUM_OUT;
        }
-#endif
 }
 
 u_int8_t