mac802154: move mac pib attributes into wpan_dev

This patch moves all mac pib attributes into the wpan_dev struct.
Furthermore we can easier access these attributes over the netdev
802154_ptr pointer. Currently this is only possible over a complicated
callback structure in mac802154 because subif data structure is
accessable inside mac802154 only.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Alexander Aring
2014-11-09 08:36:45 +01:00
committed by Marcel Holtmann
parent b0c42cd7b2
commit 863e88f255
5 changed files with 59 additions and 47 deletions

View File

@@ -52,14 +52,9 @@ struct wpan_phy {
u32 channels_supported[32];
s8 transmit_power;
u8 cca_mode;
u8 min_be;
u8 max_be;
u8 csma_retries;
s8 frame_retries;
__le64 perm_extended_addr;
bool lbt;
s32 cca_ed_level;
struct device dev;
@@ -69,6 +64,25 @@ struct wpan_phy {
struct wpan_dev {
struct wpan_phy *wpan_phy;
/* MAC PIB */
__le16 pan_id;
__le16 short_addr;
__le64 extended_addr;
/* MAC BSN field */
u8 bsn;
/* MAC DSN field */
u8 dsn;
u8 min_be;
u8 max_be;
u8 csma_retries;
s8 frame_retries;
bool lbt;
bool promiscuous_mode;
};
#define to_phy(_dev) container_of(_dev, struct wpan_phy, dev)