[Midnightbsd-cvs] src [10063] trunk/sys/dev/ti: sync

[laffer1 at midnightbsd.org]

Revision: 10063
          http://svnweb.midnightbsd.org/src/?rev=10063
Author:   laffer1
Date:     2018-05-27 19:01:30 -0400 (Sun, 27 May 2018)
Log Message:
-----------
sync

Modified Paths:
--------------
    trunk/sys/dev/ti/if_ti.c
    trunk/sys/dev/ti/if_tireg.h
    trunk/sys/dev/ti/ti_fw.h
    trunk/sys/dev/ti/ti_fw2.h

Modified: trunk/sys/dev/ti/if_ti.c
===================================================================
--- trunk/sys/dev/ti/if_ti.c	2018-05-27 23:01:15 UTC (rev 10062)
+++ trunk/sys/dev/ti/if_ti.c	2018-05-27 23:01:30 UTC (rev 10063)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 1997, 1998, 1999
  *	Bill Paul <wpaul at ctr.columbia.edu>.  All rights reserved.
@@ -77,7 +78,7 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/ti/if_ti.c 291202 2015-11-23 13:36:41Z hselasky $");
 
 #include "opt_ti.h"
 
@@ -1562,7 +1563,6 @@
 	struct mbuf *m[3] = {NULL, NULL, NULL};
 	struct ti_rx_desc_ext *r;
 	vm_page_t frame;
-	static int color;
 	/* 1 extra buf to make nobufs easy*/
 	struct sf_buf *sf[3] = {NULL, NULL, NULL};
 	int i;
@@ -1605,7 +1605,7 @@
 				    "failed -- packet dropped!\n");
 				goto nobufs;
 			}
-			frame = vm_page_alloc(NULL, color++,
+			frame = vm_page_alloc(NULL, 0,
 			    VM_ALLOC_INTERRUPT | VM_ALLOC_NOOBJ |
 			    VM_ALLOC_WIRED);
 			if (frame == NULL) {
@@ -3160,24 +3160,6 @@
 			break;
 
 		/*
-		 * XXX
-		 * safety overkill.  If this is a fragmented packet chain
-		 * with delayed TCP/UDP checksums, then only encapsulate
-		 * it if we have enough descriptors to handle the entire
-		 * chain at once.
-		 * (paranoia -- may not actually be needed)
-		 */
-		if (m_head->m_flags & M_FIRSTFRAG &&
-		    m_head->m_pkthdr.csum_flags & (CSUM_DELAY_DATA)) {
-			if ((TI_TX_RING_CNT - sc->ti_txcnt) <
-			    m_head->m_pkthdr.csum_data + 16) {
-				IFQ_DRV_PREPEND(&ifp->if_snd, m_head);
-				ifp->if_drv_flags |= IFF_DRV_OACTIVE;
-				break;
-			}
-		}
-
-		/*
 		 * Pack the data into the transmit ring. If we
 		 * don't have room, set the OACTIVE flag and wait
 		 * for the NIC to drain the ring.
@@ -3354,7 +3336,7 @@
 
 	sc = ifp->if_softc;
 	TI_LOCK(sc);
-	error = ti_ifmedia_upd(ifp);
+	error = ti_ifmedia_upd_locked(sc);
 	TI_UNLOCK(sc);
 
 	return (error);

Modified: trunk/sys/dev/ti/if_tireg.h
===================================================================
--- trunk/sys/dev/ti/if_tireg.h	2018-05-27 23:01:15 UTC (rev 10062)
+++ trunk/sys/dev/ti/if_tireg.h	2018-05-27 23:01:30 UTC (rev 10063)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 1997, 1998, 1999
  *	Bill Paul <wpaul at ctr.columbia.edu>.  All rights reserved.
@@ -29,7 +30,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/ti/if_tireg.h 227512 2011-11-14 20:38:14Z yongari $
  */
 
 /*

Modified: trunk/sys/dev/ti/ti_fw.h
===================================================================
--- trunk/sys/dev/ti/ti_fw.h	2018-05-27 23:01:15 UTC (rev 10062)
+++ trunk/sys/dev/ti/ti_fw.h	2018-05-27 23:01:30 UTC (rev 10063)
@@ -1,8 +1,9 @@
+/* $MidnightBSD$ */
 /*
  * Firmware for Alteon Tigon 1 chip.
  * Generated by genfw.c
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/ti/ti_fw.h 98849 2002-06-26 03:37:47Z ken $
  */
 static int tigonFwReleaseMajor = 0xc;
 static int tigonFwReleaseMinor = 0x4;

Modified: trunk/sys/dev/ti/ti_fw2.h
===================================================================
--- trunk/sys/dev/ti/ti_fw2.h	2018-05-27 23:01:15 UTC (rev 10062)
+++ trunk/sys/dev/ti/ti_fw2.h	2018-05-27 23:01:30 UTC (rev 10063)
@@ -1,8 +1,9 @@
+/* $MidnightBSD$ */
 /*
  * Generated by Ken's special genfw.c
  * Built on Wed Aug  2 17:21:09 MDT 2000 by ken at roadwarrior.plutotech.com
  * OS: FreeBSD 5.0-CURRENT
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/ti/ti_fw2.h 98849 2002-06-26 03:37:47Z ken $
  */
 static int tigon2FwReleaseMajor = 0xc;
 static int tigon2FwReleaseMinor = 0x4;