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/bluetooth/6lowpan.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/bluetooth/6lowpan.c')
| -rw-r--r-- | net/bluetooth/6lowpan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c index 19d27bee285e..1555b0c6f7ec 100644 --- a/net/bluetooth/6lowpan.c +++ b/net/bluetooth/6lowpan.c @@ -160,10 +160,10 @@ static inline struct lowpan_peer *peer_lookup_dst(struct lowpan_btle_dev *dev, struct in6_addr *daddr, struct sk_buff *skb) { - struct lowpan_peer *peer; - struct in6_addr *nexthop; struct rt6_info *rt = (struct rt6_info *)skb_dst(skb); int count = atomic_read(&dev->peer_count); + const struct in6_addr *nexthop; + struct lowpan_peer *peer; BT_DBG("peers %d addr %pI6c rt %p", count, daddr, rt); |