summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-12-09 17:01:21 -0500
committerDavid S. Miller <davem@davemloft.net>2014-12-09 17:01:21 -0500
commit5d6201e11b2c3870ae1124b97cc208bcaf9f0948 (patch)
tree5abe0cd4188e58fb4c6df257d1b9928889ce55e3 /net/core
parent602de7ead5a4c02c2a3fe17b24a67f894cbffaba (diff)
parent4bd145bed5b74b934d4e426c6e8c426a95e37ca9 (diff)
downloadlinux-5d6201e11b2c3870ae1124b97cc208bcaf9f0948.tar.gz
linux-5d6201e11b2c3870ae1124b97cc208bcaf9f0948.tar.bz2
linux-5d6201e11b2c3870ae1124b97cc208bcaf9f0948.zip
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-12-09 This series contains updates to i40e and i40evf. Jeff (me) provides a single patch to convert a macro to a static inline function based on feedback from Joe Perches on a previous patch. Shannon provides the remaining twelve patches against i40e. Almost all of Shannon's patches cleanup/fix NVM issues varying in range from adding more detail to debug messages, to removing dead code, to fixing NVM state transitions after an error. Change the handy decoder interface for admin queue return code to help catch and properly report the condition as a useful errno rather than returning a misleading '0'. Added a range check to avoid any possible array index-out-of-bound issues. v2: - fixed up patch 05 in the series to use the ARRAY_SIZE() macro as suggested by Sergei Shtylyov - fix up patch 13 to remove unnecessary parens in the return statement as suggested by Sergei Shtylyov ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
0 files changed, 0 insertions, 0 deletions