diff options
Diffstat (limited to 'sys/i386/isa')
-rw-r--r-- | sys/i386/isa/if_ed.c | 11 | ||||
-rw-r--r-- | sys/i386/isa/if_el.c | 11 | ||||
-rw-r--r-- | sys/i386/isa/if_ep.c | 3 | ||||
-rw-r--r-- | sys/i386/isa/if_ie.c | 6 | ||||
-rw-r--r-- | sys/i386/isa/if_is.c | 12 | ||||
-rw-r--r-- | sys/i386/isa/if_le.c | 15 | ||||
-rw-r--r-- | sys/i386/isa/if_lnc.c | 3 |
7 files changed, 17 insertions, 44 deletions
diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c index 2b2ff84..39622f1 100644 --- a/sys/i386/isa/if_ed.c +++ b/sys/i386/isa/if_ed.c @@ -13,7 +13,7 @@ * the SMC Elite Ultra (8216), the 3Com 3c503, the NE1000 and NE2000, * and a variety of similar clones. * - * $Id: if_ed.c,v 1.57 1994/11/24 14:29:16 davidg Exp $ + * $Id: if_ed.c,v 1.58 1994/11/26 10:51:49 davidg Exp $ */ #include "ed.h" @@ -1925,14 +1925,7 @@ ed_ioctl(ifp, command, data) #ifdef INET case AF_INET: ed_init(ifp->if_unit); /* before arpwhohas */ - - /* - * See if another station has *our* IP address. i.e.: - * There is an address conflict! If a conflict exists, - * a message is sent to the console. - */ - ((struct arpcom *) ifp)->ac_ipaddr = IA_SIN(ifa)->sin_addr; - arpwhohas((struct arpcom *) ifp, &IA_SIN(ifa)->sin_addr); + arp_ifinit((struct arpcom *)ifp, ifa); break; #endif #ifdef NS diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c index 1835480..fee5127 100644 --- a/sys/i386/isa/if_el.c +++ b/sys/i386/isa/if_el.c @@ -6,7 +6,7 @@ * * Questions, comments, bug reports and fixes to kimmel@cs.umass.edu. * - * $Id: if_el.c,v 1.8 1994/10/23 21:27:17 wollman Exp $ + * $Id: if_el.c,v 1.9 1994/11/24 14:29:17 davidg Exp $ */ /* Except of course for the portions of code lifted from other FreeBSD * drivers (mainly elread, elget and el_ioctl) @@ -701,14 +701,7 @@ el_ioctl(ifp, command, data) #ifdef INET case AF_INET: el_init(ifp->if_unit); /* before arpwhohas */ - /* - * See if another station has *our* IP address. - * i.e.: There is an address conflict! If a - * conflict exists, a message is sent to the - * console. - */ - ((struct arpcom *)ifp)->ac_ipaddr = IA_SIN(ifa)->sin_addr; - arpwhohas((struct arpcom *)ifp, &IA_SIN(ifa)->sin_addr); + arp_ifinit((struct arpcom *)ifp, ifa); break; #endif #ifdef NS diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c index f73c9a6..15dab06 100644 --- a/sys/i386/isa/if_ep.c +++ b/sys/i386/isa/if_ep.c @@ -1190,8 +1190,7 @@ epioctl(ifp, cmd, data) #ifdef INET case AF_INET: epinit(ifp->if_unit); /* before arpwhohas */ - ((struct arpcom *) ifp)->ac_ipaddr = IA_SIN(ifa)->sin_addr; - arpwhohas((struct arpcom *) ifp, &IA_SIN(ifa)->sin_addr); + arp_ifinit((struct arpcom *)ifp, ifa); break; #endif #ifdef NS diff --git a/sys/i386/isa/if_ie.c b/sys/i386/isa/if_ie.c index ae49984..691f0f4 100644 --- a/sys/i386/isa/if_ie.c +++ b/sys/i386/isa/if_ie.c @@ -43,7 +43,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ie.c,v 1.18 1994/10/26 00:16:17 phk Exp $ + * $Id: if_ie.c,v 1.19 1994/11/24 14:29:20 davidg Exp $ */ /* @@ -1887,9 +1887,7 @@ ieioctl(ifp, command, data) #ifdef INET case AF_INET: ieinit(ifp->if_unit); - ((struct arpcom *)ifp)->ac_ipaddr = - IA_SIN(ifa)->sin_addr; - arpwhohas((struct arpcom *)ifp, &IA_SIN(ifa)->sin_addr); + arp_ifinit((struct arpcom *)ifp, ifa); break; #endif /* INET */ diff --git a/sys/i386/isa/if_is.c b/sys/i386/isa/if_is.c index fdb1c4e..b374c10 100644 --- a/sys/i386/isa/if_is.c +++ b/sys/i386/isa/if_is.c @@ -11,7 +11,7 @@ * of this software, nor does the author assume any responsibility * for damages incurred with its use. * - * $Id: if_is.c,v 1.31 1994/10/29 10:19:32 phk Exp $ + * $Id: if_is.c,v 1.32 1994/11/24 14:29:22 davidg Exp $ */ /* TODO @@ -945,15 +945,7 @@ is_ioctl(ifp, cmd, data) #ifdef INET case AF_INET: is_init(ifp->if_unit); /* before arpwhohas */ - /* - * See if another station has *our* IP address. - * i.e.: There is an address conflict! If a - * conflict exists, a message is sent to the - * console. - */ - ((struct arpcom *)ifp)->ac_ipaddr = - IA_SIN(ifa)->sin_addr; - arpwhohas((struct arpcom *)ifp, &IA_SIN(ifa)->sin_addr); + arp_ifinit((struct arpcom *)ifp, ifa); break; #endif #ifdef NS diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c index 1084ce3..f54b0ab 100644 --- a/sys/i386/isa/if_le.c +++ b/sys/i386/isa/if_le.c @@ -605,8 +605,7 @@ le_ioctl( #ifdef INET case AF_INET: { (*ifp->if_init)(ifp->if_unit); - ((struct arpcom *)ifp)->ac_ipaddr = IA_SIN(ifa)->sin_addr; - arpwhohas((struct arpcom *)ifp, &IA_SIN(ifa)->sin_addr); + arp_ifinit((struct arpcom *)ifp, ifa); break; } #endif /* INET */ @@ -834,7 +833,7 @@ le_multi_op( #define LEMAC_32K_MODE(mbase) (((mbase) >= 0x14) && ((mbase) <= 0x1F)) #define LEMAC_2K_MODE(mbase) ( (mbase) >= 0x40) -/* static int lemac_probe(le_softc_t *sc, const le_board_t *bd, int *msize); */ +static int lemac_probe(le_softc_t *sc, const le_board_t *bd, int *msize); static void lemac_init(int unit); static void lemac_start(struct ifnet *ifp); static void lemac_reset(IF_RESET_ARGS); @@ -847,10 +846,10 @@ static int lemac_read_eeprom(le_softc_t *sc); static void lemac_init_adapmem(le_softc_t *sc); static const le_mcbits_t lemac_allmulti_mctbl[16] = { - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, - 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, + 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, }; /* * An IRQ mapping table. Less space than switch statement. @@ -1354,7 +1353,7 @@ lemac_init_adapmem( * Start of DEPCA (DE200/DE201/DE202/DE422 etal) support. * */ -/* static int depca_probe(le_softc_t *sc, const le_board_t *bd, int *msize); */ +static int depca_probe(le_softc_t *sc, const le_board_t *bd, int *msize); static void depca_intr(le_softc_t *sc); static int lance_init_adapmem(le_softc_t *sc); static int lance_init_ring(le_softc_t *sc, ln_ring_t *rp, lance_ring_t *ri, diff --git a/sys/i386/isa/if_lnc.c b/sys/i386/isa/if_lnc.c index 311f3bd..96c7b05 100644 --- a/sys/i386/isa/if_lnc.c +++ b/sys/i386/isa/if_lnc.c @@ -1509,8 +1509,7 @@ lnc_ioctl(struct ifnet * ifp, int command, caddr_t data) #ifdef INET case AF_INET: lnc_init(ifp->if_unit); - ((struct arpcom *) ifp)->ac_ipaddr = IA_SIN(ifa)->sin_addr; - arpwhohas((struct arpcom *) ifp, &IA_SIN(ifa)->sin_addr); + arp_ifinit((struct arpcom *)ifp, ifa); break; #endif default: |