| if_vx.c (69732) | if_vx.c (78508) |
|---|---|
| 1/* 2 * Copyright (c) 1994 Herb Peyerl <hpeyerl@novatel.ca> 3 * 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 --- 13 unchanged lines hidden (view full) --- 22 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 23 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 24 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 28 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * | 1/* 2 * Copyright (c) 1994 Herb Peyerl <hpeyerl@novatel.ca> 3 * 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 --- 13 unchanged lines hidden (view full) --- 22 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 23 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 24 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 28 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * |
| 30 * $FreeBSD: head/sys/dev/vx/if_vx.c 69732 2000-12-07 23:30:51Z wpaul $ | 30 * $FreeBSD: head/sys/dev/vx/if_vx.c 78508 2001-06-20 19:48:35Z bmilekic $ |
| 31 * 32 */ 33 34/* 35 * Created from if_ep.c driver by Fred Gray (fgray@rice.edu) to support 36 * the 3c590 family. 37 */ 38 --- 647 unchanged lines hidden (view full) --- 686 goto abort; 687 } 688 689 ++ifp->if_ipackets; 690 691 { 692 struct mbuf *m0; 693 | 31 * 32 */ 33 34/* 35 * Created from if_ep.c driver by Fred Gray (fgray@rice.edu) to support 36 * the 3c590 family. 37 */ 38 --- 647 unchanged lines hidden (view full) --- 686 goto abort; 687 } 688 689 ++ifp->if_ipackets; 690 691 { 692 struct mbuf *m0; 693 |
| 694 m0 = m_devget(mtod(m, char *) - ETHER_ALIGN, 695 m->m_pkthdr.len + ETHER_ALIGN, 0, ifp, NULL); 696 | 694 m0 = m_devget(mtod(m, char *), m->m_pkthdr.len, ETHER_ALIGN, ifp, NULL); |
| 697 if (m0 == NULL) { 698 ifp->if_ierrors++; 699 goto abort; 700 } 701 | 695 if (m0 == NULL) { 696 ifp->if_ierrors++; 697 goto abort; 698 } 699 |
| 702 m_adj(m0, ETHER_ALIGN); | |
| 703 m_freem(m); 704 m = m0; 705 } 706 707 /* We assume the header fit entirely in one mbuf. */ 708 eh = mtod(m, struct ether_header *); 709 710 /* --- 331 unchanged lines hidden --- | 700 m_freem(m); 701 m = m0; 702 } 703 704 /* We assume the header fit entirely in one mbuf. */ 705 eh = mtod(m, struct ether_header *); 706 707 /* --- 331 unchanged lines hidden --- |