diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-07-08 18:04:41 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-07-08 18:04:41 +0200 |
| commit | 552a031ba12a4236be107a5b082a399237758a5d (patch) | |
| tree | a2bcdeb651b360013dbb654bbcd61dbaf51e0331 /drivers/net/vrf.c | |
| parent | f584dd32edc5d4400d7ceb92111a89f0c1f6651f (diff) | |
| parent | 0ecfebd2b52404ae0c54a878c872bb93363ada36 (diff) | |
Merge tag 'v5.2' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/vrf.c')
| -rw-r--r-- | drivers/net/vrf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index 11b9525dff27..311b0cc6eb98 100644 --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c @@ -350,8 +350,8 @@ static int vrf_finish_output6(struct net *net, struct sock *sk, { struct dst_entry *dst = skb_dst(skb); struct net_device *dev = dst->dev; + const struct in6_addr *nexthop; struct neighbour *neigh; - struct in6_addr *nexthop; int ret; nf_reset(skb); |