aboutsummaryrefslogtreecommitdiff
path: root/net/tipc/node.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-01-05 20:31:01 -0500
committerDavid S. Miller <davem@davemloft.net>2014-01-05 20:31:01 -0500
commit3a2e15df50d011fa713d5c59769feade102e963e (patch)
tree36beb26d7c2039106860dcbcc264d40c45835dfa /net/tipc/node.c
parent1e85c9b66d86a776e78c332d5d32ae370ab84d3f (diff)
parentc3f0c4fedf4b604addf62b3e83ffe613cecae4d7 (diff)
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 updates to i40e only. Anjali provides two cleanups to remove unnecessary code and a fix to resolve debugfs dumping only half the NVM. Then provides a fix to ethtool NVM reads where shadow RAM was used instead of actual NVM reads. Jesse provides a couple of fixes, one removes custom i40e functions which duplicate existing kernel functionality. Second fixes constant cast issues by replacing __constant_htons with htons. Mitch provides a couple of fixes for the VF interfaces in i40e. First provides a fix to guard against VF message races with can cause a panic. Second fix reinitializes the buffer size each time we clean the ARQ, because subsequent messages can be truncated. Lastly adds functionality to enable/disable ICR 0 dynamically. Vasu adds a simple guard against multiple includes of the i40e_txrx.h file. Shannon provides a couple of fixes, first fix swaps a couple of lines around in the error handling if the allocation for the VSI array fails. Second fixes an issue where we try to free the q_vector that has not been setup which can panic the kernel. David provides a patch to save off the point to memory and the length of 2 structs used in the admin queue in order to store all info about allocated kernel memory. Neerav fixes ring allocation where allocation and clearing of rings for a VSI should be using the alloc_queue_pairs and not num_queue_pairs. Then removes the unused define for multi-queue enabled. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/node.c')
0 files changed, 0 insertions, 0 deletions