diff options
| author | Varka Bhadram <varkabhadram@gmail.com> | 2015-07-07 10:50:43 +0530 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2015-07-23 17:10:50 +0200 |
| commit | d10270ce941ee89afd74076ea3ed8dbef8a0ff25 (patch) | |
| tree | 7f8a76b666eb5d16eadfa1dc58420a018cbb6bb8 /net | |
| parent | 729a8989b3fa8ae7965c537dfccbd08512e84d3c (diff) | |
| download | linux-stable-d10270ce941ee89afd74076ea3ed8dbef8a0ff25.tar.gz linux-stable-d10270ce941ee89afd74076ea3ed8dbef8a0ff25.tar.bz2 linux-stable-d10270ce941ee89afd74076ea3ed8dbef8a0ff25.zip | |
mac802154: fix ieee802154_rx handling
Instead of passing ieee802154_hw pointer to ieee802154_rx,
we can directly pass the ieee802154_local pointer.
Signed-off-by: Varka Bhadram <varkabhadram@gmail.com>
Acked-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac802154/ieee802154_i.h | 2 | ||||
| -rw-r--r-- | net/mac802154/main.c | 2 | ||||
| -rw-r--r-- | net/mac802154/rx.c | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/net/mac802154/ieee802154_i.h b/net/mac802154/ieee802154_i.h index eb8502a6e719..6810d7a25aca 100644 --- a/net/mac802154/ieee802154_i.h +++ b/net/mac802154/ieee802154_i.h @@ -124,7 +124,7 @@ ieee802154_sdata_running(struct ieee802154_sub_if_data *sdata) extern struct ieee802154_mlme_ops mac802154_mlme_wpan; -void ieee802154_rx(struct ieee802154_hw *hw, struct sk_buff *skb); +void ieee802154_rx(struct ieee802154_local *local, struct sk_buff *skb); netdev_tx_t ieee802154_monitor_start_xmit(struct sk_buff *skb, struct net_device *dev); netdev_tx_t diff --git a/net/mac802154/main.c b/net/mac802154/main.c index 4caf04b676d7..91f120845a45 100644 --- a/net/mac802154/main.c +++ b/net/mac802154/main.c @@ -40,7 +40,7 @@ static void ieee802154_tasklet_handler(unsigned long data) * netstack. */ skb->pkt_type = 0; - ieee802154_rx(&local->hw, skb); + ieee802154_rx(local, skb); break; default: WARN(1, "mac802154: Packet is of unknown type %d\n", diff --git a/net/mac802154/rx.c b/net/mac802154/rx.c index 7791c9b8cb57..d1c33c1d6b9b 100644 --- a/net/mac802154/rx.c +++ b/net/mac802154/rx.c @@ -246,9 +246,8 @@ ieee802154_monitors_rx(struct ieee802154_local *local, struct sk_buff *skb) } } -void ieee802154_rx(struct ieee802154_hw *hw, struct sk_buff *skb) +void ieee802154_rx(struct ieee802154_local *local, struct sk_buff *skb) { - struct ieee802154_local *local = hw_to_local(hw); u16 crc; WARN_ON_ONCE(softirq_count() == 0); |