summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2015-05-17 21:45:06 +0200
committerMarcel Holtmann <marcel@holtmann.org>2015-05-19 11:44:46 +0200
commit12da8d97ab3239101077a415c2587bfbf6725216 (patch)
tree611a7bcf159d52478943e1223deea56ead29d887
parentfakelb: introduce fakelb ifup phys list (diff)
downloadlinux-12da8d97ab3239101077a415c2587bfbf6725216.tar.xz
linux-12da8d97ab3239101077a415c2587bfbf6725216.zip
fakelb: use own channel and page attributes
This patch adds an own phy attribute for page and channel into fakelb_phy. The current way is to use the internal mac802154 stored phy pib values which can occur in locking issues while using it inside the driver layer. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--drivers/net/ieee802154/fakelb.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/net/ieee802154/fakelb.c b/drivers/net/ieee802154/fakelb.c
index 83957de47243..c60837e0df25 100644
--- a/drivers/net/ieee802154/fakelb.c
+++ b/drivers/net/ieee802154/fakelb.c
@@ -38,6 +38,9 @@ static DEFINE_RWLOCK(fakelb_ifup_phys_lock);
struct fakelb_phy {
struct ieee802154_hw *hw;
+ u8 page;
+ u8 channel;
+
struct list_head list;
struct list_head list_ifup;
};
@@ -54,8 +57,12 @@ fakelb_hw_ed(struct ieee802154_hw *hw, u8 *level)
static int
fakelb_hw_channel(struct ieee802154_hw *hw, u8 page, u8 channel)
{
- pr_debug("set channel to %d\n", channel);
+ struct fakelb_phy *phy = hw->priv;
+ write_lock_bh(&fakelb_ifup_phys_lock);
+ phy->page = page;
+ phy->channel = channel;
+ write_unlock_bh(&fakelb_ifup_phys_lock);
return 0;
}
@@ -80,8 +87,8 @@ fakelb_hw_xmit(struct ieee802154_hw *hw, struct sk_buff *skb)
if (current_phy == phy)
continue;
- if (phy->hw->phy->current_channel ==
- current_phy->hw->phy->current_channel)
+ if (current_phy->page == phy->page &&
+ current_phy->channel == phy->channel)
fakelb_hw_deliver(phy, skb);
}
read_unlock_bh(&fakelb_ifup_phys_lock);