projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'block-5.13-2021-05-09' of git://git.kernel.dk/linux-block
[linux-2.6-microblaze.git]
/
net
/
bluetooth
/
6lowpan.c
diff --git
a/net/bluetooth/6lowpan.c
b/net/bluetooth/6lowpan.c
index
cff4944
..
97617d0
100644
(file)
--- a/
net/bluetooth/6lowpan.c
+++ b/
net/bluetooth/6lowpan.c
@@
-205,8
+205,7
@@
static inline struct lowpan_peer *peer_lookup_dst(struct lowpan_btle_dev *dev,
}
}
}
}
- /* use the neighbour cache for matching addresses assigned by SLAAC
- */
+ /* use the neighbour cache for matching addresses assigned by SLAAC */
neigh = __ipv6_neigh_lookup(dev->netdev, nexthop);
if (neigh) {
list_for_each_entry_rcu(peer, &dev->peers, list) {
neigh = __ipv6_neigh_lookup(dev->netdev, nexthop);
if (neigh) {
list_for_each_entry_rcu(peer, &dev->peers, list) {
@@
-841,8
+840,6
@@
static void chan_close_cb(struct l2cap_chan *chan)
} else {
spin_unlock(&devices_lock);
}
} else {
spin_unlock(&devices_lock);
}
-
- return;
}
static void chan_state_change_cb(struct l2cap_chan *chan, int state, int err)
}
static void chan_state_change_cb(struct l2cap_chan *chan, int state, int err)