From owner-svn-src-projects@FreeBSD.ORG Wed Mar 25 16:06:02 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1B75AED3; Wed, 25 Mar 2015 16:06:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 059F6C0E; Wed, 25 Mar 2015 16:06:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2PG612J056184; Wed, 25 Mar 2015 16:06:01 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2PG60je056172; Wed, 25 Mar 2015 16:06:00 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201503251606.t2PG60je056172@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Wed, 25 Mar 2015 16:06:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r280623 - in projects/ifnet/sys: cam/scsi dev/usb i386/conf net sparc64/conf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Mar 2015 16:06:02 -0000 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 #####################################################################