svn commit: r280623 - in projects/ifnet/sys: cam/scsi dev/usb i386/conf net sparc64/conf

[Gleb Smirnoff]

Author: glebius
Date: Wed Mar 25 16:05:59 2015
New Revision: 280623
URL: https://svnweb.freebsd.org/changeset/base/280623

Log:
  Merge head r257698 through r280622.

Modified:
  projects/ifnet/sys/cam/scsi/scsi_da.c
  projects/ifnet/sys/dev/usb/usb.h
  projects/ifnet/sys/i386/conf/NOTES
  projects/ifnet/sys/net/if_vlan.c
  projects/ifnet/sys/sparc64/conf/NOTES
Directory Properties:
  projects/ifnet/   (props changed)
  projects/ifnet/sys/   (props changed)

Modified: projects/ifnet/sys/cam/scsi/scsi_da.c
==============================================================================
--- projects/ifnet/sys/cam/scsi/scsi_da.c	Wed Mar 25 16:01:46 2015	(r280622)
+++ projects/ifnet/sys/cam/scsi/scsi_da.c	Wed Mar 25 16:05:59 2015	(r280623)
@@ -1182,6 +1182,13 @@ static struct da_quirk_entry da_quirk_ta
 		{ T_DIRECT, SIP_MEDIA_REMOVABLE, "Innostor", "Innostor*", "*" }, 
 		/*quirks*/DA_Q_NO_RC16
 	},
+	{
+		/*
+		 * MX-ES USB Drive by Mach Xtreme
+		 */
+		{ T_DIRECT, SIP_MEDIA_REMOVABLE, "MX", "MXUB3SES*", "*"},
+		/*quirks*/DA_Q_NO_RC16
+	},
 };
 
 static	disk_strategy_t	dastrategy;

Modified: projects/ifnet/sys/dev/usb/usb.h
==============================================================================
--- projects/ifnet/sys/dev/usb/usb.h	Wed Mar 25 16:01:46 2015	(r280622)
+++ projects/ifnet/sys/dev/usb/usb.h	Wed Mar 25 16:05:59 2015	(r280623)
@@ -542,6 +542,11 @@ struct usb_endpoint_descriptor {
 #define	UE_ISO_ADAPT	0x08
 #define	UE_ISO_SYNC	0x0c
 #define	UE_GET_ISO_TYPE(a)	((a) & UE_ISO_TYPE)
+#define	UE_ISO_USAGE	0x30
+#define	UE_ISO_USAGE_DATA	0x00
+#define	UE_ISO_USAGE_FEEDBACK	0x10
+#define	UE_ISO_USAGE_IMPLICT_FB	0x20
+#define	UE_GET_ISO_USAGE(a)	((a) & UE_ISO_USAGE)
 	uWord	wMaxPacketSize;
 #define	UE_ZERO_MPS 0xFFFF		/* for internal use only */
 	uByte	bInterval;

Modified: projects/ifnet/sys/i386/conf/NOTES
==============================================================================
--- projects/ifnet/sys/i386/conf/NOTES	Wed Mar 25 16:01:46 2015	(r280622)
+++ projects/ifnet/sys/i386/conf/NOTES	Wed Mar 25 16:05:59 2015	(r280623)
@@ -433,7 +433,7 @@ hint.atkbd.0.irq="1"
 
 # Options for atkbd:
 options 	ATKBD_DFLT_KEYMAP	# specify the built-in keymap
-makeoptions	ATKBD_DFLT_KEYMAP=jp.106
+makeoptions	ATKBD_DFLT_KEYMAP=fr.dvorak
 
 # `flags' for atkbd:
 #       0x01    Force detection of keyboard, else we always assume a keyboard

Modified: projects/ifnet/sys/net/if_vlan.c
==============================================================================
--- projects/ifnet/sys/net/if_vlan.c	Wed Mar 25 16:01:46 2015	(r280622)
+++ projects/ifnet/sys/net/if_vlan.c	Wed Mar 25 16:05:59 2015	(r280623)
@@ -1127,8 +1127,7 @@ vlan_input(struct ifnet *ifp, struct mbu
 	TRUNK_RUNLOCK(trunk);
 
 	m->m_pkthdr.rcvif = ifv->ifv_ifp;
-	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
-	if_inc_counter(ifp, IFCOUNTER_IBYTES, m->m_pkthdr.len);
+	if_inc_counter(ifv->ifv_ifp, IFCOUNTER_IPACKETS, 1);
 
 	/* Pass it back through the parent's input routine. */
 	(*ifp->if_input)(ifv->ifv_ifp, m);

Modified: projects/ifnet/sys/sparc64/conf/NOTES
==============================================================================
--- projects/ifnet/sys/sparc64/conf/NOTES	Wed Mar 25 16:01:46 2015	(r280622)
+++ projects/ifnet/sys/sparc64/conf/NOTES	Wed Mar 25 16:05:59 2015	(r280623)
@@ -67,7 +67,7 @@ device		atkbd
 
 # Options for atkbd:
 options 	ATKBD_DFLT_KEYMAP	# specify the built-in keymap
-makeoptions	ATKBD_DFLT_KEYMAP=jp.106
+makeoptions	ATKBD_DFLT_KEYMAP=fr.dvorak
 
 # `flags' for atkbd:
 #       0x01    Force detection of keyboard, else we always assume a keyboard
@@ -84,7 +84,7 @@ options 	SUNKBD_EMULATE_ATKBD	# allows t
 					# in share/syscons/keymaps, required
 					# for SUNKBD_DFLT_KEYMAP and kbdmux
 options 	SUNKBD_DFLT_KEYMAP	# specify the built-in keymap
-makeoptions	SUNKBD_DFLT_KEYMAP=jp.106
+makeoptions	SUNKBD_DFLT_KEYMAP=fr.dvorak
 
 

 #####################################################################