projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'cleanup-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
[cascardo/linux.git]
/
net
/
mac802154
/
llsec.c
diff --git
a/net/mac802154/llsec.c
b/net/mac802154/llsec.c
index
1456f73
..
4570581
100644
(file)
--- a/
net/mac802154/llsec.c
+++ b/
net/mac802154/llsec.c
@@
-538,6
+538,7
@@
static int llsec_recover_addr(struct mac802154_llsec *sec,
struct ieee802154_addr *addr)
{
__le16 caddr = sec->params.coord_shortaddr;
+
addr->pan_id = sec->params.pan_id;
if (caddr == cpu_to_le16(IEEE802154_ADDR_BROADCAST)) {