Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says:
====================
The following patchset contains fixes for recently applied
Netfilter/IPVS updates to the net-next tree, most relevantly
they are:
* Fix sparse warnings introduced in the RCU conversion, from
Julian Anastasov.
* Fix wrong endianness in the size field of IPVS sync messages,
from Simon Horman.
* Fix missing if checking in nf_xfrm_me_harder, from Dan Carpenter.
* Fix off by one access in the IPVS SCTP tracking code, again from
Dan Carpenter.
====================
Signed-off-by:
David S. Miller <davem@davemloft.net>
Showing
- include/net/ip_vs.h 4 additions, 4 deletionsinclude/net/ip_vs.h
- include/uapi/linux/ip_vs.h 2 additions, 2 deletionsinclude/uapi/linux/ip_vs.h
- net/netfilter/ipvs/ip_vs_conn.c 6 additions, 8 deletionsnet/netfilter/ipvs/ip_vs_conn.c
- net/netfilter/ipvs/ip_vs_core.c 4 additions, 3 deletionsnet/netfilter/ipvs/ip_vs_core.c
- net/netfilter/ipvs/ip_vs_ctl.c 34 additions, 21 deletionsnet/netfilter/ipvs/ip_vs_ctl.c
- net/netfilter/ipvs/ip_vs_lblc.c 1 addition, 1 deletionnet/netfilter/ipvs/ip_vs_lblc.c
- net/netfilter/ipvs/ip_vs_lblcr.c 1 addition, 1 deletionnet/netfilter/ipvs/ip_vs_lblcr.c
- net/netfilter/ipvs/ip_vs_pe_sip.c 2 additions, 1 deletionnet/netfilter/ipvs/ip_vs_pe_sip.c
- net/netfilter/ipvs/ip_vs_proto_sctp.c 1 addition, 1 deletionnet/netfilter/ipvs/ip_vs_proto_sctp.c
- net/netfilter/ipvs/ip_vs_sync.c 8 additions, 13 deletionsnet/netfilter/ipvs/ip_vs_sync.c
- net/netfilter/nf_nat_core.c 1 addition, 0 deletionsnet/netfilter/nf_nat_core.c
Loading
Please register or sign in to comment