d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make these actually compile. I got a little delete happy pruning includes

Browse Source 
and used 'command' instead of 'cmd' in a few cases.  Also clear up some
unused variables.

Pointed out by: phk
This commit is contained in:
mdodd 1999-08-18 22:14:24 +00:00
parent a84a396b6b
commit 6fda6cde76
16 changed files with 82 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/ep/if_ep.c
View File

@ -38,7 +38,7 @@
*/
/*
* $Id: if_ep.c,v 1.81 1999/07/25 01:20:36 hosokawa Exp $
* $Id: if_ep.c,v 1.82 1999/08/18 06:11:58 mdodd Exp $
*
* Promiscuous mode added and interrupt logic slightly changed
* to reduce the number of adapter failures. Transceiver select
@ -76,8 +76,12 @@
#include <sys/select.h>
#endif
#include <net/ethernet.h>
#include <net/if.h>
#include <netinet/in.h>
#include <netinet/if_ether.h>
#if NBPF > 0
#include <net/bpf.h>
#endif
@ -1211,7 +1215,6 @@ epioctl(ifp, cmd, data)
caddr_t data;
{
struct ep_softc *sc = ifp->if_softc;
struct ifreq *ifr = (struct ifreq *) data;
int s, error = 0;
s = splimp();
@ -1220,7 +1223,7 @@ epioctl(ifp, cmd, data)
case SIOCSIFADDR:
case SIOCGIFADDR:
case SIOCSIFMTU:
error = ether_ioctl(ifp, command, data);
error = ether_ioctl(ifp, cmd, data);
break;
case SIOCSIFFLAGS:

9
sys/dev/ex/if_ex.c
View File

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ex.c,v 1.16 1999/07/06 19:22:47 des Exp $
* $Id: if_ex.c,v 1.17 1999/08/18 06:11:58 mdodd Exp $
*/
/*
@ -48,8 +48,12 @@
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <netinet/in.h>
#include <netinet/if_ether.h>
#if NBPF > 0
#include <net/bpf.h>
#endif
@ -752,7 +756,6 @@ void ex_rx_intr(int unit)
int ex_ioctl(register struct ifnet *ifp, u_long cmd, caddr_t data)
{
struct ex_softc *sc = &ex_sc[ifp->if_unit];
struct ifreq *ifr = (struct ifreq *) data;
int s, error = 0;
DODEBUG(Start_End, printf("ex_ioctl%d: start ", ifp->if_unit););
@ -763,7 +766,7 @@ int ex_ioctl(register struct ifnet *ifp, u_long cmd, caddr_t data)
case SIOCSIFADDR:
case SIOCGIFADDR:
case SIOCSIFMTU:
error = ether_ioctl(ifp, command, data);
error = ether_ioctl(ifp, cmd, data);
break;
case SIOCSIFFLAGS:

6
sys/dev/fe/if_fe.c
View File

@ -21,7 +21,7 @@
*/
/*
* $Id: if_fe.c,v 1.51 1999/07/06 19:22:48 des Exp $
* $Id: if_fe.c,v 1.52 1999/08/18 06:11:58 mdodd Exp $
*
* Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
* To be used with FreeBSD 3.x
@ -81,12 +81,16 @@
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_mib.h>
#include <net/if_media.h>
#include <net/if_types.h>
#include <netinet/in.h>
#include <netinet/if_ether.h>
#if NBPF > 0
#include <net/bpf.h>
#endif

7
sys/dev/ie/if_ie.c
View File

@ -47,7 +47,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ie.c,v 1.61 1999/07/06 19:22:49 des Exp $
* $Id: if_ie.c,v 1.62 1999/08/18 06:11:59 mdodd Exp $
*/
/*
@ -121,10 +121,14 @@ iomem and and with 0xffff.
#include <sys/sockio.h>
#include <sys/syslog.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_types.h>
#include <net/if_dl.h>
#include <netinet/in.h>
#include <netinet/if_ether.h>
#include "bpf.h"
#include <machine/clock.h>
@ -2243,7 +2247,6 @@ ie_stop(int unit)
static int
ieioctl(struct ifnet *ifp, u_long command, caddr_t data)
{
struct ifreq *ifr = (struct ifreq *) data;
int s, error = 0;
s = splimp();

7
sys/dev/lnc/if_lnc.c
View File

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_lnc.c,v 1.62 1999/08/10 01:03:49 mdodd Exp $
* $Id: if_lnc.c,v 1.63 1999/08/18 06:11:59 mdodd Exp $
*/
/*
@ -80,10 +80,14 @@
#include <sys/socket.h>
#include <sys/syslog.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_types.h>
#include <netinet/in.h>
#include <netinet/if_ether.h>
#if NBPF > 0
#include <net/bpf.h>
#endif
@ -1841,7 +1845,6 @@ lnc_ioctl(struct ifnet * ifp, u_long command, caddr_t data)
{
struct lnc_softc *sc = ifp->if_softc;
struct ifreq *ifr = (struct ifreq *) data;
int s, error = 0;
s = splimp();

5
sys/dev/wl/if_wl.c
View File

@ -1,4 +1,4 @@
/* $Id: if_wl.c,v 1.22 1999/07/06 19:22:54 des Exp $ */
/* $Id: if_wl.c,v 1.23 1999/08/18 06:11:59 mdodd Exp $ */
/*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@ -204,6 +204,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <sys/kernel.h>
#include <sys/sysctl.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_dl.h>
@ -1181,7 +1182,7 @@ wlioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
case SIOCSIFADDR:
case SIOCGIFADDR:
case SIOCSIFMTU:
error = ether_ioctl(ifp, command, data);
error = ether_ioctl(ifp, cmd, data);
break;
case SIOCSIFFLAGS:

8
sys/i386/isa/if_el.c
View File

@ -6,7 +6,7 @@
*
* Questions, comments, bug reports and fixes to kimmel@cs.umass.edu.
*
* $Id: if_el.c,v 1.41 1999/07/06 19:22:45 des Exp $
* $Id: if_el.c,v 1.42 1999/08/18 06:11:58 mdodd Exp $
*/
/* Except of course for the portions of code lifted from other FreeBSD
* drivers (mainly elread, elget and el_ioctl)
@ -31,8 +31,12 @@
#include <sys/socket.h>
#include <sys/syslog.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <netinet/in.h>
#include <netinet/if_ether.h>
#if NBPF > 0
#include <net/bpf.h>
#endif
@ -636,8 +640,6 @@ el_ioctl(ifp, command, data)
u_long command;
caddr_t data;
{
struct el_softc *sc = ifp->if_softc;
struct ifreq *ifr = (struct ifreq *)data;
int s, error = 0;
s = splimp();

9
sys/i386/isa/if_ep.c
View File

@ -38,7 +38,7 @@
*/
/*
* $Id: if_ep.c,v 1.81 1999/07/25 01:20:36 hosokawa Exp $
* $Id: if_ep.c,v 1.82 1999/08/18 06:11:58 mdodd Exp $
*
* Promiscuous mode added and interrupt logic slightly changed
* to reduce the number of adapter failures. Transceiver select
@ -76,8 +76,12 @@
#include <sys/select.h>
#endif
#include <net/ethernet.h>
#include <net/if.h>
#include <netinet/in.h>
#include <netinet/if_ether.h>
#if NBPF > 0
#include <net/bpf.h>
#endif
@ -1211,7 +1215,6 @@ epioctl(ifp, cmd, data)
caddr_t data;
{
struct ep_softc *sc = ifp->if_softc;
struct ifreq *ifr = (struct ifreq *) data;
int s, error = 0;
s = splimp();
@ -1220,7 +1223,7 @@ epioctl(ifp, cmd, data)
case SIOCSIFADDR:
case SIOCGIFADDR:
case SIOCSIFMTU:
error = ether_ioctl(ifp, command, data);
error = ether_ioctl(ifp, cmd, data);
break;
case SIOCSIFFLAGS:

9
sys/i386/isa/if_ex.c
View File

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ex.c,v 1.16 1999/07/06 19:22:47 des Exp $
* $Id: if_ex.c,v 1.17 1999/08/18 06:11:58 mdodd Exp $
*/
/*
@ -48,8 +48,12 @@
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <netinet/in.h>
#include <netinet/if_ether.h>
#if NBPF > 0
#include <net/bpf.h>
#endif
@ -752,7 +756,6 @@ void ex_rx_intr(int unit)
int ex_ioctl(register struct ifnet *ifp, u_long cmd, caddr_t data)
{
struct ex_softc *sc = &ex_sc[ifp->if_unit];
struct ifreq *ifr = (struct ifreq *) data;
int s, error = 0;
DODEBUG(Start_End, printf("ex_ioctl%d: start ", ifp->if_unit););
@ -763,7 +766,7 @@ int ex_ioctl(register struct ifnet *ifp, u_long cmd, caddr_t data)
case SIOCSIFADDR:
case SIOCGIFADDR:
case SIOCSIFMTU:
error = ether_ioctl(ifp, command, data);
error = ether_ioctl(ifp, cmd, data);
break;
case SIOCSIFFLAGS:

6
sys/i386/isa/if_fe.c
View File

@ -21,7 +21,7 @@
*/
/*
* $Id: if_fe.c,v 1.51 1999/07/06 19:22:48 des Exp $
* $Id: if_fe.c,v 1.52 1999/08/18 06:11:58 mdodd Exp $
*
* Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
* To be used with FreeBSD 3.x
@ -81,12 +81,16 @@
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_mib.h>
#include <net/if_media.h>
#include <net/if_types.h>
#include <netinet/in.h>
#include <netinet/if_ether.h>
#if NBPF > 0
#include <net/bpf.h>
#endif

7
sys/i386/isa/if_ie.c
View File

@ -47,7 +47,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ie.c,v 1.61 1999/07/06 19:22:49 des Exp $
* $Id: if_ie.c,v 1.62 1999/08/18 06:11:59 mdodd Exp $
*/
/*
@ -121,10 +121,14 @@ iomem and and with 0xffff.
#include <sys/sockio.h>
#include <sys/syslog.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_types.h>
#include <net/if_dl.h>
#include <netinet/in.h>
#include <netinet/if_ether.h>
#include "bpf.h"
#include <machine/clock.h>
@ -2243,7 +2247,6 @@ ie_stop(int unit)
static int
ieioctl(struct ifnet *ifp, u_long command, caddr_t data)
{
struct ifreq *ifr = (struct ifreq *) data;
int s, error = 0;
s = splimp();

8
sys/i386/isa/if_le.c
View File

@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_le.c,v 1.51 1999/07/06 19:22:49 des Exp $
* $Id: if_le.c,v 1.52 1999/08/18 06:11:59 mdodd Exp $
*/
/*
@ -48,10 +48,14 @@
#include <sys/sockio.h>
#include <sys/malloc.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_types.h>
#include <net/if_dl.h>
#include <netinet/in.h>
#include <netinet/if_ether.h>
#include "bpf.h"
#include <machine/clock.h>
@ -501,7 +505,7 @@ le_ioctl(
case SIOCSIFADDR:
case SIOCGIFADDR:
case SIOCSIFMTU:
error = ether_ioctl(ifp, command, data);
error = ether_ioctl(ifp, cmd, data);
break;
case SIOCSIFFLAGS: {

7
sys/i386/isa/if_lnc.c
View File

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_lnc.c,v 1.62 1999/08/10 01:03:49 mdodd Exp $
* $Id: if_lnc.c,v 1.63 1999/08/18 06:11:59 mdodd Exp $
*/
/*
@ -80,10 +80,14 @@
#include <sys/socket.h>
#include <sys/syslog.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_types.h>
#include <netinet/in.h>
#include <netinet/if_ether.h>
#if NBPF > 0
#include <net/bpf.h>
#endif
@ -1841,7 +1845,6 @@ lnc_ioctl(struct ifnet * ifp, u_long command, caddr_t data)
{
struct lnc_softc *sc = ifp->if_softc;
struct ifreq *ifr = (struct ifreq *) data;
int s, error = 0;
s = splimp();

5
sys/i386/isa/if_wl.c
View File

@ -1,4 +1,4 @@
/* $Id: if_wl.c,v 1.22 1999/07/06 19:22:54 des Exp $ */
/* $Id: if_wl.c,v 1.23 1999/08/18 06:11:59 mdodd Exp $ */
/*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@ -204,6 +204,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <sys/kernel.h>
#include <sys/sysctl.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_dl.h>
@ -1181,7 +1182,7 @@ wlioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
case SIOCSIFADDR:
case SIOCGIFADDR:
case SIOCSIFMTU:
error = ether_ioctl(ifp, command, data);
error = ether_ioctl(ifp, cmd, data);
break;
case SIOCSIFFLAGS:

6
sys/i386/isa/if_ze.c
View File

@ -47,7 +47,7 @@
*/
/*
* $Id: if_ze.c,v 1.59 1999/07/06 19:22:55 des Exp $
* $Id: if_ze.c,v 1.60 1999/08/18 06:12:00 mdodd Exp $
*/
/* XXX don't mix different PCCARD support code. */
@ -75,8 +75,12 @@ static char const zedummy[] = "code to use the includes of card.h and pcic.h";
#include <sys/socket.h>
#include <sys/syslog.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <netinet/in.h>
#include <netinet/if_ether.h>
#if NBPF > 0
#include <net/bpf.h>
#endif

8
sys/i386/isa/if_zp.c
View File

@ -34,7 +34,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $
* $Id: if_zp.c,v 1.52 1999/07/06 19:22:55 des Exp $
* $Id: if_zp.c,v 1.53 1999/08/18 06:12:00 mdodd Exp $
*/
/*-
* TODO:
@ -128,8 +128,12 @@ static char const zpdummy[] = "code to use the includes of card.h and pcic.h";
#include <sys/sockio.h>
#include <sys/syslog.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <netinet/in.h>
#include <netinet/if_ether.h>
#if NBPF > 0
#include <net/bpf.h>
#endif
@ -1007,7 +1011,7 @@ zpioctl(ifp, cmd, data)
case SIOCSIFADDR:
case SIOCGIFADDR:
case SIOCSIFMTU:
error = ether_ioctl(ifp, command, data);
error = ether_ioctl(ifp, cmd, data);
break;
case SIOCSIFFLAGS: