diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-10-18 09:57:42 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-18 09:57:42 -0700 |
| commit | 8f18da47211554f1ef674fef627c05f23b75a8e0 (patch) | |
| tree | 7e66b6dbdec8b6aba0f4bf15976037d3a35d6aa1 /net/xfrm/xfrm_interface.c | |
| parent | net: skbuff.h: Mark expected switch fall-throughs (diff) | |
| parent | xfrm: use complete IPv6 addresses for hash (diff) | |
| download | wireguard-linux-8f18da47211554f1ef674fef627c05f23b75a8e0.tar.xz wireguard-linux-8f18da47211554f1ef674fef627c05f23b75a8e0.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says:
====================
pull request (net-next): ipsec-next 2018-10-18
1) Remove an unnecessary dev->tstats check in xfrmi_get_stats64.
From Li RongQing.
2) We currently do a sizeof(element) instead of a sizeof(array)
check when initializing the ovec array of the secpath.
Currently this array can have only one element, so code is
OK but error-prone. Change this to do a sizeof(array)
check so that we can add more elements in future.
From Li RongQing.
3) Improve xfrm IPv6 address hashing by using the complete IPv6
addresses for a hash. From Michal Kubecek.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm/xfrm_interface.c')
| -rw-r--r-- | net/xfrm/xfrm_interface.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/xfrm/xfrm_interface.c b/net/xfrm/xfrm_interface.c index dc5b20bf29cf..abafd49cc65d 100644 --- a/net/xfrm/xfrm_interface.c +++ b/net/xfrm/xfrm_interface.c @@ -561,9 +561,6 @@ static void xfrmi_get_stats64(struct net_device *dev, { int cpu; - if (!dev->tstats) - return; - for_each_possible_cpu(cpu) { struct pcpu_sw_netstats *stats; struct pcpu_sw_netstats tmp; |