summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/mac802154/ieee802154_i.h2
-rw-r--r--net/mac802154/main.c2
-rw-r--r--net/mac802154/rx.c3
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)
124 124
125extern struct ieee802154_mlme_ops mac802154_mlme_wpan; 125extern struct ieee802154_mlme_ops mac802154_mlme_wpan;
126 126
127void ieee802154_rx(struct ieee802154_hw *hw, struct sk_buff *skb); 127void ieee802154_rx(struct ieee802154_local *local, struct sk_buff *skb);
128netdev_tx_t 128netdev_tx_t
129ieee802154_monitor_start_xmit(struct sk_buff *skb, struct net_device *dev); 129ieee802154_monitor_start_xmit(struct sk_buff *skb, struct net_device *dev);
130netdev_tx_t 130netdev_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)
40 * netstack. 40 * netstack.
41 */ 41 */
42 skb->pkt_type = 0; 42 skb->pkt_type = 0;
43 ieee802154_rx(&local->hw, skb); 43 ieee802154_rx(local, skb);
44 break; 44 break;
45 default: 45 default:
46 WARN(1, "mac802154: Packet is of unknown type %d\n", 46 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)
246 } 246 }
247} 247}
248 248
249void ieee802154_rx(struct ieee802154_hw *hw, struct sk_buff *skb) 249void ieee802154_rx(struct ieee802154_local *local, struct sk_buff *skb)
250{ 250{
251 struct ieee802154_local *local = hw_to_local(hw);
252 u16 crc; 251 u16 crc;
253 252
254 WARN_ON_ONCE(softirq_count() == 0); 253 WARN_ON_ONCE(softirq_count() == 0);