aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller2015-05-04 15:37:08 -0400
committerDavid S. Miller2015-05-04 15:37:08 -0400
commitf9161585b2de32cf737678455297e47db865d292 (patch)
treeaeff1330689daa8fad7122aa95f410c9f84a6a95 /net
parentc373dac522c2aee864ac7f5394c91cfc1afc3dd2 (diff)
parenta1e869de72a7a6d9e1007d0b459e79e91f0cf5b5 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue
Jeff Kirsher says: ==================== Intel Wired LAN Driver Updates 2015-05-04 This series contains updates to igb, e100, e1000e and ixgbe. Todd cleans up igb_enable_mas() since it should only be called for the 82575 silicon and has no clear return, so modify the function to void. Jean Sacren found upon inspection that 'err' did not need to be initialized, since it is immediately overwritten. Alex Duyck provides two patches for e1000e, the first cleans up the handling VLAN_HLEN as a part of max frame size. Fixes the issue: c751a3d58cf2d ("e1000e: Correctly include VLAN_HLEN when changing interface MTU"). The second fixes an issue where the driver was not allowing jumbo frames to be enabled when CRC stripping was disabled, however it was allowing CRC stripping to be disabled while jumbo frames were enabled. Jeff (me) fixes a warning found on PPC where the use of do_div() needed to use u64 arg and not s64. Mark provides three ixgbe patches, first to fix the Intel On-chip System Fabric (IOSF) Sideband message interfaces, to serialize access using both PHY bits in the SWFW_SEMAPHORE register. Then fixes how semaphore bits were released, since they should be released in reverse of the order that they were taken. Lastly updates ixgbe to use a signed type to hold error codes, since error codes are negative, so consistently use signed types when handling them. v2: dropped the previous #6-#8 patches by Hiroshi Shimanoto based on feedback from Or Gerlitz (and David Miller) that it appears there needs to be further discussion on how this gets implemented. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions