[kernel] r16269 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/features/all patches/series

[Ben Hutchings]

Author: benh
Date: Sun Sep 12 17:17:58 2010
New Revision: 16269

Log:
Update ipheth

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/ipheth-remove-incorrect-devtype-to-WWAN.patch
   dists/sid/linux-2.6/debian/patches/features/all/ipheth-add-support-for-iPhone-4.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/22

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sun Sep 12 16:35:49 2010	(r16268)
+++ dists/sid/linux-2.6/debian/changelog	Sun Sep 12 17:17:58 2010	(r16269)
@@ -51,6 +51,8 @@
   * r8169: Remove MODULE_FIRMWARE declarations since the firmware is
     non-essential and we do not distribute it
   * [x86] HPET: unmap unused I/O space
+  * ipheth: add support for iPhone 4
+  * ipheth: remove incorrect devtype of WWAN
 
   [ Bastian Blank ]
   * Use Breaks instead of Conflicts.

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/ipheth-remove-incorrect-devtype-to-WWAN.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/ipheth-remove-incorrect-devtype-to-WWAN.patch	Sun Sep 12 17:17:58 2010	(r16269)
@@ -0,0 +1,57 @@
+From: Dan Williams <dcbw at redhat.com>
+Date: Wed, 8 Sep 2010 07:50:47 +0000
+Subject: [PATCH 2/2] ipheth: remove incorrect devtype to WWAN
+
+commit c9cedbba0fc591e1c0587f838932ca3f3c6fec57 upstream.
+
+The 'wwan' devtype is meant for devices that require preconfiguration
+and *every* time setup before the ethernet interface can be used, like
+cellular modems which require a series of setup commands on serial ports
+or other mechanisms before the ethernet interface will handle packets.
+
+As ipheth only requires one-per-hotplug pairing setup with no
+preconfiguration (like APN, phone #, etc) and the network interface is
+usable at any time after that initial setup, remove the incorrect
+devtype wwan.
+
+Signed-off-by: Dan Williams <dcbw at redhat.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/net/usb/ipheth.c |    7 +------
+ 1 files changed, 1 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c
+index 8ed30fa..b2bcf99 100644
+--- a/drivers/net/usb/ipheth.c
++++ b/drivers/net/usb/ipheth.c
+@@ -429,10 +429,6 @@ static const struct net_device_ops ipheth_netdev_ops = {
+ 	.ndo_get_stats = &ipheth_stats,
+ };
+ 
+-static struct device_type ipheth_type = {
+-	.name	= "wwan",
+-};
+-
+ static int ipheth_probe(struct usb_interface *intf,
+ 			const struct usb_device_id *id)
+ {
+@@ -450,7 +446,7 @@ static int ipheth_probe(struct usb_interface *intf,
+ 
+ 	netdev->netdev_ops = &ipheth_netdev_ops;
+ 	netdev->watchdog_timeo = IPHETH_TX_TIMEOUT;
+-	strcpy(netdev->name, "wwan%d");
++	strcpy(netdev->name, "eth%d");
+ 
+ 	dev = netdev_priv(netdev);
+ 	dev->udev = udev;
+@@ -500,7 +496,6 @@ static int ipheth_probe(struct usb_interface *intf,
+ 
+ 	SET_NETDEV_DEV(netdev, &intf->dev);
+ 	SET_ETHTOOL_OPS(netdev, &ops);
+-	SET_NETDEV_DEVTYPE(netdev, &ipheth_type);
+ 
+ 	retval = register_netdev(netdev);
+ 	if (retval) {
+-- 
+1.7.1
+

Added: dists/sid/linux-2.6/debian/patches/features/all/ipheth-add-support-for-iPhone-4.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/all/ipheth-add-support-for-iPhone-4.patch	Sun Sep 12 17:17:58 2010	(r16269)
@@ -0,0 +1,40 @@
+From: Jens Axboe <jaxboe at fusionio.com>
+Date: Mon, 23 Aug 2010 12:39:29 +0200
+Subject: [PATCH 1/2] ipheth: add support for iPhone 4
+
+commit f95d76ab82c381ce2221fbe75f331ff1478732db upstream.
+
+This adds support for the iPhone 4 to the ipheth driver.
+
+Acked-by: Diego Giagio <diego at giagio.com>
+Signed-off-by: Jens Axboe <jaxboe at fusionio.com>
+---
+ drivers/net/usb/ipheth.c |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c
+index 08e7b6a..8ed30fa 100644
+--- a/drivers/net/usb/ipheth.c
++++ b/drivers/net/usb/ipheth.c
+@@ -58,6 +58,7 @@
+ #define USB_PRODUCT_IPHONE      0x1290
+ #define USB_PRODUCT_IPHONE_3G   0x1292
+ #define USB_PRODUCT_IPHONE_3GS  0x1294
++#define USB_PRODUCT_IPHONE_4	0x1297
+ 
+ #define IPHETH_USBINTF_CLASS    255
+ #define IPHETH_USBINTF_SUBCLASS 253
+@@ -92,6 +93,10 @@ static struct usb_device_id ipheth_table[] = {
+ 		USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_3GS,
+ 		IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
+ 		IPHETH_USBINTF_PROTO) },
++	{ USB_DEVICE_AND_INTERFACE_INFO(
++		USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_4,
++		IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
++		IPHETH_USBINTF_PROTO) },
+ 	{ }
+ };
+ MODULE_DEVICE_TABLE(usb, ipheth_table);
+-- 
+1.7.1
+

Modified: dists/sid/linux-2.6/debian/patches/series/22
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/22	Sun Sep 12 16:35:49 2010	(r16268)
+++ dists/sid/linux-2.6/debian/patches/series/22	Sun Sep 12 17:17:58 2010	(r16269)
@@ -121,3 +121,5 @@
 + bugfix/all/irda-correctly-clean-up-self-ias_obj-on-irda_bind-failure.patch
 + bugfix/all/drm-nouveau-nva3-noaccel.patch
 + bugfix/x86/HPET-unmap-unused-I-O-space.patch
++ features/all/ipheth-add-support-for-iPhone-4.patch
++ bugfix/all/ipheth-remove-incorrect-devtype-to-WWAN.patch