diff options
author | Alexander Aring <alex.aring@gmail.com> | 2014-10-25 17:16:37 +0200 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2014-10-25 21:55:38 +0200 |
commit | 04e850fe06312a9f570fcc7dbd0f141c012df404 (patch) | |
tree | 7c29fb73c597fec7fde431faf412532cd1c9cae1 /net/mac802154/monitor.c | |
parent | mac802154: rename mac802154_sub_if_data (diff) | |
download | linux-04e850fe06312a9f570fcc7dbd0f141c012df404.tar.xz linux-04e850fe06312a9f570fcc7dbd0f141c012df404.zip |
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>
Diffstat (limited to 'net/mac802154/monitor.c')
-rw-r--r-- | net/mac802154/monitor.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac802154/monitor.c b/net/mac802154/monitor.c index bd63e120b914..79bce5258b0c 100644 --- a/net/mac802154/monitor.c +++ b/net/mac802154/monitor.c @@ -39,8 +39,8 @@ static netdev_tx_t mac802154_monitor_xmit(struct sk_buff *skb, sdata = netdev_priv(dev); /* FIXME: locking */ - chan = sdata->hw->phy->current_channel; - page = sdata->hw->phy->current_page; + chan = sdata->local->phy->current_channel; + page = sdata->local->phy->current_page; if (chan == MAC802154_CHAN_NONE) /* not initialized */ return NETDEV_TX_OK; @@ -53,7 +53,7 @@ static netdev_tx_t mac802154_monitor_xmit(struct sk_buff *skb, 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); } |