From: David S. Miller Date: Thu, 6 Nov 2014 02:50:43 +0000 (-0500) Subject: Merge branch 'amd-xgbe-next' X-Git-Tag: v3.19-rc1~118^2~271 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2c99cd914d4fed9160d98849c9dd38034616768e;p=~emulex%2Finfiniband.git Merge branch 'amd-xgbe-next' Tom Lendacky says: ==================== amd-xgbe: AMD XGBE driver updates 2014-11-04 The following series of patches includes functional updates to the driver as well as some trivial changes for function renaming and spelling fixes. - Move channel and ring structure allocation into the device open path - Rename the pre_xmit function to dev_xmit - Explicitly use the u32 data type for the device descriptors - Use page allocation for the receive buffers - Add support for split header/payload receive - Add support for per DMA channel interrupts - Add support for receive side scaling (RSS) - Add support for ethtool receive side scaling commands - Fix the spelling of descriptors - After a PCS reset, sync the PCS and PHY modes - Add dependency on HAS_IOMEM to both the amd-xgbe and amd-xgbe-phy drivers This patch series is based on net-next. ==================== Signed-off-by: David S. Miller --- 2c99cd914d4fed9160d98849c9dd38034616768e