diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-10-30 16:51:25 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-10-30 16:52:30 +0100 |
| commit | c3ac759ea6e9836d3040abed92f797383da4024f (patch) | |
| tree | 5bb7c634212871c4afa42fc6c6b3a36b58066029 /net/netfilter/nf_conntrack_helper.c | |
| parent | 8ac2bde2a4a05c38e2bd733bea94507cb1461e06 (diff) | |
| parent | d7701089118d23bfed03bad0a6b5cc5115990c9e (diff) | |
Merge branch 'ipvs-next'
Simon Horman says:
====================
The single patch in this series fixes some minor fallout from adding
support IPv6 real servers in IPv4 virtual-services and vice versa.
It should not have any run-time affect other than perhaps saving a few cycles.
====================
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nf_conntrack_helper.c')
0 files changed, 0 insertions, 0 deletions