diff options
| author | David S. Miller <davem@davemloft.net> | 2019-06-26 13:26:08 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-26 13:26:08 -0700 |
| commit | 13696531dc90d2bd54d143aabcb766d228240e06 (patch) | |
| tree | 5a3157b02ac8196710f12cd0d7964c7e2a8913cc /drivers | |
| parent | 22e72b5e049b95789b34a4cef316c791e7c2fed5 (diff) | |
| parent | 2c6b55f45d53420d8310d41310e0e2cd41fe073f (diff) | |
Merge branch 'ipv6-fix-neighbour-resolution-with-raw-socket'
Nicolas Dichtel says:
====================
ipv6: fix neighbour resolution with raw socket
The first patch prepares the fix, it constify rt6_nexthop().
The detail of the bug is explained in the second patch.
v1 -> v2:
- fix compilation warnings
- split the initial patch
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -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); |