Deleted Added
full compact
if_wi.c (82453) if_wi.c (83130)
1/*
2 * Copyright (c) 1997, 1998, 1999
3 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 102 unchanged lines hidden (view full) ---

111
112#include <dev/wi/if_wavelan_ieee.h>
113#include <dev/wi/if_wireg.h>
114
115#include "card_if.h"
116
117#if !defined(lint)
118static const char rcsid[] =
1/*
2 * Copyright (c) 1997, 1998, 1999
3 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 102 unchanged lines hidden (view full) ---

111
112#include <dev/wi/if_wavelan_ieee.h>
113#include <dev/wi/if_wireg.h>
114
115#include "card_if.h"
116
117#if !defined(lint)
118static const char rcsid[] =
119 "$FreeBSD: head/sys/dev/wi/if_wi.c 82453 2001-08-28 05:26:43Z imp $";
119 "$FreeBSD: head/sys/dev/wi/if_wi.c 83130 2001-09-06 02:40:43Z jlemon $";
120#endif
121
122#ifdef foo
123static u_int8_t wi_mcast_addr[6] = { 0x01, 0x60, 0x1D, 0x00, 0x01, 0x00 };
124#endif
125
126static void wi_intr __P((void *));
127static void wi_reset __P((struct wi_softc *));

--- 1160 unchanged lines hidden (view full) ---

1288 struct sockaddr_dl *sdl;
1289 struct ifaddr *ifa;
1290 struct ifnet *ifp;
1291
1292 ifp = &sc->arpcom.ac_if;
1293
1294 switch(wreq->wi_type) {
1295 case WI_RID_MAC_NODE:
120#endif
121
122#ifdef foo
123static u_int8_t wi_mcast_addr[6] = { 0x01, 0x60, 0x1D, 0x00, 0x01, 0x00 };
124#endif
125
126static void wi_intr __P((void *));
127static void wi_reset __P((struct wi_softc *));

--- 1160 unchanged lines hidden (view full) ---

1288 struct sockaddr_dl *sdl;
1289 struct ifaddr *ifa;
1290 struct ifnet *ifp;
1291
1292 ifp = &sc->arpcom.ac_if;
1293
1294 switch(wreq->wi_type) {
1295 case WI_RID_MAC_NODE:
1296 ifa = ifnet_addrs[ifp->if_index - 1];
1296 ifa = ifaddr_byindex(ifp->if_index);
1297 sdl = (struct sockaddr_dl *)ifa->ifa_addr;
1298 bcopy((char *)&wreq->wi_val, (char *)&sc->arpcom.ac_enaddr,
1299 ETHER_ADDR_LEN);
1300 bcopy((char *)&wreq->wi_val, LLADDR(sdl), ETHER_ADDR_LEN);
1301 break;
1302 case WI_RID_PORTTYPE:
1303 sc->wi_ptype = wreq->wi_val[0];
1304 break;

--- 1076 unchanged lines hidden ---
1297 sdl = (struct sockaddr_dl *)ifa->ifa_addr;
1298 bcopy((char *)&wreq->wi_val, (char *)&sc->arpcom.ac_enaddr,
1299 ETHER_ADDR_LEN);
1300 bcopy((char *)&wreq->wi_val, LLADDR(sdl), ETHER_ADDR_LEN);
1301 break;
1302 case WI_RID_PORTTYPE:
1303 sc->wi_ptype = wreq->wi_val[0];
1304 break;

--- 1076 unchanged lines hidden ---