mac802154: set short address filter on ifup

This patch moves the setting of hardware short address filtering
inside of interface up instead doing it it directly inside of netlink
interface. The netlink call which can only be called when netif isn't
running sets only the necessary short_addr value in sdata. After an
interface up the address filter will be set with this value.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/mac802154/iface.c b/net/mac802154/iface.c
index a509a7151be9ea88dcb462750b44a73927a0ef1e..1bae29dff082359e6d7192a238734a64071434d6 100644 (file)
--- a/net/mac802154/iface.c
+++ b/net/mac802154/iface.c
@@ -208,6 +208,10 @@ static int mac802154_wpan_open(struct net_device *dev)
                rc = drv_set_extended_addr(local, sdata->extended_addr);
                if (rc < 0)
                        goto out;
+
+               rc = drv_set_short_addr(local, sdata->short_addr);
+               if (rc < 0)
+                       goto out;
        }
 
        if (local->hw.flags & IEEE802154_HW_TXPOWER) {

diff --git a/net/mac802154/mib.c b/net/mac802154/mib.c
index cfd4f657a24e7b413c8e53f38435cb86fb0fa97d..755befde6a178e2da71956b5a026da0cbbdf806c 100644 (file)
--- a/net/mac802154/mib.c
+++ b/net/mac802154/mib.c
@@ -80,12 +80,6 @@ void mac802154_dev_set_short_addr(struct net_device *dev, __le16 val)
        spin_lock_bh(&sdata->mib_lock);
        sdata->short_addr = val;
        spin_unlock_bh(&sdata->mib_lock);
-
-       if ((sdata->local->ops->set_hw_addr_filt) &&
-           (sdata->local->hw.hw_filt.short_addr != sdata->short_addr)) {
-               sdata->local->hw.hw_filt.short_addr = sdata->short_addr;
-               set_hw_addr_filt(dev, IEEE802154_AFILT_SADDR_CHANGED);
-       }
 }
 
 __le16 mac802154_dev_get_short_addr(const struct net_device *dev)