OpenCloudOS-Kernel/drivers/net/e1000e
Linus Torvalds f8965467f3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1674 commits)
  qlcnic: adding co maintainer
  ixgbe: add support for active DA cables
  ixgbe: dcb, do not tag tc_prio_control frames
  ixgbe: fix ixgbe_tx_is_paused logic
  ixgbe: always enable vlan strip/insert when DCB is enabled
  ixgbe: remove some redundant code in setting FCoE FIP filter
  ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp
  ixgbe: fix header len when unsplit packet overflows to data buffer
  ipv6: Never schedule DAD timer on dead address
  ipv6: Use POSTDAD state
  ipv6: Use state_lock to protect ifa state
  ipv6: Replace inet6_ifaddr->dead with state
  cxgb4: notify upper drivers if the device is already up when they load
  cxgb4: keep interrupts available when the ports are brought down
  cxgb4: fix initial addition of MAC address
  cnic: Return SPQ credit to bnx2x after ring setup and shutdown.
  cnic: Convert cnic_local_flags to atomic ops.
  can: Fix SJA1000 command register writes on SMP systems
  bridge: fix build for CONFIG_SYSFS disabled
  ARCNET: Limit com20020 PCI ID matches for SOHARD cards
  ...

Fix up various conflicts with pcmcia tree drivers/net/
{pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and
wireless/orinoco/spectrum_cs.c} and feature removal
(Documentation/feature-removal-schedule.txt).

Also fix a non-content conflict due to pm_qos_requirement getting
renamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c
2010-05-20 21:04:44 -07:00
..
82571.c drivers/net: Remove unnecessary returns from void function()s 2010-05-14 00:19:28 -07:00
Makefile e1000e: reformat comment blocks, cosmetic changes only 2008-03-28 22:14:56 -04:00
defines.h e1000e: fix checks for manageability enabled and management pass-through 2010-05-12 23:31:13 -07:00
e1000.h e1000e: save skb counts in TX to avoid cache misses 2010-05-05 21:11:25 -07:00
es2lan.c drivers/net: Remove unnecessary returns from void function()s 2010-05-14 00:19:28 -07:00
ethtool.c e1000e: bad state after running ethtool diagnostics with AMT enabled 2010-05-12 23:31:09 -07:00
hw.h e1000e: add PCI device id to enable support for 82567V-4 2010-05-12 23:31:15 -07:00
ich8lan.c drivers/net: Remove unnecessary returns from void function()s 2010-05-14 00:19:28 -07:00
lib.c e1000e: fix checks for manageability enabled and management pass-through 2010-05-12 23:31:13 -07:00
netdev.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2010-05-20 21:04:44 -07:00
param.c e1000e: use static params to save stack space (part 2) 2010-05-12 23:31:09 -07:00
phy.c e1000e: Incorrect function pointer set for force_speed_duplex on 82577 2010-05-12 23:31:12 -07:00