Deleted Added
full compact
if_an.c (78639) if_an.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

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

24 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
30 * THE POSSIBILITY OF SUCH DAMAGE.
31 *
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

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

24 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
30 * THE POSSIBILITY OF SUCH DAMAGE.
31 *
32 * $FreeBSD: head/sys/dev/an/if_an.c 78639 2001-06-22 23:35:24Z brooks $
32 * $FreeBSD: head/sys/dev/an/if_an.c 83130 2001-09-06 02:40:43Z jlemon $
33 */
34
35/*
36 * Aironet 4500/4800 802.11 PCMCIA/ISA/PCI driver for FreeBSD.
37 *
38 * Written by Bill Paul <wpaul@ctr.columbia.edu>
39 * Electrical Engineering Department
40 * Columbia University, New York City

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

127
128#include <machine/md_var.h>
129
130#include <dev/an/if_aironet_ieee.h>
131#include <dev/an/if_anreg.h>
132
133#if !defined(lint)
134static const char rcsid[] =
33 */
34
35/*
36 * Aironet 4500/4800 802.11 PCMCIA/ISA/PCI driver for FreeBSD.
37 *
38 * Written by Bill Paul <wpaul@ctr.columbia.edu>
39 * Electrical Engineering Department
40 * Columbia University, New York City

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

127
128#include <machine/md_var.h>
129
130#include <dev/an/if_aironet_ieee.h>
131#include <dev/an/if_anreg.h>
132
133#if !defined(lint)
134static const char rcsid[] =
135 "$FreeBSD: head/sys/dev/an/if_an.c 78639 2001-06-22 23:35:24Z brooks $";
135 "$FreeBSD: head/sys/dev/an/if_an.c 83130 2001-09-06 02:40:43Z jlemon $";
136#endif
137
138/* These are global because we need them in sys/pci/if_an_p.c. */
139static void an_reset __P((struct an_softc *));
140static int an_ioctl __P((struct ifnet *, u_long, caddr_t));
141static void an_init __P((void *));
142static int an_init_tx_ring __P((struct an_softc *));
143static void an_start __P((struct ifnet *));

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

996 struct an_ltv_gen *sp;
997
998 ifp = &sc->arpcom.ac_if;
999
1000 switch (areq->an_type) {
1001 case AN_RID_GENCONFIG:
1002 cfg = (struct an_ltv_genconfig *)areq;
1003
136#endif
137
138/* These are global because we need them in sys/pci/if_an_p.c. */
139static void an_reset __P((struct an_softc *));
140static int an_ioctl __P((struct ifnet *, u_long, caddr_t));
141static void an_init __P((void *));
142static int an_init_tx_ring __P((struct an_softc *));
143static void an_start __P((struct ifnet *));

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

996 struct an_ltv_gen *sp;
997
998 ifp = &sc->arpcom.ac_if;
999
1000 switch (areq->an_type) {
1001 case AN_RID_GENCONFIG:
1002 cfg = (struct an_ltv_genconfig *)areq;
1003
1004 ifa = ifnet_addrs[ifp->if_index - 1];
1004 ifa = ifaddr_byindex(ifp->if_index);
1005 sdl = (struct sockaddr_dl *)ifa->ifa_addr;
1006 bcopy((char *)&cfg->an_macaddr, (char *)&sc->arpcom.ac_enaddr,
1007 ETHER_ADDR_LEN);
1008 bcopy((char *)&cfg->an_macaddr, LLADDR(sdl), ETHER_ADDR_LEN);
1009
1010 bcopy((char *)cfg, (char *)&sc->an_config,
1011 sizeof(struct an_ltv_genconfig));
1012 break;

--- 1095 unchanged lines hidden ---
1005 sdl = (struct sockaddr_dl *)ifa->ifa_addr;
1006 bcopy((char *)&cfg->an_macaddr, (char *)&sc->arpcom.ac_enaddr,
1007 ETHER_ADDR_LEN);
1008 bcopy((char *)&cfg->an_macaddr, LLADDR(sdl), ETHER_ADDR_LEN);
1009
1010 bcopy((char *)cfg, (char *)&sc->an_config,
1011 sizeof(struct an_ltv_genconfig));
1012 break;

--- 1095 unchanged lines hidden ---