diff options
| author | David S. Miller <davem@davemloft.net> | 2016-06-07 17:14:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-07 17:14:10 -0700 |
| commit | 32565644580de57e67b700f7ddbf658e0fc43a35 (patch) | |
| tree | a5f4d7974762b4f85bf9c95c4812abc50d30b8e8 /net/packet | |
| parent | ce3cf4ec0305919fc69a972f6c2b2efd35d36abc (diff) | |
| parent | 3ec10d3a2ba591c87da94219c1e46b02ae97757a (diff) | |
| download | linux-32565644580de57e67b700f7ddbf658e0fc43a35.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter/IPVS fixes for net
The following patchset contains two Netfilter/IPVS fixes for your net
tree, they are:
1) Fix missing alignment in next offset calculation for standard
targets, introduced in the previous merge window, patch from
Florian Westphal.
2) Fix to correct the handling of outgoing connections which use the
SIP-pe such that the binding of a real-server is updated when needed.
This was an omission from changes introduced by Marco Angaroni in
the previous merge window too, to allow handling of outgoing
connections by the SIP-pe. Patch and report came via Simon Horman.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/packet')
0 files changed, 0 insertions, 0 deletions