diff options
author | Phoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de> | 2014-05-16 11:46:40 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-05-16 17:23:41 -0400 |
commit | f30be4d53cada48598dab0983866ae4b16af46dc (patch) | |
tree | 032e1761fd2a0f7ea4bb09f828d3938c99085725 /net/mac802154/mac802154.h | |
parent | 4c14a2fb5d143e4ed94143be2b8c1961b47df9af (diff) |
mac802154: integrate llsec with wpan devices
Signed-off-by: Phoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac802154/mac802154.h')
-rw-r--r-- | net/mac802154/mac802154.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/net/mac802154/mac802154.h b/net/mac802154/mac802154.h index e05f66e2eda3..a8d7cbc701a0 100644 --- a/net/mac802154/mac802154.h +++ b/net/mac802154/mac802154.h | |||
@@ -23,9 +23,12 @@ | |||
23 | #ifndef MAC802154_H | 23 | #ifndef MAC802154_H |
24 | #define MAC802154_H | 24 | #define MAC802154_H |
25 | 25 | ||
26 | #include <linux/mutex.h> | ||
26 | #include <net/mac802154.h> | 27 | #include <net/mac802154.h> |
27 | #include <net/ieee802154_netdev.h> | 28 | #include <net/ieee802154_netdev.h> |
28 | 29 | ||
30 | #include "llsec.h" | ||
31 | |||
29 | /* mac802154 device private data */ | 32 | /* mac802154 device private data */ |
30 | struct mac802154_priv { | 33 | struct mac802154_priv { |
31 | struct ieee802154_dev hw; | 34 | struct ieee802154_dev hw; |
@@ -91,6 +94,13 @@ struct mac802154_sub_if_data { | |||
91 | u8 bsn; | 94 | u8 bsn; |
92 | /* MAC DSN field */ | 95 | /* MAC DSN field */ |
93 | u8 dsn; | 96 | u8 dsn; |
97 | |||
98 | /* protects sec from concurrent access by netlink. access by | ||
99 | * encrypt/decrypt/header_create safe without additional protection. | ||
100 | */ | ||
101 | struct mutex sec_mtx; | ||
102 | |||
103 | struct mac802154_llsec sec; | ||
94 | }; | 104 | }; |
95 | 105 | ||
96 | #define mac802154_to_priv(_hw) container_of(_hw, struct mac802154_priv, hw) | 106 | #define mac802154_to_priv(_hw) container_of(_hw, struct mac802154_priv, hw) |