1. 01 2月, 2008 34 次提交
  2. 30 1月, 2008 2 次提交
    • L
      [net] Gracefully handle shared e1000/1000e driver PCI ID's · 60e23317
      Linus Torvalds 提交于
      Both the old e1000 driver and the new e1000e driver can drive some
      PCI-Express e1000 cards, and we should avoid ambiguity about which
      driver will pick up the support for those cards when both drivers are
      enabled.
      
      This solves the problem by having the old driver support those cards if
      the new driver isn't configured, but otherwise ceding support for PCI
      Express versions of the e1000 chipset to the newer driver.  Thus
      allowing both legacy configurations where only the old driver is active
      (and handles all chips it knows about) and the new configuration with
      the new driver handling the more modern PCIE variants.
      Acked-by: NJeff Garzik <jeff@garzik.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      60e23317
    • L
      Mostly revert "e1000/e1000e: Move PCI-Express device IDs over to e1000e" · 5b10ca19
      Linus Torvalds 提交于
      The new e1000e driver is apparently not yet suitable for general use, so
      mark it experimental, and re-instate all the PCI-Express device IDs in
      the old and stable e1000 driver so that people (namely me) can continue
      to use a driver that actually works.
      
      Auke & co have been appraised of the situation.
      
      Cc: Auke Kok <auke-jan.h.kok@intel.com>
      Cc: Jeff Garzik <jeff@garzik.org>
      Cc: David Miller <davem@davemloft.net>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      5b10ca19
  3. 29 1月, 2008 4 次提交