104 Commits

Author	SHA1	Message	Date
David S. Miller	ca1ba7caa6	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next ... Conflicts: drivers/net/ethernet/intel/e1000e/netdev.c	2011-08-20 17:25:36 -07:00
David S. Miller	823dcd2506	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net	2011-08-20 10:39:12 -07:00
Bruce Allan	5f450212f2	e1000e: convert driver to use extended descriptors ... Some features currently not supported by the driver (e.g. RSS) require the use of extended descriptors, but the driver is setup to only use legacy descriptors in all modes except for when jumbo frames are enabled on some parts. Convert the driver to always use extended descriptors in order to enable the forthcoming support of these other features. Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>	2011-08-19 01:17:31 -07:00
Jeff Kirsher	dee1ad47f2	intel: Move the Intel wired LAN drivers ... Moves the Intel wired LAN drivers into drivers/net/ethernet/intel/ and the necessary Kconfig and Makefile changes. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>	2011-08-10 20:03:27 -07:00