From: David S. Miller Date: Sun, 8 Jun 2014 21:07:45 +0000 (-0700) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8063968af9e3b96da3b19992a7d580d8ce921562;p=linux-beck.git Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next Jeff Kirsher says: ==================== Intel Wired LAN Driver Updates 2014-06-08 This series contains updates to i40e and i40evf. Jesse fixes an issue reported by Eric Dumazet where the driver was not masking the right bits in the receive descriptor before checking them. Also fixes TSO accounting since the kernel now can send as much as 32kB in a single skb->frag[.] entry, even on a system with 4kB pages. Anjali cleans up registers which are no longer supported. Akeem cleans up code comments and removes num_msix_entries from the interrupt setup routine since it was not being used. Fixes an issue where FD SB/ATR and NTUPLE configuration status were reported erroneously, so now the driver reports FDir without further information. Fixes a coding error where during the registration for NAPI, the driver was requesting 256 budget. The max recommended value for this NAPI_POLL_WEIGHT or 64. Lastly, removed deprecated device IDs because they will not be shipped. Mitch removes log messages which were redundant so therefore unnecessary. Also removes a bogus code comment since VF drivers require MSI-X or they won't get interrupts at all and cleans up the formatting of several log messages. Mitch also fixes the possibility of null pointers in VSI, since not all VSIs have transmit rings. Shannon ensures to clear the PXE mode bit on each reset after the AdminQ has been rebuilt. Catherine bumps the driver versions for i40e and i40evf. ==================== Signed-off-by: David S. Miller --- 8063968af9e3b96da3b19992a7d580d8ce921562