summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-03-31 21:18:39 -0400
committerDavid S. Miller <davem@davemloft.net>2014-03-31 21:18:39 -0400
commitff378ca17cf34cac0bb288f50999858101d5fd55 (patch)
tree85abedb87258ef964615a61ea661fcd5a719331c /lib
parent0b70195e0c3206103be991e196c26fcf168d0334 (diff)
parentbc0c715167c68ac2e737e221a80fc2a413f48155 (diff)
downloadlinux-ff378ca17cf34cac0bb288f50999858101d5fd55.tar.gz
linux-ff378ca17cf34cac0bb288f50999858101d5fd55.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says: ==================== Intel Wired LAN Driver Updates This series contains fixes to e1000e, igb, ixgbe, ixgebvf, i40e and i40evf. David provides a fix for e1000e to resolve an issue where the device is capable of transmitting packets but is unable to receive packets until a previously introduced workaround is called. Jakub Kicinski provides PTP fixes for ixgbe, which include removing a redundant if clause and make sure we are not generating both a software and hardware timestamp. As well as fix a race condition and leaking skbs when multiple transmit rings try to claim time stamping. Jean Sacren fixes a function declaration in ixgbe which was introduced in commit c97506ab0e22 ("ixgbe: Add check for FW veto bit"). In addition fixes a function header comment in i40e and fixes the error checking by binding the check to the pertinent DMA bit mask. Mark provides several fixes for ixgbe and ixgbevf. Most notably are fixes to resolve namespace issues and fix ECU warnings induced by LER for ixgbe and ixgbevf. Joe Perches fixes up unnecessary casts in i40e and i40evf. Peter Senna Tschudin fixes igb to use pci_iounmap when the virtual mapping was done with pci_iomap. ====================# Please enter a commit message to explain why this merge is necessary,
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions