summaryrefslogtreecommitdiff
path: root/sys/dev/usb
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2005-06-08 17:03:04 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2005-06-08 17:03:04 +0000
commit450458da5c54b346d37bd11af2c123619d1b5251 (patch)
tree982a4b774f0670ece704a67504425c6287f8c1ce /sys/dev/usb
parent7a5793168be0f07f61e9204f04930140c0697c78 (diff)
remove netns crud.
some drivers actually had hooks for SIOCSIFADDR, most just useless includes "looks good" deraadt miod brad
Diffstat (limited to 'sys/dev/usb')
-rw-r--r--sys/dev/usb/if_aue.c22
-rw-r--r--sys/dev/usb/if_axe.c22
-rw-r--r--sys/dev/usb/if_cue.c22
-rw-r--r--sys/dev/usb/if_kue.c22
-rw-r--r--sys/dev/usb/if_udav.c21
-rw-r--r--sys/dev/usb/if_upl.c22
-rw-r--r--sys/dev/usb/if_url.c22
7 files changed, 7 insertions, 146 deletions
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index 0bf62fa3875..17db7d88f39 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_aue.c,v 1.38 2005/01/03 22:45:52 brad Exp $ */
+/* $OpenBSD: if_aue.c,v 1.39 2005/06/08 17:03:01 henning Exp $ */
/* $NetBSD: if_aue.c,v 1.82 2003/03/05 17:37:36 shiba Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -133,11 +133,6 @@
#endif
#endif /* defined(__OpenBSD__) */
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
@@ -1574,21 +1569,6 @@ aue_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
#endif
break;
#endif /* INET */
-#ifdef NS
- case AF_NS:
- {
- struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
-
- if (ns_nullhost(*ina))
- ina->x_host = *(union ns_host *)
- LLADDR(ifp->if_sadl);
- else
- memcpy(LLADDR(ifp->if_sadl),
- ina->x_host.c_host,
- ifp->if_addrlen);
- break;
- }
-#endif /* NS */
}
break;
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index a9a266964d6..a187c737078 100644
--- a/sys/dev/usb/if_axe.c
+++ b/sys/dev/usb/if_axe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_axe.c,v 1.24 2005/03/14 04:08:49 deraadt Exp $ */
+/* $OpenBSD: if_axe.c,v 1.25 2005/06/08 17:03:01 henning Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003
@@ -128,11 +128,6 @@
#endif
#endif /* defined(__OpenBSD__) */
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
@@ -1200,21 +1195,6 @@ axe_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
arp_ifinit(&sc->arpcom, ifa);
break;
#endif /* INET */
-#ifdef NS
- case AF_NS:
- {
- struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
-
- if (ns_nullhost(*ina))
- ina->x_host = *(union ns_host *)
- LLADDR(ifp->if_sadl);
- else
- memcpy(LLADDR(ifp->if_sadl),
- ina->x_host.c_host,
- ifp->if_addrlen);
- break;
- }
-#endif /* NS */
}
break;
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index ef462c1e881..16af1784a7d 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_cue.c,v 1.24 2005/01/03 22:45:52 brad Exp $ */
+/* $OpenBSD: if_cue.c,v 1.25 2005/06/08 17:03:02 henning Exp $ */
/* $NetBSD: if_cue.c,v 1.40 2002/07/11 21:14:26 augustss Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -111,11 +111,6 @@
#endif
#endif /* defined(__OpenBSD__) */
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
@@ -1167,21 +1162,6 @@ cue_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
#endif
break;
#endif /* INET */
-#ifdef NS
- case AF_NS:
- {
- struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
-
- if (ns_nullhost(*ina))
- ina->x_host = *(union ns_host *)
- LLADDR(ifp->if_sadl);
- else
- memcpy(LLADDR(ifp->if_sadl),
- ina->x_host.c_host,
- ifp->if_addrlen);
- break;
- }
-#endif /* NS */
}
break;
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index e10cf056e39..c43cdc1c533 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_kue.c,v 1.35 2005/01/15 03:53:36 jsg Exp $ */
+/* $OpenBSD: if_kue.c,v 1.36 2005/06/08 17:03:02 henning Exp $ */
/* $NetBSD: if_kue.c,v 1.50 2002/07/16 22:00:31 augustss Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -121,11 +121,6 @@
#endif
#endif /* defined (__OpenBSD__) */
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
@@ -1125,21 +1120,6 @@ kue_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
#endif
break;
#endif /* INET */
-#ifdef NS
- case AF_NS:
- {
- struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
-
- if (ns_nullhost(*ina))
- ina->x_host = *(union ns_host *)
- LLADDR(ifp->if_sadl);
- else
- memcpy(LLADDR(ifp->if_sadl),
- ina->x_host.c_host,
- ifp->if_addrlen);
- break;
- }
-#endif /* NS */
}
break;
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index 4ef3b5654c7..9f89b62f3b5 100644
--- a/sys/dev/usb/if_udav.c
+++ b/sys/dev/usb/if_udav.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_udav.c,v 1.9 2005/01/03 22:45:52 brad Exp $ */
+/* $OpenBSD: if_udav.c,v 1.10 2005/06/08 17:03:02 henning Exp $ */
/* $NetBSD: if_udav.c,v 1.3 2004/04/23 17:25:25 itojun Exp $ */
/* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */
/*
@@ -79,11 +79,6 @@
#include <netinet/if_ether.h>
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
@@ -1236,20 +1231,6 @@ udav_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
arp_ifinit(&sc->sc_ac, ifa);
break;
#endif /* INET */
-#ifdef NS
- case AF_NS:
- {
- struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
-
- if (ns_nullhost(*ina))
- ina->x_host = *(union ns_host *)
- LLADDR(ifp->if_sadl);
- else
- memcpy(LLADDR(ifp->if_sadl),
- ina->x_host.c_host, ifp->if_addrlen);
- break;
- }
-#endif /* NS */
}
break;
diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c
index c9e3849621a..95baee4b0a4 100644
--- a/sys/dev/usb/if_upl.c
+++ b/sys/dev/usb/if_upl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_upl.c,v 1.17 2004/11/10 10:14:48 grange Exp $ */
+/* $OpenBSD: if_upl.c,v 1.18 2005/06/08 17:03:02 henning Exp $ */
/* $NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -92,11 +92,6 @@
#error upl without INET?
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
@@ -898,21 +893,6 @@ upl_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
case AF_INET:
break;
#endif /* INET */
-#ifdef NS
- case AF_NS:
- {
- struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
-
- if (ns_nullhost(*ina))
- ina->x_host = *(union ns_host *)
- LLADDR(ifp->if_sadl);
- else
- memcpy(LLADDR(ifp->if_sadl),
- ina->x_host.c_host,
- ifp->if_addrlen);
- break;
- }
-#endif /* NS */
}
break;
diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c
index cb0e0d4f08c..2318151e4c4 100644
--- a/sys/dev/usb/if_url.c
+++ b/sys/dev/usb/if_url.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_url.c,v 1.21 2005/03/03 07:16:53 itojun Exp $ */
+/* $OpenBSD: if_url.c,v 1.22 2005/06/08 17:03:02 henning Exp $ */
/* $NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $ */
/*
* Copyright (c) 2001, 2002
@@ -94,11 +94,6 @@
#endif
#endif /* defined(__OpenBSD__) */
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
#include <dev/mii/urlphyreg.h>
@@ -1150,21 +1145,6 @@ url_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
arp_ifinit(&sc->sc_ac, ifa);
break;
#endif /* INET */
-#ifdef NS
- case AF_NS:
- {
- struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
-
- if (ns_nullhost(*ina))
- ina->x_host = *(union ns_host *)
- LLADDR(ifp->if_sadl);
- else
- memcpy(LLADDR(ifp->if_sadl),
- ina->x_host.c_host,
- ifp->if_addrlen);
- break;
- }
-#endif /* NS */
}
break;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 13:47:06 +0000