summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>1996-05-06 05:43:44 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>1996-05-06 05:43:44 +0000
commit758bd8b27107f6cb7f331e8f61b8373d1f8f5ab2 (patch)
tree95fbb6f8abe5aa814761b4f1c2a2fd74a599244c /sys
parent8e0e806717d4debaf4a3daf80cf3aeec1ec73ee0 (diff)
if.h was missed from the commit.
if_ethersubr.c: missed variables added.
Diffstat (limited to 'sys')
-rw-r--r--sys/net/if.h4
-rw-r--r--sys/net/if_ethersubr.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/sys/net/if.h b/sys/net/if.h
index c09d401ba27..404671ced18 100644
--- a/sys/net/if.h
+++ b/sys/net/if.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if.h,v 1.3 1996/03/05 15:44:23 mickey Exp $ */
+/* $OpenBSD: if.h,v 1.4 1996/05/06 05:43:43 mickey Exp $ */
/* $NetBSD: if.h,v 1.20 1996/02/13 22:00:12 christos Exp $ */
/*
@@ -70,6 +70,7 @@ struct proc;
struct rtentry;
struct socket;
struct ether_header;
+struct arpcom;
/*
* Structure defining statistics and other data kept regarding a network
@@ -324,6 +325,7 @@ struct ifconf {
struct ifnet_head ifnet;
void ether_ifattach __P((struct ifnet *));
+int ether_ioctl __P((struct ifnet *, struct arpcom *, u_long, caddr_t));
void ether_input __P((struct ifnet *, struct ether_header *, struct mbuf *));
int ether_output __P((struct ifnet *,
struct mbuf *, struct sockaddr *, struct rtentry *));
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index b1a6713d23a..49f3c09f9d3 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ethersubr.c,v 1.9 1996/05/05 13:39:50 mickey Exp $ */
+/* $OpenBSD: if_ethersubr.c,v 1.10 1996/05/06 05:43:41 mickey Exp $ */
/* $NetBSD: if_ethersubr.c,v 1.18 1996/02/13 22:00:14 christos Exp $ */
/*
@@ -102,6 +102,7 @@ ether_ioctl(ifp, arp, cmd, data)
{
struct ifaddr *ifa = (struct ifaddr *)data;
struct ifreq *ifr = (struct ifreq *)data;
+ int error = 0;
switch (cmd) {
@@ -149,7 +150,8 @@ ether_ioctl(ifp, arp, cmd, data)
default:
break;
}
- return 0;
+
+ return error;
}
/*