diff options
| author | David S. Miller <davem@davemloft.net> | 2018-10-19 11:03:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-19 11:03:06 -0700 |
| commit | 2e2d6f0342be7f73a34526077fa96f42f0e8c661 (patch) | |
| tree | 29f3740825a70aa606e03cf3a048d9a3a751529c /net/xfrm/xfrm_interface.c | |
| parent | 9333f207920336575cba4ed60603c1cdb79ace4f (diff) | |
| parent | 48995423143a097527802e28d7add20e5a27677a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
net/sched/cls_api.c has overlapping changes to a call to
nlmsg_parse(), one (from 'net') added rtm_tca_policy instead of NULL
to the 5th argument, and another (from 'net-next') added cb->extack
instead of NULL to the 6th argument.
net/ipv4/ipmr_base.c is a case of a bug fix in 'net' being done to
code which moved (to mr_table_dump)) in 'net-next'. Thanks to David
Ahern for the heads up.
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, 3 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_interface.c b/net/xfrm/xfrm_interface.c index abafd49cc65d..d679fa0f44b3 100644 --- a/net/xfrm/xfrm_interface.c +++ b/net/xfrm/xfrm_interface.c @@ -116,6 +116,9 @@ static void xfrmi_unlink(struct xfrmi_net *xfrmn, struct xfrm_if *xi) static void xfrmi_dev_free(struct net_device *dev) { + struct xfrm_if *xi = netdev_priv(dev); + + gro_cells_destroy(&xi->gro_cells); free_percpu(dev->tstats); } |