Bluetooth: Add legacy SMP tests

[deliverable/linux.git] / net / mac802154 / mib.c

diff --git a/net/mac802154/mib.c b/net/mac802154/mib.c
index 6fa749154bafa8732b8a6f7d498411cc1c406111..5cf019a57fd79cd601209971c349023e6c619ea0 100644 (file)
--- a/net/mac802154/mib.c
+++ b/net/mac802154/mib.c
@@ -33,7 +33,7 @@ void mac802154_dev_set_short_addr(struct net_device *dev, __le16 val)
        BUG_ON(dev->type != ARPHRD_IEEE802154);
 
        spin_lock_bh(&sdata->mib_lock);
-       sdata->short_addr = val;
+       sdata->wpan_dev.short_addr = val;
        spin_unlock_bh(&sdata->mib_lock);
 }
 
@@ -45,7 +45,7 @@ __le16 mac802154_dev_get_short_addr(const struct net_device *dev)
        BUG_ON(dev->type != ARPHRD_IEEE802154);
 
        spin_lock_bh(&sdata->mib_lock);
-       ret = sdata->short_addr;
+       ret = sdata->wpan_dev.short_addr;
        spin_unlock_bh(&sdata->mib_lock);
 
        return ret;
@@ -59,7 +59,7 @@ __le16 mac802154_dev_get_pan_id(const struct net_device *dev)
        BUG_ON(dev->type != ARPHRD_IEEE802154);
 
        spin_lock_bh(&sdata->mib_lock);
-       ret = sdata->pan_id;
+       ret = sdata->wpan_dev.pan_id;
        spin_unlock_bh(&sdata->mib_lock);
 
        return ret;
@@ -72,7 +72,7 @@ void mac802154_dev_set_pan_id(struct net_device *dev, __le16 val)
        BUG_ON(dev->type != ARPHRD_IEEE802154);
 
        spin_lock_bh(&sdata->mib_lock);
-       sdata->pan_id = val;
+       sdata->wpan_dev.pan_id = val;
        spin_unlock_bh(&sdata->mib_lock);
 }
 
@@ -82,7 +82,7 @@ u8 mac802154_dev_get_dsn(const struct net_device *dev)
 
        BUG_ON(dev->type != ARPHRD_IEEE802154);
 
-       return sdata->dsn++;
+       return sdata->wpan_dev.dsn++;
 }
 
 void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan)
@@ -104,7 +104,6 @@ void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan)
        }
 }
 
-
 int mac802154_get_params(struct net_device *dev,
                         struct ieee802154_llsec_params *params)
 {
@@ -136,7 +135,6 @@ int mac802154_set_params(struct net_device *dev,
        return res;
 }
 
-
 int mac802154_add_key(struct net_device *dev,
                      const struct ieee802154_llsec_key_id *id,
                      const struct ieee802154_llsec_key *key)
@@ -168,7 +166,6 @@ int mac802154_del_key(struct net_device *dev,
        return res;
 }
 
-
 int mac802154_add_dev(struct net_device *dev,
                      const struct ieee802154_llsec_device *llsec_dev)
 {
@@ -198,7 +195,6 @@ int mac802154_del_dev(struct net_device *dev, __le64 dev_addr)
        return res;
 }
 
-
 int mac802154_add_devkey(struct net_device *dev,
                         __le64 device_addr,
                         const struct ieee802154_llsec_device_key *key)
@@ -231,7 +227,6 @@ int mac802154_del_devkey(struct net_device *dev,
        return res;
 }
 
-
 int mac802154_add_seclevel(struct net_device *dev,
                           const struct ieee802154_llsec_seclevel *sl)
 {
@@ -262,7 +257,6 @@ int mac802154_del_seclevel(struct net_device *dev,
        return res;
 }
 
-
 void mac802154_lock_table(struct net_device *dev)
 {
        struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);