[GIT] Networking

David Miller
2013-09-06T19:40:12Z

A quick set of fixes, some to deal with fallout from yesterday's
net-next merge.

1) Fix compilation of bnx2x driver with CONFIG_BNX2X_SRIOV disabled, from
Dmitry Kravkov.

2) Fix a bnx2x regression caused by one of Dave Jones's mistaken braces
changes, from Eilon Greenstein.

3) Add some protective filtering in the netlink tap code, from Daniel
Borkmann.

4) Fix TCP congestion window growth regression after timeouts, from
Yuchung Cheng.

5) Correctly adjust TCP's rcv_ssthresh for out of order packets, from
Eric Dumazet.

Please pull, thanks a lot!

The following changes since commit 2e032852245b3dcfe5461d7353e34eb6da095ccf:

Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm (2013-09-05 18:07:32 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git master

for you to fetch changes up to 4e4f1fc226816905c937f9b29dabe351075dfe0f:

tcp: properly increase rcv_ssthresh for ofo packets (2013-09-06 14:43:49 -0400)

----------------------------------------------------------------
Daniel Borkmann (1):
net: netlink: filter particular protocols from analyzers

Dmitry Kravkov (1):
bnx2x: fix broken compilation with CONFIG_BNX2X_SRIOV is not set

Eilon Greenstein (1):
bnx2x: Restore a call to config_init

Eric Dumazet (1):
tcp: properly increase rcv_ssthresh for ofo packets

Florian Fainelli (1):
net: add documentation for BQL helpers

Michael Opdenacker (1):
mlx5: remove unused MLX5_DEBUG param in Kconfig

Yuchung Cheng (1):
tcp: fix no cwnd growth after timeout

drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 9 +++------
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 2 ++
drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 10 ----------
include/linux/netdevice.h | 26 ++++++++++++++++++++++++++
net/ipv4/tcp_input.c | 11 ++++++-----
net/netlink/af_netlink.c | 30 ++++++++++++++++++++++++++++++
6 files changed, 67 insertions(+), 21 deletions(-)