1. 22 7月, 2008 40 次提交
    • D
      usb ethernet gadget: split RNDIS function · 45fe3b8e
      David Brownell 提交于
      This is a RNDIS function driver, extracted from the all-in-one
      Ethernet gadget driver.
      
      Lightly tested ... there seems to be a pre-existing problem when
      talking to Windows XP SP2, not quite sure what's up with that yet.
      Signed-off-by: NDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      45fe3b8e
    • D
      usb ethernet gadget: split CDC Ethernet function · da741b8c
      David Brownell 提交于
      This is a "CDC Ethernet" (ECM) function driver, extracted from the
      all-in-one Ethernet gadget driver.
      
      This is a good example of how to implement interface altsettings.
      In fact it's currently the only such example in the gadget stack,
      pending addition of OBEX support.
      Signed-off-by: NDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      da741b8c
    • D
      usb ethernet gadget: split CDC Subset function · 8a40819e
      David Brownell 提交于
      This is a simple "CDC Subset" (and MCCI "SAFE") function driver, extracted
      from the all-in-one Ethernet gadget driver.
      Signed-off-by: NDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      8a40819e
    • D
      usb ethernet gadget: split out network core · 2b3d942c
      David Brownell 提交于
      Abstract the peripheral side Ethernet-over-USB link layer code from
      the all-in-one Ethernet gadget driver into a component that can be
      called by various functions, so the various flavors can be split
      apart and selectively reused.
      
      A notable difference from the approach taken with the serial link
      layer code (beyond talking to NET not TTY) is that because of the
      initialization requirements, this only supports one network link.
      (And one set of Ethernet link addresses.)
      
      That is, each configuration may have only one instance of a network
      function.  This doesn't change behavior; the current code has that
      same restriction.  If you want multiple logical links, that can
      easily be done using network layer tools.
      Signed-off-by: NDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      2b3d942c
    • D
      usb gadget: RNDIS cleanups · 15b2d2b5
      David Brownell 提交于
      Some cleanup to the RNDIS code:
      
       - Minor bugfix:  rndis_unit() is supposed to put the link into the
         RNDIS_UNINITIALIZED state, which does not mean "unused".  There's
         a separate method to stop using the link.  (Bug doesn't affect
         anything right now because of how the code is used.)
      
       - Reduce coupling between RNDIS code and its user(s), in preparation
         for updates in that code:
      
          * Decouple RNDIS_RESPONSE_AVAILABLE notifications from net_device
            by passing just a void* handle.  (Also, remove the unused return
            value of the notification callback.)
          * When it needs a copy of net_device stats, just ask for it
      
       - Remove unused/untested code backing various never-used OIDs:
      
          * RNDIS_PM, RNDIS_WAKEUP ... "should" get implemented, but the
            relevant docs were unclear, ambguous, and incomplete.  Someone
            with access to the Hidden Gospels (maybe in the EU?) might be
            able to figure out what this should do.
          * RNDIS_OPTIONAL_STATS ... as the name suggests, optional.  Never
            implemented in part because not all the semantics were clear.
          * OID_GEN_RNDIS_CONFIG_PARAMETER, which has been #if 0 forever.
      
       - A few small whitespace fixes
      
      Plus switch the VERBOSE symbol over to the newer VERBOSE_DEBUG style.
      
      There should be no functional changes because of this patch; it's a
      net source code shrink (because of the dead/unused code removal) and
      a small object code shrink (a couple hundred bytes on ARMv5).
      Signed-off-by: NDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      15b2d2b5
    • D
      usb gadget serial: use composite gadget framework · 7bb5ea54
      David Brownell 提交于
      This switches the serial gadget over to using the new "function"
      versions of the serial port interfacing code.  The remaining code
      in the main source file is quite small...
      Signed-off-by: NDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      7bb5ea54
    • D
      usb gadget serial: split out generic serial function · 61d8baea
      David Brownell 提交于
      Split out the generic serial support into a "function driver".  This
      closely mimics the ACM support, but with a MUCH simpler control model.
      Signed-off-by: NDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      61d8baea
    • D
      usb gadget serial: split out CDC ACM function · 4d5a73dc
      David Brownell 提交于
      Split out CDC ACM parts of "gadget serial" to a "function driver".
      Some key structural differences from the previous ACM support, shared
      with with the generic serial function (next patch):
      
       - As a function driver, it can be combined with other functions.
         One gadget configuration could offer both serial and network
         links, as an example.
      
       - One serial port can be exposed in multiple configurations;
         the /dev/ttyGS0 node could be exposed regardless of which
         config the host selected.
      
       - One configuration can expose multiple serial ports, such as
         ttyGS0, ttyGS1, ttyGS2, and ttyGS3.
      
      This code should be a lot easier to understand than the previous
      all-in-one-big-file version of the driver.
      Signed-off-by: NDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      4d5a73dc
    • D
      usb gadget zero: use composite gadget framework · 097db1d0
      David Brownell 提交于
      Update Gadget Zero to use the more modular versions of the loopback
      and source/sink configuration drivers which build on the new gadget
      framework code.
      
      The core code is a LOT simpler, and it should be much easier now to
      understand how the parts fit together.  The conversion is an overall
      source shrink in terms of this gadget, since it uses more midlayer
      support.  However, it's an overall increase in object size because
      there's less sharing between the two configurations (improves code
      clarity) and because the midlayer is a bit more functional than this
      driver actually needs.
      Signed-off-by: NDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      097db1d0
    • D
      usb gadget zero: split out loopback config · e5760fda
      David Brownell 提交于
      This splits the gadget zero "loopback" configuration into a standalone
      "configuration driver", building on the composite gadget framework code.
      It doesn't yet pull the original code out of gadget zero or update how
      that driver is built.
      Signed-off-by: NDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      e5760fda
    • D
      usb gadget zero: split out source/sink config · a400cadc
      David Brownell 提交于
      This splits the gadget zero "source/sink" configuration into a standalone
      "configuration driver", building on the composite gadget framework code.
      It doesn't yet pull the original code out of gadget zero or update how
      that driver is built.
      
      Neither this, nor its sibling "loopback" configuration, is a function
      driver that can be combined with other functions.  (The host "usbtest"
      driver wouldn't know how to deal with that!)  However the code becomes
      simpler because of this conversion, so it's a net win.
      Signed-off-by: NDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      a400cadc
    • D
      usb gadget: composite gadget core · 40982be5
      David Brownell 提交于
      Add <linux/usb/composite.h> interfaces for composite gadget drivers, and
      basic implementation support behind it:
      
        - struct usb_function ... groups one or more interfaces into a function
          managed as one unit within a configuration, to which it's added by
          usb_add_function().
      
        - struct usb_configuration ... groups one or more such functions into
          a configuration managed as one unit by a driver, to which it's added
          by usb_add_config().  These operate at either high or full/low speeds
          and at a given bMaxPower.
      
        - struct usb_composite_driver ... groups one or more such configurations
          into a gadget driver, which may be registered or unregistered.
      
        - struct usb_composite_dev ... a usb_composite_driver manages this; it
          wraps the usb_gadget exposed by the controller driver.
      
      This also includes some basic kerneldoc.
      
      How to use it (the short version):  provide a usb_composite_driver with a
      bind() that calls usb_add_config() for each of the needed configurations.
      The configurations in turn have bind() calls, which will usb_add_function()
      for each function required.  Each function's bind() allocates resources
      needed to perform its tasks, like endpoints; sometimes configurations will
      allocate resources too.
      
      Separate patches will convert most gadget drivers to this infrastructure.
      Signed-off-by: NDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      40982be5
    • D
      usb gadget: descriptor copying support · a4c39c41
      David Brownell 提交于
      Define three new descriptor manipulation utilities, for use when
      setting up functions that may have multiple instances:
      
      	usb_copy_descriptors() to copy a vector of descriptors
      	usb_free_descriptors() to free the copy
      	usb_find_endpoint() to find a copied version
      
      These will be used as follows.  Functions will continue to have static
      tables of descriptors they update, now used as __initdata templates.
      
      When a function creates a new instance, it patches those tables with
      relevant interface and string IDs, plus endpoint assignments.  Then it
      copies those morphed descriptors, associates the copies with the new
      function instance, and records the endpoint descriptors to use when
      activating the endpoints.  When initialization is done, only the copies
      remain in memory.  The copies are freed on driver removal.
      
      This ensures that each instance has descriptors which hold the right
      instance-specific data.  Two instances in the same configuration will
      obviously never share the same interface IDs or use the same endpoints.
      Instances in different configurations won't do so either, which means
      this is slightly less memory-efficient in some cases.
      
      This also includes a bugfix to the epautoconf code that shows up with
      this usage model.  It must replace the previous endpoint number when
      updating the template descriptors, not just mask in a few more bits.
      Signed-off-by: NDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      a4c39c41
    • D
      usb gadget: use new serial core · a7707adf
      David Brownell 提交于
      Teach "gadget serial" to use the new abstracted (and bugfixed) TTY glue,
      and remove all the orignal tangled-up code.  Update the documentation
      accordingly.  This is a net object code shrink and cleanup; it should
      make it a lot easier to see how the TTY glue should accomodate updates
      to the TTY layer, be bugfixed, etc.
      
      Notable behavior changes include:  it can now support getty even when
      there's no USB connection; it fits properly into the mdev/udev world;
      and RX handling is better (throttling works, and low latency).
      
      Configurations with scripts setting up the /dev/ttygserial device node
      (with "experimental" major number) may want to change that to be a
      symlink pointing to the /dev/ttyGS0 file, as a migration aid; else,
      just switch entirely over to mdev/udev.
      Signed-off-by: NDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      a7707adf
    • D
      usb gadget: split out serial core · c1dca562
      David Brownell 提交于
      This abstracts the "gadget serial" driver TTY glue into a separate
      component, cleaning it up and disentangling it from connection state.
      
      It also changed some behaviors for the better:
      
        - Stops using "experimental" major #127, and switches over to
          having the TTY layer allocate the dev_t numbers.
          
        - Provides /sys/class/tty/ttyGS* nodes, thus mdev/udev support.
          (Note "mdev" hotplug bug in Busybox v1.7.2: /dev/ttyGS0 will
          be a *block* device without CONFIG_SYSFS_DEPRECATED_V2.)
      
        - The tty nodes no longer reject opens when there's no host.
          Now they can support normal getty configs in /etc/inttab...
      
        - Now implements RX throttling.  When the line discipline says
          it doesn't want any more data, only packets in flight will be
          delivered (currently, max 1K/8K at full/high speeds) until it
          unthrottles the data.
      
        - Supports low_latency.  This is a good policy for all USB serial
          adapters, since it eliminates scheduler overhead on RX paths.
      
      This also includes much cleanup including better comments, fixing
      memory leaks and other bugs (including some locking fixes), messaging
      cleanup, and an interface audit and tightening.  This added up to a
      significant object code shrinkage, on the order of 20% (!) depending
      on CPU and compiler.
      
      A separate patch actually kicks in this new code, using the functions
      declared in this new header, and removes the previous glue.
      Signed-off-by: NDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      c1dca562
    • D
      USB: at91_udc: updated fifo sizes · bb24280f
      David Brownell 提交于
      It turns out newer versions of the AT91 UDC hardware have increased
      sizes of some of the FIFOs.  Reporting that is a Good Thing.
      Signed-off-by: NDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      bb24280f
    • A
      USB: rndis: switch to seq_files · e184d5fc
      Alexey Dobriyan 提交于
      Signed-off-by: NAlexey Dobriyan <adobriyan@gmail.com>
      Cc: David Brownell <david-b@pacbell.net>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      e184d5fc
    • A
      USB: remove Documentation/usb/uhci.txt · baad4119
      Adrian Bunk 提交于
      The driver was removed before kernel 2.6.0
      Signed-off-by: NAdrian Bunk <bunk@kernel.org>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      
      baad4119
    • A
      USB: remove CVS keywords · ea05af61
      Adrian Bunk 提交于
      This patch removes CVS keywords that weren't updated for a long time
      from comments.
      Signed-off-by: NAdrian Bunk <bunk@kernel.org>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      ea05af61
    • A
      usb-storage: implement "soft" unbinding · 543f7810
      Alan Stern 提交于
      This patch (as1092) implements "soft" unbinding for usb-storage.  When
      the disconnect routine is called, all commands and reset delays are
      allowed to complete normally until after scsi_remove_host() returns.
      This means that the commands needed for an orderly shutdown will be
      sent through to the device.
      
      Unlike before, the driver will now execute every command that it
      accepts.  Hence there's no need for special code to catch unexecuted
      commands and fail them.
      
      The new sequence of events when disconnect runs goes as follows:
      
      	If the device is truly unplugged, set the DISCONNECTING
      	flag so we won't try to access it any more.
      
      	If the SCSI-scanning thread hasn't started up yet, prevent
      	it from doing anything by setting the new DONT_SCAN flag.
      	Then wake it up and wait for it to terminate.
      
      	Remove the SCSI host.  This unbinds the upper-level drivers,
      	doing an orderly shutdown.  Commands sent to quiesce the
      	device will be transmitted normally, unless the device is
      	unplugged.
      
      	Set the DISCONNECTING flag so that we won't accept any new
      	commands that might get submitted (there aren't supposed to be
      	any) and we won't try to access the device for resets.
      
      	Tell the control thread to exit by waking it up with no
      	pending command, and wait for it to terminate.
      
      	Go on to do all the other normal stuff: releasing resources,
      	freeing memory, and so on.
      Signed-off-by: NAlan Stern <stern@rowland.harvard.edu>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      543f7810
    • A
      USB: implement "soft" unbinding · 9da82bd4
      Alan Stern 提交于
      This patch (as1091) changes the way usbcore handles interface
      unbinding.  If the interface's driver supports "soft" unbinding (a new
      flag in the driver structure) then in-flight URBs are not cancelled
      and endpoints are not disabled.  Instead the driver is allowed to
      continue communicating with the device (although of course it should
      stop before its disconnect routine returns).
      
      The purpose of this change is to allow drivers to do a clean shutdown
      when they get unbound from a device that is still plugged in.  Killing
      all the URBs and disabling the endpoints before calling the driver's
      disconnect method doesn't give the driver any control over what
      happens, and it can leave devices in indeterminate states.  For
      example, when usb-storage unbinds it doesn't want to stop while in the
      middle of transmitting a SCSI command.
      
      The soft_unbind flag is added because in the past, a number of drivers
      have experienced problems related to ongoing I/O after their disconnect
      routine returned.  Hence "soft" unbinding is made available only to
      drivers that claim to support it.
      
      The patch also replaces "interface_to_usbdev(intf)" with "udev" in a
      couple of places, a minor simplification.
      Signed-off-by: NAlan Stern <stern@rowland.harvard.edu>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      9da82bd4
    • A
      USB: isp1760-hcd.c: make 2 functions static · 473bca94
      Adrian Bunk 提交于
      This patch makes the following needlessly global functions static:
      - enqueue_an_ATL_packet()
      - enqueue_an_INT_packet()
      Signed-off-by: NAdrian Bunk <bunk@kernel.org>
      Acked-by: NSebastian Siewior <bigeasy@linutronix.de>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      473bca94
    • A
      usb-storage: change remaining semaphore to completion · 7119e3c3
      Alan Stern 提交于
      This patch (as1090) converts the one remaining semaphore in
      usb-storage into a completion.
      Signed-off-by: NAlan Stern <stern@rowland.harvard.edu>
      Cc: Matthew Dharm <mdharm-usb@one-eyed-alien.net>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      7119e3c3
    • A
      usb-storage: separate dynamic flags from fixed flags · 7e4d6c38
      Alan Stern 提交于
      This patch (as1089) separates out the dynamic atomic bitflags and the
      static bitfields in usb-storage.  Until now the two sorts of flags
      have been sharing the same word; this has always been awkward.
      
      To help prevent possible confusion, the two new fields each have a
      different name from the original.  us->fflags contains the fixed
      bitfields (mostly taken from the USB ID table in unusual_devs.h), and
      us->dflags contains the dynamic atomic bitflags (used with set_bit,
      test_bit, and so on).
      Signed-off-by: NAlan Stern <stern@rowland.harvard.edu>
      Cc: Matthew Dharm <mdharm-usb@one-eyed-alien.net>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      7e4d6c38
    • A
      USB: io_ti: FIrst cut at a big clean up · 2742fd88
      Alan Cox 提交于
      Sort out the insane naming like "OperationalFirmwareVersion" which seems
      	designed to cause formatting problems and RSI
      Merge various common code together
      Clean up the pointlessly complex and spread about MCR handling
      
      This is really just the low hanging fruit.
      
      Needs lots of testing before it goes upstream so testers and reports
      appreciated
      Signed-off-by: NAlan Cox <alan@redhat.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      2742fd88
    • A
      USB: combine hub_quiesce and hub_stop · 4330354f
      Alan Stern 提交于
      This patch (as1083) combines hub_quiesce() and hub_stop() into a
      single routine.  There's no point keeping them separate since they are
      usually called together.
      Signed-off-by: NAlan Stern <stern@rowland.harvard.edu>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      4330354f
    • A
      USB: combine hub_activate and hub_restart · f2835219
      Alan Stern 提交于
      This patch (as1071) combines hub_activate() and hub_restart() into a
      single routine.  There's no point keeping them separate, since they
      are always called together.
      Signed-off-by: NAlan Stern <stern@rowland.harvard.edu>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      f2835219
    • A
      USB: optimize port debouncing during hub activation · 948fea37
      Alan Stern 提交于
      This patch (as1082) makes a small optimization to the way the hub
      driver carries out port debouncing immediately after a hub is
      activated (i.e., initialized, reset, or resumed).  If any port-change
      statuses are observed, the code will delay for a minimal debounce
      period -- thereby making a good start at debouncing all the ports at
      once.
      
      If this wasn't sufficient then khubd will debounce any port that still
      requires attention.  But in most cases it should suffice; it's rare
      for a device to need more than a minimal debounce delay.  (In the
      cases of hub initialization or reset even that is most likely not
      needed, since any devices plugged in at such times have probably been
      attached for a while.)
      Signed-off-by: NAlan Stern <stern@rowland.harvard.edu>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      948fea37
    • A
      USB: try to salvage lost power sessions · 8808f00c
      Alan Stern 提交于
      This patch (as1073) adds to khubd a way to recover from power-session
      interruption caused by transient connect-change or enable-change
      events.  After the debouncing period, khubd attempts to do a
      USB-Persist-style reset or reset-resume.  If it works, the connection
      will remain unscathed.
      
      The upshot is that we will be more immune to noise caused by EMI.  The
      grace period is on the order of 100 ms, so this won't permit recovery
      from the "accidentally knocked the USB cable out of its socket" type
      of event, but it's a start.
      
      As an added bonus, if a device was suspended when the system goes to
      sleep then we no longer need to check for power-session interruptions
      when the system wakes up.  Khubd will naturally see the status change
      while processing the device's parent hub and will do the right thing.
      
      The remote_wakeup() routine is changed; now it expects the caller to
      acquire the device lock rather than acquiring the lock itself.
      Signed-off-by: NAlan Stern <stern@rowland.harvard.edu>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      8808f00c
    • A
      USB: simplify hub_restart() logic · 6ee0b270
      Alan Stern 提交于
      This patch (as1081) straightens out the logic of the hub_restart()
      routine.  Each port of the hub is scanned and the driver makes sure
      that ports which are supposed to be disabled really _are_ disabled.
      Any ports with a significant change in status are flagged in
      hub->change_bits, so that khubd can focus on them without the need to
      scan all the ports a second time -- which means the hub->activating
      flag is no longer needed.
      
      Also, it is now recognized explicitly that the only reason for
      resuming a port which was not suspended is to carry out a reset-resume
      operation, which happens only in a non-CONFIG_USB_SUSPEND setting.
      Signed-off-by: NAlan Stern <stern@rowland.harvard.edu>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      6ee0b270
    • G
      USB: revert "don't use reset-resume if drivers don't support it" · 9e5eace7
      Greg Kroah-Hartman 提交于
      This reverts Linus's previous patch that is in mainline to make it
      easier for the USB hub.c patches that follow this to apply cleanly.  The
      functionality will be added back in a followon patch in this series.
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      9e5eace7
    • A
      USB: debounce before unregistering · 24618b0c
      Alan Stern 提交于
      This patch (as1080) makes a significant change to the way khubd
      handles port connect-change and enable-change events.  Both types of
      event are now debounced, and the debouncing is carried out _before_ an
      existing usb_device is unregistered, instead of afterward.
      
      This means that drivers will have to deal with longer runs of errors
      when a device is unplugged, but they are supposed to be prepared for
      that in any case.
      
      The advantage is that when an enable-change occurs (caused for example
      by electromagnetic interference), the debouncing period will provide
      time for the cause of the problem to die away.  A simple port reset
      (added in a forthcoming patch) will then allow us to recover from the
      fault.
      Signed-off-by: NAlan Stern <stern@rowland.harvard.edu>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      24618b0c
    • A
      USB: add new routine for checking port-resume type · b01b03f3
      Alan Stern 提交于
      This patch (as1070) creates a new subroutine to check whether a device
      can be resumed.  This code is needed even when CONFIG_USB_SUSPEND
      isn't set, because devices do suspend themselves when the root hub
      (and hence the entire bus) is suspended, and power sessions can get
      lost during a system sleep even without individual port suspends.
      
      The patch also fixes a loose end in USB-Persist reset-resume handling.
      When a low- or full-speed device is attached to an EHCI's companion
      controller, the port handoff during resume will cause the companion
      port's connect-status-change feature to be set.  If that flag isn't
      cleared, the port-reset code will think it indicates that the device
      has been unplugged and the reset-resume will fail.
      Signed-off-by: NAlan Stern <stern@rowland.harvard.edu>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      b01b03f3
    • H
    • K
      USB: usb dev_set_name() instead of dev->bus_id · 0031a06e
      Kay Sievers 提交于
      The bus_id field is going away, use the dev_set_name() function
      to set it properly.
      Signed-off-by: NKay Sievers <kay.sievers@vrfy.org>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      0031a06e
    • K
      USB: usb dev_name() instead of dev->bus_id · 7071a3ce
      Kay Sievers 提交于
      The bus_id field is going away, use the dev_name() function instead.
      Signed-off-by: NKay Sievers <kay.sievers@vrfy.org>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      7071a3ce
    • G
      USB: revert "don't lose disconnections during suspend" · 36aa8117
      Greg Kroah-Hartman 提交于
      This reverts Alan's previous patch so that the recent Hub changes will
      apply cleanly.  The above mentioned patch was needed for 2.6.26 to work
      properly.
      
      Cc: Alan Stern <stern@rowland.harvard.edu>
      Cc: Lukas Hejtmanek <xhejtman@ics.muni.cz>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      36aa8117
    • G
      USB: handle pci_name() being const · 1b26da15
      Greg Kroah-Hartman 提交于
      This changes usb_create_hcd() to be able to handle the fact that
      pci_name() has changed to a constant string.
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      1b26da15
    • A
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · e89970aa
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
        netfilter: nf_conntrack_sctp: fix sparse warnings
        netfilter: nf_nat_sip: c= is optional for session
        netfilter: xt_TCPMSS: collapse tcpmss_reverse_mtu{4,6} into one function
        netfilter: nfnetlink_log: send complete hardware header
        netfilter: xt_time: fix time's time_mt()'s use of do_div()
        netfilter: accounting rework: ct_extend + 64bit counters (v4)
        netlink: add NLA_PUT_BE64 macro
        netfilter: nf_nat_core: eliminate useless find_appropriate_src for IP_NAT_RANGE_PROTO_RANDOM
        hdlcdrv: Fix CRC calculation.
        Revert "pkt_sched: Make default qdisc nonshared-multiqueue safe."
        net: In __netif_schedule() use WARN_ON instead of BUG_ON
        net: Improve simple_tx_hash().
        pkt_sched: Remove unused variable skb in dev_deactivate_queue function.
        sunhme: Remove stop/wake TX queue calls in set-multicast-list handler.
        ucc_geth: do not touch net queue in adjust_link phylib callback
        gianfar: do not touch net queue in adjust_link phylib callback
        atl1: Do not wake queue before queue has been started.
      e89970aa