p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Alexander Aring 2014-11-02 04:18:42 +01:00 committed by Marcel Holtmann
parent 776e59de46
commit 78b4bad16e
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/mac802154/iface.c
View File

@ -208,6 +208,10 @@ static int mac802154_wpan_open(struct net_device *dev)
rc = drv_set_extended_addr(local, sdata->extended_addr); rc = drv_set_extended_addr(local, sdata->extended_addr);
if (rc < 0) if (rc < 0)
goto out; goto out;
rc = drv_set_short_addr(local, sdata->short_addr);
if (rc < 0)
goto out;
} }
if (local->hw.flags & IEEE802154_HW_TXPOWER) { if (local->hw.flags & IEEE802154_HW_TXPOWER) {

6
net/mac802154/mib.c
View File

@ -80,12 +80,6 @@ void mac802154_dev_set_short_addr(struct net_device *dev, __le16 val)
spin_lock_bh(&sdata->mib_lock); spin_lock_bh(&sdata->mib_lock);
sdata->short_addr = val; sdata->short_addr = val;
spin_unlock_bh(&sdata->mib_lock); 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) __le16 mac802154_dev_get_short_addr(const struct net_device *dev)