mac802154: rename hw subif_data variable to local
This patch renames the hw attribute in struct ieee802154_sub_if_data to
local. This avoid confusing with the struct ieee802154_hw hw; inside of
local struct.
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 d3eb8a4..6eace90 100644
--- a/net/mac802154/iface.c
+++ b/net/mac802154/iface.c
@@ -125,9 +125,9 @@
{
struct ieee802154_sub_if_data *sdata = netdev_priv(dev);
- mutex_lock(&sdata->hw->slaves_mtx);
+ mutex_lock(&sdata->local->slaves_mtx);
sdata->mac_params = *params;
- mutex_unlock(&sdata->hw->slaves_mtx);
+ mutex_unlock(&sdata->local->slaves_mtx);
return 0;
}
@@ -137,16 +137,16 @@
{
struct ieee802154_sub_if_data *sdata = netdev_priv(dev);
- mutex_lock(&sdata->hw->slaves_mtx);
+ mutex_lock(&sdata->local->slaves_mtx);
*params = sdata->mac_params;
- mutex_unlock(&sdata->hw->slaves_mtx);
+ mutex_unlock(&sdata->local->slaves_mtx);
}
static int mac802154_wpan_open(struct net_device *dev)
{
int rc;
struct ieee802154_sub_if_data *sdata = netdev_priv(dev);
- struct wpan_phy *phy = sdata->hw->phy;
+ struct wpan_phy *phy = sdata->local->phy;
rc = mac802154_slave_open(dev);
if (rc < 0)
@@ -339,7 +339,7 @@
dev->stats.tx_packets++;
dev->stats.tx_bytes += skb->len;
- return mac802154_tx(sdata->hw, skb, page, chan);
+ return mac802154_tx(sdata->local, skb, page, chan);
}
static struct header_ops mac802154_header_ops = {