if_wi.c (75229) | if_wi.c (75275) |
---|---|
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 --- 97 unchanged lines hidden (view full) --- 106 107#include <dev/wi/if_wavelan_ieee.h> 108#include <dev/wi/if_wireg.h> 109 110#include "card_if.h" 111 112#if !defined(lint) 113static 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 --- 97 unchanged lines hidden (view full) --- 106 107#include <dev/wi/if_wavelan_ieee.h> 108#include <dev/wi/if_wireg.h> 109 110#include "card_if.h" 111 112#if !defined(lint) 113static const char rcsid[] = |
114 "$FreeBSD: head/sys/dev/wi/if_wi.c 75229 2001-04-05 09:47:07Z alfred $"; | 114 "$FreeBSD: head/sys/dev/wi/if_wi.c 75275 2001-04-06 21:48:19Z alfred $"; |
115#endif 116 117#ifdef foo 118static u_int8_t wi_mcast_addr[6] = { 0x01, 0x60, 0x1D, 0x00, 0x01, 0x00 }; 119#endif 120 121static void wi_intr __P((void *)); 122static void wi_reset __P((struct wi_softc *)); --- 1391 unchanged lines hidden (view full) --- 1514 bzero((char *)&tx_frame, sizeof(tx_frame)); 1515 id = sc->wi_tx_data_id; 1516 eh = mtod(m0, struct ether_header *); 1517 1518 /* 1519 * Use RFC1042 encoding for IP and ARP datagrams, 1520 * 802.3 for anything else. 1521 */ | 115#endif 116 117#ifdef foo 118static u_int8_t wi_mcast_addr[6] = { 0x01, 0x60, 0x1D, 0x00, 0x01, 0x00 }; 119#endif 120 121static void wi_intr __P((void *)); 122static void wi_reset __P((struct wi_softc *)); --- 1391 unchanged lines hidden (view full) --- 1514 bzero((char *)&tx_frame, sizeof(tx_frame)); 1515 id = sc->wi_tx_data_id; 1516 eh = mtod(m0, struct ether_header *); 1517 1518 /* 1519 * Use RFC1042 encoding for IP and ARP datagrams, 1520 * 802.3 for anything else. 1521 */ |
1522 if (ntohs(eh->ether_type) > 1518) { | 1522 if (ntohs(eh->ether_type) > ETHER_MAX_LEN) { |
1523 bcopy((char *)&eh->ether_dhost, 1524 (char *)&tx_frame.wi_addr1, ETHER_ADDR_LEN); 1525 bcopy((char *)&eh->ether_shost, 1526 (char *)&tx_frame.wi_addr2, ETHER_ADDR_LEN); 1527 bcopy((char *)&eh->ether_dhost, 1528 (char *)&tx_frame.wi_dst_addr, ETHER_ADDR_LEN); 1529 bcopy((char *)&eh->ether_shost, 1530 (char *)&tx_frame.wi_src_addr, ETHER_ADDR_LEN); --- 408 unchanged lines hidden --- | 1523 bcopy((char *)&eh->ether_dhost, 1524 (char *)&tx_frame.wi_addr1, ETHER_ADDR_LEN); 1525 bcopy((char *)&eh->ether_shost, 1526 (char *)&tx_frame.wi_addr2, ETHER_ADDR_LEN); 1527 bcopy((char *)&eh->ether_dhost, 1528 (char *)&tx_frame.wi_dst_addr, ETHER_ADDR_LEN); 1529 bcopy((char *)&eh->ether_shost, 1530 (char *)&tx_frame.wi_src_addr, ETHER_ADDR_LEN); --- 408 unchanged lines hidden --- |