Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec

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

diff --git a/net/mac802154/mib.c b/net/mac802154/mib.c
index 033dfc7755c6c68f1aff6f91609f56e0f2e2517a..73f94fbf87856a5b7d81ba0c27c50a0c6f5c54fb 100644 (file)
--- a/net/mac802154/mib.c
+++ b/net/mac802154/mib.c
@@ -26,65 +26,6 @@
 #include "ieee802154_i.h"
 #include "driver-ops.h"
 
-void mac802154_dev_set_short_addr(struct net_device *dev, __le16 val)
-{
-       struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
-
-       BUG_ON(dev->type != ARPHRD_IEEE802154);
-
-       spin_lock_bh(&sdata->mib_lock);
-       sdata->wpan_dev.short_addr = val;
-       spin_unlock_bh(&sdata->mib_lock);
-}
-
-__le16 mac802154_dev_get_short_addr(const struct net_device *dev)
-{
-       struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
-       __le16 ret;
-
-       BUG_ON(dev->type != ARPHRD_IEEE802154);
-
-       spin_lock_bh(&sdata->mib_lock);
-       ret = sdata->wpan_dev.short_addr;
-       spin_unlock_bh(&sdata->mib_lock);
-
-       return ret;
-}
-
-__le16 mac802154_dev_get_pan_id(const struct net_device *dev)
-{
-       struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
-       __le16 ret;
-
-       BUG_ON(dev->type != ARPHRD_IEEE802154);
-
-       spin_lock_bh(&sdata->mib_lock);
-       ret = sdata->wpan_dev.pan_id;
-       spin_unlock_bh(&sdata->mib_lock);
-
-       return ret;
-}
-
-void mac802154_dev_set_pan_id(struct net_device *dev, __le16 val)
-{
-       struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
-
-       BUG_ON(dev->type != ARPHRD_IEEE802154);
-
-       spin_lock_bh(&sdata->mib_lock);
-       sdata->wpan_dev.pan_id = val;
-       spin_unlock_bh(&sdata->mib_lock);
-}
-
-u8 mac802154_dev_get_dsn(const struct net_device *dev)
-{
-       struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
-
-       BUG_ON(dev->type != ARPHRD_IEEE802154);
-
-       return sdata->wpan_dev.dsn++;
-}
-
 void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan)
 {
        struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);