Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: netfilter: ctnetlink: fix timeout calculation ipvs: try also real server with port 0 in backup server skge: restore rx multicast filter on resume and after config changes mlx4_en: nullify cq->vector field when closing completion queue
Showing
- drivers/net/ethernet/marvell/skge.c 3 additions, 0 deletionsdrivers/net/ethernet/marvell/skge.c
- drivers/net/ethernet/mellanox/mlx4/en_cq.c 1 addition, 0 deletionsdrivers/net/ethernet/mellanox/mlx4/en_cq.c
- include/net/ip_vs.h 1 addition, 1 deletioninclude/net/ip_vs.h
- net/netfilter/ipvs/ip_vs_conn.c 1 addition, 1 deletionnet/netfilter/ipvs/ip_vs_conn.c
- net/netfilter/ipvs/ip_vs_ctl.c 8 additions, 2 deletionsnet/netfilter/ipvs/ip_vs_ctl.c
- net/netfilter/ipvs/ip_vs_sync.c 1 addition, 1 deletionnet/netfilter/ipvs/ip_vs_sync.c
- net/netfilter/nf_conntrack_netlink.c 2 additions, 2 deletionsnet/netfilter/nf_conntrack_netlink.c
Please register or sign in to comment