Deleted Added
full compact
if_fe.c (106937) if_fe.c (109623)
1/*
2 * All Rights Reserved, Copyright (C) Fujitsu Limited 1995
3 *
4 * This software may be used, modified, copied, distributed, and sold, in
5 * both source and binary form provided that the above copyright, these
6 * terms and the following disclaimer are retained. The name of the author
7 * and/or the contributor may not be used to endorse or promote products
8 * derived from this software without specific prior written permission.

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

16 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION.
17 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
18 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
19 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
20 * SUCH DAMAGE.
21 */
22
23/*
1/*
2 * All Rights Reserved, Copyright (C) Fujitsu Limited 1995
3 *
4 * This software may be used, modified, copied, distributed, and sold, in
5 * both source and binary form provided that the above copyright, these
6 * terms and the following disclaimer are retained. The name of the author
7 * and/or the contributor may not be used to endorse or promote products
8 * derived from this software without specific prior written permission.

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

16 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION.
17 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
18 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
19 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
20 * SUCH DAMAGE.
21 */
22
23/*
24 * $FreeBSD: head/sys/dev/fe/if_fe.c 106937 2002-11-14 23:54:55Z sam $
24 * $FreeBSD: head/sys/dev/fe/if_fe.c 109623 2003-01-21 08:56:16Z alfred $
25 *
26 * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
27 * Contributed by M. Sekiguchi. <seki@sysrap.cs.fujitsu.co.jp>
28 *
29 * This version is intended to be a generic template for various
30 * MB86960A/MB86965A based Ethernet cards. It currently supports
31 * Fujitsu FMV-180 series for ISA and Allied-Telesis AT1700/RE2000
32 * series for ISA, as well as Fujitsu MBH10302 PC card.

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

1842 * allocate a cluster. For a packet of a size between
1843 * (MHLEN - 2) to (MINCLSIZE - 2), our code violates the rule...
1844 * On the other hand, the current code is short, simple,
1845 * and fast, however. It does no harmful thing, just waists
1846 * some memory. Any comments? FIXME.
1847 */
1848
1849 /* Allocate an mbuf with packet header info. */
25 *
26 * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
27 * Contributed by M. Sekiguchi. <seki@sysrap.cs.fujitsu.co.jp>
28 *
29 * This version is intended to be a generic template for various
30 * MB86960A/MB86965A based Ethernet cards. It currently supports
31 * Fujitsu FMV-180 series for ISA and Allied-Telesis AT1700/RE2000
32 * series for ISA, as well as Fujitsu MBH10302 PC card.

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

1842 * allocate a cluster. For a packet of a size between
1843 * (MHLEN - 2) to (MINCLSIZE - 2), our code violates the rule...
1844 * On the other hand, the current code is short, simple,
1845 * and fast, however. It does no harmful thing, just waists
1846 * some memory. Any comments? FIXME.
1847 */
1848
1849 /* Allocate an mbuf with packet header info. */
1850 MGETHDR(m, M_DONTWAIT, MT_DATA);
1850 MGETHDR(m, M_NOWAIT, MT_DATA);
1851 if (m == NULL)
1852 return -1;
1853
1854 /* Attach a cluster if this packet doesn't fit in a normal mbuf. */
1855 if (len > MHLEN - NFS_MAGIC_OFFSET) {
1851 if (m == NULL)
1852 return -1;
1853
1854 /* Attach a cluster if this packet doesn't fit in a normal mbuf. */
1855 if (len > MHLEN - NFS_MAGIC_OFFSET) {
1856 MCLGET(m, M_DONTWAIT);
1856 MCLGET(m, M_NOWAIT);
1857 if (!(m->m_flags & M_EXT)) {
1858 m_freem(m);
1859 return -1;
1860 }
1861 }
1862
1863 /* Initialize packet header info. */
1864 m->m_pkthdr.rcvif = ifp;

--- 390 unchanged lines hidden ---
1857 if (!(m->m_flags & M_EXT)) {
1858 m_freem(m);
1859 return -1;
1860 }
1861 }
1862
1863 /* Initialize packet header info. */
1864 m->m_pkthdr.rcvif = ifp;

--- 390 unchanged lines hidden ---