diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c index 8022a62e5615..0aa0731ba5bd 100644 --- a/sys/dev/pci/if_ipw.c +++ b/sys/dev/pci/if_ipw.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ipw.c,v 1.18 2006/04/17 19:06:51 rpaulo Exp $ */ +/* $NetBSD: if_ipw.c,v 1.19 2006/04/17 20:57:24 rpaulo Exp $ */ /* FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.15 2005/11/13 17:17:40 damien Exp */ /*- @@ -29,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.18 2006/04/17 19:06:51 rpaulo Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.19 2006/04/17 20:57:24 rpaulo Exp $"); /*- * Intel(R) PRO/Wireless 2100 MiniPCI driver @@ -1740,14 +1740,6 @@ ipw_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) error = ipw_get_radio(sc, (int *)ifr->ifr_data); break; - case SIOCSKILLFW: - /* only super-user can do that! */ - if ((error = suser(curproc->p_ucred, &curproc->p_acflag)) != 0) - break; - - ipw_reset(sc); - break; - case SIOCSIFMEDIA: if (ifr->ifr_media & IFM_IEEE80211_ADHOC) strncpy(sc->sc_fwname, "ipw2100-1.2-i.fw", 24); diff --git a/sys/dev/pci/if_ipwvar.h b/sys/dev/pci/if_ipwvar.h index c3a6f8587650..53afc561a4c7 100644 --- a/sys/dev/pci/if_ipwvar.h +++ b/sys/dev/pci/if_ipwvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: if_ipwvar.h,v 1.10 2006/04/17 19:06:51 rpaulo Exp $ */ +/* $NetBSD: if_ipwvar.h,v 1.11 2006/04/17 20:57:24 rpaulo Exp $ */ /*- * Copyright (c) 2004 @@ -174,7 +174,5 @@ struct ipw_softc { #define sc_if sc_ec.ec_if -#define SIOCSLOADFW _IOW('i', 137, struct ifreq) -#define SIOCSKILLFW _IOW('i', 138, struct ifreq) #define SIOCGRADIO _IOWR('i', 139, struct ifreq) #define SIOCGTABLE1 _IOWR('i', 140, struct ifreq)