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 /net/ipv6/ip6_output.c | |
| parent | net: dsa: microchip: Use gpiod_set_value_cansleep() (diff) | |
| parent | ipv6: fix neighbour resolution with raw socket (diff) | |
| download | linux-dev-13696531dc90d2bd54d143aabcb766d228240e06.tar.xz linux-dev-13696531dc90d2bd54d143aabcb766d228240e06.zip | |
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 'net/ipv6/ip6_output.c')
| -rw-r--r-- | net/ipv6/ip6_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 834475717110..21efcd02f337 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -59,8 +59,8 @@ static int ip6_finish_output2(struct net *net, struct sock *sk, struct sk_buff * { 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; if (ipv6_addr_is_multicast(&ipv6_hdr(skb)->daddr)) { |