From owner-svn-src-all@FreeBSD.ORG  Wed May 29 20:36:53 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 141CD88F;
 Wed, 29 May 2013 20:36:53 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 06715832;
 Wed, 29 May 2013 20:36:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4TKaqPv040498;
 Wed, 29 May 2013 20:36:52 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4TKaqec040496;
 Wed, 29 May 2013 20:36:52 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201305292036.r4TKaqec040496@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Wed, 29 May 2013 20:36:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251109 - in head/sys/dev/usb: . net
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 May 2013 20:36:53 -0000

Author: eadler
Date: Wed May 29 20:36:51 2013
New Revision: 251109
URL: http://svnweb.freebsd.org/changeset/base/251109

Log:
  Add support for tethering on the iPhone 4S
  
  PR:	usb/179078
  Submitted by:	Christopher Sean Hilton <chris@vindaloo.com>
  MFC After:	1 week

Modified:
  head/sys/dev/usb/net/if_ipheth.c
  head/sys/dev/usb/usbdevs

Modified: head/sys/dev/usb/net/if_ipheth.c
==============================================================================
--- head/sys/dev/usb/net/if_ipheth.c	Wed May 29 19:41:36 2013	(r251108)
+++ head/sys/dev/usb/net/if_ipheth.c	Wed May 29 20:36:51 2013	(r251109)
@@ -161,6 +161,9 @@ static const STRUCT_USB_HOST_ID ipheth_d
 	{IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_4,
 	    IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
 	    IPHETH_USBINTF_PROTO)},
+	{IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_4S,
+	    IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
+	    IPHETH_USBINTF_PROTO)},
 	{IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_5,
 	    IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
 	    IPHETH_USBINTF_PROTO)},

Modified: head/sys/dev/usb/usbdevs
==============================================================================
--- head/sys/dev/usb/usbdevs	Wed May 29 19:41:36 2013	(r251108)
+++ head/sys/dev/usb/usbdevs	Wed May 29 20:36:51 2013	(r251109)
@@ -1087,6 +1087,7 @@ product APPLE IPOD_TOUCH	0x1291	iPod Tou
 product APPLE IPHONE_3G		0x1292	iPhone 3G
 product APPLE IPHONE_3GS	0x1294	iPhone 3GS
 product APPLE IPHONE_4		0x1297	iPhone 4
+product APPLE IPHONE_4S		0x12a0	iPhone 4S
 product APPLE IPHONE_5		0x12a8  iPhone 5
 product APPLE IPAD		0x129a	iPad
 product APPLE ETHERNET		0x1402	Ethernet A1277