diff options
author | Ted Unangst <tedu@cvs.openbsd.org> | 2014-12-22 02:28:53 +0000 |
---|---|---|
committer | Ted Unangst <tedu@cvs.openbsd.org> | 2014-12-22 02:28:53 +0000 |
commit | c7aed26ec28e1a2a8728d1471296eb8e7cd14ba7 (patch) | |
tree | 8f98dae088f7f5ae2df3690677f1c271ac8c7a51 /sys/dev/pcmcia | |
parent | f5060714df0f00e45a9c7091f8f8706f7225b547 (diff) |
unifdef INET
Diffstat (limited to 'sys/dev/pcmcia')
-rw-r--r-- | sys/dev/pcmcia/if_cnw.c | 4 | ||||
-rw-r--r-- | sys/dev/pcmcia/if_malo.c | 4 | ||||
-rw-r--r-- | sys/dev/pcmcia/if_wi_pcmcia.c | 4 | ||||
-rw-r--r-- | sys/dev/pcmcia/if_xe.c | 4 |
4 files changed, 4 insertions, 12 deletions
diff --git a/sys/dev/pcmcia/if_cnw.c b/sys/dev/pcmcia/if_cnw.c index d4b987966ac..f1d749318d9 100644 --- a/sys/dev/pcmcia/if_cnw.c +++ b/sys/dev/pcmcia/if_cnw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cnw.c,v 1.25 2014/08/11 12:45:45 mpi Exp $ */ +/* $OpenBSD: if_cnw.c,v 1.26 2014/12/22 02:28:52 tedu Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -781,11 +781,9 @@ cnw_ioctl(ifp, cmd, data) break; ifp->if_flags |= IFF_UP; switch (ifa->ifa_addr->sa_family) { -#ifdef INET case AF_INET: arp_ifinit(&sc->sc_arpcom, ifa); break; -#endif } break; diff --git a/sys/dev/pcmcia/if_malo.c b/sys/dev/pcmcia/if_malo.c index b41c8255765..dd3b7ea58f5 100644 --- a/sys/dev/pcmcia/if_malo.c +++ b/sys/dev/pcmcia/if_malo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_malo.c,v 1.80 2014/09/14 14:17:25 jsg Exp $ */ +/* $OpenBSD: if_malo.c,v 1.81 2014/12/22 02:28:52 tedu Exp $ */ /* * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> @@ -392,10 +392,8 @@ cmalo_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) case SIOCSIFADDR: ifa = (struct ifaddr *)data; ifp->if_flags |= IFF_UP; -#ifdef INET if (ifa->ifa_addr->sa_family == AF_INET) arp_ifinit(&ic->ic_ac, ifa); -#endif /* FALLTHROUGH */ case SIOCSIFFLAGS: if (ifp->if_flags & IFF_UP) { diff --git a/sys/dev/pcmcia/if_wi_pcmcia.c b/sys/dev/pcmcia/if_wi_pcmcia.c index c0d7bae59c1..8ee4527389c 100644 --- a/sys/dev/pcmcia/if_wi_pcmcia.c +++ b/sys/dev/pcmcia/if_wi_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi_pcmcia.c,v 1.72 2013/12/06 21:03:04 deraadt Exp $ */ +/* $OpenBSD: if_wi_pcmcia.c,v 1.73 2014/12/22 02:28:52 tedu Exp $ */ /* $NetBSD: if_wi_pcmcia.c,v 1.14 2001/11/26 04:34:56 ichiro Exp $ */ /* @@ -54,10 +54,8 @@ #include <net/if_dl.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_ioctl.h> diff --git a/sys/dev/pcmcia/if_xe.c b/sys/dev/pcmcia/if_xe.c index ee33dd61c2d..f8c5b0b9c86 100644 --- a/sys/dev/pcmcia/if_xe.c +++ b/sys/dev/pcmcia/if_xe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_xe.c,v 1.45 2014/08/11 12:45:45 mpi Exp $ */ +/* $OpenBSD: if_xe.c,v 1.46 2014/12/22 02:28:52 tedu Exp $ */ /* * Copyright (c) 1999 Niklas Hallqvist, Brandon Creighton, Job de Haas @@ -1177,10 +1177,8 @@ xe_ioctl(ifp, command, data) case SIOCSIFADDR: ifp->if_flags |= IFF_UP; xe_init(sc); -#ifdef INET if (ifa->ifa_addr->sa_family == AF_INET) arp_ifinit(&sc->sc_arpcom, ifa); -#endif /* INET */ break; case SIOCSIFFLAGS: |