diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-03 12:39:13 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-03 12:39:13 -0700 |
| commit | 0cf87ad084e214594d9ab5aa5efc8837d98a00dd (patch) | |
| tree | 5a7b2d58eb6012d903d4e8a4fef71915df0c824f | |
| parent | a6323a9903e58a055d0d962cc4f14c4dda407a57 (diff) | |
| download | patches-0cf87ad084e214594d9ab5aa5efc8837d98a00dd.tar.gz | |
version refresh
| -rw-r--r-- | driver/network-class_device-to-device.patch | 2 | ||||
| -rw-r--r-- | series | 22 | ||||
| -rw-r--r-- | usb/usb-serial-dynamic-id.patch | 6 | ||||
| -rw-r--r-- | usb/usbcore-add-usb_device_driver-definition.patch | 8 | ||||
| -rw-r--r-- | usb/usbcore-track-whether-interfaces-are-suspended.patch | 8 | ||||
| -rw-r--r-- | version | 2 |
6 files changed, 13 insertions, 35 deletions
diff --git a/driver/network-class_device-to-device.patch b/driver/network-class_device-to-device.patch index 1655375f23b2f2..6a9d0604d88589 100644 --- a/driver/network-class_device-to-device.patch +++ b/driver/network-class_device-to-device.patch @@ -1336,7 +1336,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (!err) { hlist_del(&dev->name_hlist); hlist_add_head(&dev->name_hlist, dev_name_hash(dev->name)); -@@ -3251,8 +3251,8 @@ void free_netdev(struct net_device *dev) +@@ -3241,8 +3241,8 @@ void free_netdev(struct net_device *dev) BUG_ON(dev->reg_state != NETREG_UNREGISTERED); dev->reg_state = NETREG_RELEASED; @@ -75,28 +75,6 @@ pci/msi-07-drop_pci_bus_flags.patch # usb patches queued for 2.6.18 (bugfixes, new ids, etc.) -usb/usb-at91-udc-updates-mostly-power-management.patch -usb/usb-at91-ohci-updates-mostly-power-management.patch -usb/usb-option-driver-removed-change-history-and-linux-version.h-include.patch -usb/usb-option-driver-short-driver-names-were-identical.patch -usb/usb-let-option-driver-handle-anydata-cdma-modems.-remove-anydata-driver.patch -usb/usb-drop-sierra-wireless-mc8755-from-the-option-driver.patch -usb/usb-removed-3-port-device-handler-from-option-driver.patch -usb/usb-fix-freescale-high-speed-usb-host-dependency.patch -usb/usb-adding-support-for-sharp-ws003sh-to-ipaq.c.patch -usb/usb-additional-pid-for-the-ftdi_sio-driver.patch -usb/usb-new-usb-id-for-belkin-serial-adapter.patch -usb/usb-storage-add-us_fl_ignore_device-flag-ignore-zyxel-g220f.patch -usb/usb-unusual_devs-device-removal.patch -usb/usb-cypress-driver-comment-updates.patch -usb/usb-patch-for-rtl8150-to-fix-unplug-problems.patch -usb/usb-doc-usb-help.txt-update.patch -usb/usb-doc-fixes-devio.c-location-in-proc_usb_info.txt.patch -usb/usb-ati_remote.c-autorepeat-fix.patch -usb/usb-fix-the-usb_gadget_dummy_hcd-dependencies.patch -usb/usb-dummy-hcd-disable-interrupts-during-req-complete.patch -usb/usb-unusual_devs-entry-for-nokia-3250.patch -usb/usb-uhci-don-t-test-the-short-packet-detect-bit.patch # stuff after 2.6.18 is out usb/usb-ohci-avoids-root-hub-timer-polling.patch diff --git a/usb/usb-serial-dynamic-id.patch b/usb/usb-serial-dynamic-id.patch index a49c80393f1832..7a41b76d87bd62 100644 --- a/usb/usb-serial-dynamic-id.patch +++ b/usb/usb-serial-dynamic-id.patch @@ -264,7 +264,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/include/linux/usb.h +++ gregkh-2.6/include/linux/usb.h -@@ -424,6 +424,8 @@ extern void usb_driver_release_interface +@@ -423,6 +423,8 @@ extern void usb_driver_release_interface struct usb_interface *iface); const struct usb_device_id *usb_match_id(struct usb_interface *interface, const struct usb_device_id *id); @@ -273,7 +273,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> extern struct usb_interface *usb_find_interface(struct usb_driver *drv, int minor); -@@ -538,11 +540,21 @@ static inline int usb_make_path (struct +@@ -537,11 +539,21 @@ static inline int usb_make_path (struct /* ----------------------------------------------------------------------- */ @@ -295,7 +295,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /** * struct usbdrv_wrap - wrapper for driver-model structure * @driver: The driver-model core driver structure. -@@ -1250,6 +1262,7 @@ usb_maxpacket(struct usb_device *udev, i +@@ -1249,6 +1261,7 @@ usb_maxpacket(struct usb_device *udev, i extern void usb_register_notify(struct notifier_block *nb); extern void usb_unregister_notify(struct notifier_block *nb); diff --git a/usb/usbcore-add-usb_device_driver-definition.patch b/usb/usbcore-add-usb_device_driver-definition.patch index cd228c82dd59ea..b2a608bb2bf872 100644 --- a/usb/usbcore-add-usb_device_driver-definition.patch +++ b/usb/usbcore-add-usb_device_driver-definition.patch @@ -522,7 +522,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/include/linux/usb.h +++ gregkh-2.6/include/linux/usb.h -@@ -541,7 +541,17 @@ struct usb_dynids { +@@ -540,7 +540,17 @@ struct usb_dynids { }; /** @@ -541,7 +541,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> * @name: The driver name should be unique among USB drivers, * and should normally be the same as the module name. * @probe: Called to see if the driver is willing to manage a particular -@@ -568,12 +578,12 @@ struct usb_dynids { +@@ -567,12 +577,12 @@ struct usb_dynids { * or your driver's probe function will never get called. * @dynids: used internally to hold the list of dynamically added device * ids for this driver. @@ -557,7 +557,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> * * The id_table is used in hotplugging. It holds a set of descriptors, * and specialized data may be associated with each entry. That table -@@ -607,10 +617,40 @@ struct usb_driver { +@@ -606,10 +616,40 @@ struct usb_driver { const struct usb_device_id *id_table; struct usb_dynids dynids; @@ -600,7 +600,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> extern struct bus_type usb_bus_type; -@@ -634,13 +674,17 @@ struct usb_class_driver { +@@ -633,13 +673,17 @@ struct usb_class_driver { * use these in module_init()/module_exit() * and don't forget MODULE_DEVICE_TABLE(usb, ...) */ diff --git a/usb/usbcore-track-whether-interfaces-are-suspended.patch b/usb/usbcore-track-whether-interfaces-are-suspended.patch index 3ac7a711e68515..5a28cccaca6d73 100644 --- a/usb/usbcore-track-whether-interfaces-are-suspended.patch +++ b/usb/usbcore-track-whether-interfaces-are-suspended.patch @@ -56,14 +56,14 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> * (in probe()), bound to a driver, or unbinding (in disconnect()) + * @is_active: flag set when the interface is bound and not suspended. * @dev: driver model's view of this device - * @usb_dev: if an interface is bound to the USB major, this will point - * to the sysfs representation for that device. -@@ -143,6 +144,8 @@ struct usb_interface { + * @class_dev: driver model's class view of this device. + * +@@ -142,6 +143,8 @@ struct usb_interface { int minor; /* minor number this interface is * bound to */ enum usb_interface_condition condition; /* state of binding */ + unsigned is_active:1; /* the interface is not suspended */ + struct device dev; /* interface specific device info */ - struct device *usb_dev; /* pointer to the usb class's device, if any */ + struct class_device *class_dev; }; @@ -1 +1 @@ -2.6.18-rc3 +2.6.18-rc3-git4 |