diff options
| author | David S. Miller <davem@davemloft.net> | 2016-09-20 22:52:50 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-09-20 22:52:50 -0400 |
| commit | 204dfe1798bbfa242e4083b87c3a8c5200412e6f (patch) | |
| tree | bfaea82669ebf422344557e06c86f1c455ce41b4 /net/6lowpan/ndisc.c | |
| parent | ad9798967dd67f080bf0e8d611b382a5d292aae2 (diff) | |
| parent | af4168c5a925dc3b11b0246c2b91124327919f47 (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2016-09-19
Here's the main bluetooth-next pull request for the 4.9 kernel.
- Added new messages for monitor sockets for better mgmt tracing
- Added local name and appearance support in scan response
- Added new Qualcomm WCNSS SMD based HCI driver
- Minor fixes & cleanup to 802.15.4 code
- New USB ID to btusb driver
- Added Marvell support to HCI UART driver
- Add combined LED trigger for controller power
- Other minor fixes here and there
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/6lowpan/ndisc.c')
| -rw-r--r-- | net/6lowpan/ndisc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/6lowpan/ndisc.c b/net/6lowpan/ndisc.c index 86450b7e2899..941df2fa4448 100644 --- a/net/6lowpan/ndisc.c +++ b/net/6lowpan/ndisc.c @@ -101,8 +101,6 @@ static void lowpan_ndisc_802154_update(struct neighbour *n, u32 flags, ieee802154_be16_to_le16(&neigh->short_addr, lladdr_short); if (!lowpan_802154_is_valid_src_short_addr(neigh->short_addr)) neigh->short_addr = cpu_to_le16(IEEE802154_ADDR_SHORT_UNSPEC); - } else { - neigh->short_addr = cpu_to_le16(IEEE802154_ADDR_SHORT_UNSPEC); } write_unlock_bh(&n->lock); } |