diff options
author | David S. Miller <davem@davemloft.net> | 2012-10-23 08:51:00 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-10-23 08:51:00 +0200 |
commit | 598e74f32c6dd4b3dd0ed382c889be07a7c6cbc0 (patch) | |
tree | 2b1ef2f487809307a39aafb06e45785093daf2af /net/ipv6/tcp_ipv6.c | |
parent | net: cdc_mbim: Device Service Stream support (diff) | |
parent | ixgbe: Fix possible memory leak in ixgbe_set_ringparam (diff) | |
download | linux-598e74f32c6dd4b3dd0ed382c889be07a7c6cbc0.tar.xz linux-598e74f32c6dd4b3dd0ed382c889be07a7c6cbc0.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says:
====================
This series contains updates to ixgbe only. Only change to this series
is I dropped the "ixgbe: Add support for pipeline reset" due to
change requested by Martin Josefsson.
Alexander Duyck (7):
ixgbe: Add support for IPv6 and UDP to ixgbe_get_headlen
ixgbe: Add support for tracking the default user priority to SR-IOV
ixgbe: Add support for GET_QUEUES message to get DCB configuration
ixgbe: Enable support for VF API version 1.1 in the PF.
ixgbevf: Add VF DCB + SR-IOV support
ixgbe: Drop unnecessary addition from ixgbe_set_rx_buffer_len
ixgbe: Fix possible memory leak in ixgbe_set_ringparam
Don Skidmore (1):
ixgbe: Add function ixgbe_reset_pipeline_82599
Emil Tantilov (1):
ixgbe: add WOL support for new subdevice id
Jacob Keller (1):
ixgbe: (PTP) refactor init, cyclecounter and reset
Tushar Dave (1):
ixgbe: Correcting small packet padding
Wei Yongjun (1):
ixgbe: using is_zero_ether_addr() to simplify the code
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
0 files changed, 0 insertions, 0 deletions