[Midnightbsd-cvs] src [10035] trunk/sys/dev/vx: sync

[laffer1 at midnightbsd.org]

Revision: 10035
          http://svnweb.midnightbsd.org/src/?rev=10035
Author:   laffer1
Date:     2018-05-27 18:26:13 -0400 (Sun, 27 May 2018)
Log Message:
-----------
sync

Modified Paths:
--------------
    trunk/sys/dev/vx/if_vx.c
    trunk/sys/dev/vx/if_vx_eisa.c
    trunk/sys/dev/vx/if_vx_pci.c
    trunk/sys/dev/vx/if_vxreg.h
    trunk/sys/dev/vx/if_vxvar.h

Modified: trunk/sys/dev/vx/if_vx.c
===================================================================
--- trunk/sys/dev/vx/if_vx.c	2018-05-27 22:25:58 UTC (rev 10034)
+++ trunk/sys/dev/vx/if_vx.c	2018-05-27 22:26:13 UTC (rev 10035)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 1994 Herb Peyerl <hpeyerl at novatel.ca>
  * All rights reserved.
@@ -31,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/vx/if_vx.c 243857 2012-12-04 09:32:43Z glebius $");
 
 /*
  * Created from if_ep.c driver by Fred Gray (fgray at rice.edu) to support
@@ -188,7 +189,6 @@
 		eaddr[(i << 1) + 1] = x;
 	}
 
-	ifp->if_mtu = ETHERMTU;
 	ifp->if_snd.ifq_maxlen = ifqmaxlen;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_start = vx_start;

Modified: trunk/sys/dev/vx/if_vx_eisa.c
===================================================================
--- trunk/sys/dev/vx/if_vx_eisa.c	2018-05-27 22:25:58 UTC (rev 10034)
+++ trunk/sys/dev/vx/if_vx_eisa.c	2018-05-27 22:26:13 UTC (rev 10035)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (C) 1996 Naoki Hamada <nao at tom-yam.or.jp>
  * All rights reserved.
@@ -29,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/vx/if_vx_eisa.c 246128 2013-01-30 18:01:20Z sbz $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -177,7 +178,7 @@
 	DEVMETHOD(device_probe, vx_eisa_probe),
 	DEVMETHOD(device_attach, vx_eisa_attach),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t vx_eisa_driver = {

Modified: trunk/sys/dev/vx/if_vx_pci.c
===================================================================
--- trunk/sys/dev/vx/if_vx_pci.c	2018-05-27 22:25:58 UTC (rev 10034)
+++ trunk/sys/dev/vx/if_vx_pci.c	2018-05-27 22:26:13 UTC (rev 10035)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (C) 1996 Naoki Hamada <nao at tom-yam.or.jp>
  * All rights reserved.
@@ -28,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/vx/if_vx_pci.c 246128 2013-01-30 18:01:20Z sbz $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -61,7 +62,7 @@
 	DEVMETHOD(device_attach, vx_pci_attach),
 	DEVMETHOD(device_shutdown, vx_pci_shutdown),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t vx_driver = {

Modified: trunk/sys/dev/vx/if_vxreg.h
===================================================================
--- trunk/sys/dev/vx/if_vxreg.h	2018-05-27 22:25:58 UTC (rev 10034)
+++ trunk/sys/dev/vx/if_vxreg.h	2018-05-27 22:26:13 UTC (rev 10035)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 1993 Herb Peyerl (hpeyerl at novatel.ca) All rights reserved.
  *
@@ -19,7 +20,7 @@
  * NEGLIGENCE OR OTHERWISE) 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/vx/if_vxreg.h 218909 2011-02-21 09:01:34Z brucec $
  */
 
 /*

Modified: trunk/sys/dev/vx/if_vxvar.h
===================================================================
--- trunk/sys/dev/vx/if_vxvar.h	2018-05-27 22:25:58 UTC (rev 10034)
+++ trunk/sys/dev/vx/if_vxvar.h	2018-05-27 22:26:13 UTC (rev 10035)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 1993 Herb Peyerl (hpeyerl at novatel.ca) All rights reserved.
  *
@@ -19,7 +20,7 @@
  * NEGLIGENCE OR OTHERWISE) 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/vx/if_vxvar.h 199559 2009-11-19 22:06:40Z jhb $
  *
  October 2, 1994