This patch removes the mac802154_subif_rx function and do the necessary
calls inside of ieee802154_rx function. The ieee802154_rx is small
enough to move the functionality inside this function.
Signed-off-by: Alexander Aring <alex.aring@xxxxxxxxx>
---
net/mac802154/rx.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/net/mac802154/rx.c b/net/mac802154/rx.c
index 04f3d61..246a60e 100644
--- a/net/mac802154/rx.c
+++ b/net/mac802154/rx.c
@@ -242,11 +242,12 @@ mac802154_monitors_rx(struct ieee802154_local *local, struct sk_buff *skb)
rcu_read_unlock();
}
-static void
-mac802154_subif_rx(struct ieee802154_hw *hw, struct sk_buff *skb)
+void ieee802154_rx(struct ieee802154_hw *hw, struct sk_buff *skb)
{
struct ieee802154_local *local = hw_to_local(hw);
+ WARN_ON_ONCE(softirq_count() == 0);
+
skb->protocol = htons(ETH_P_IEEE802154);
skb_reset_mac_header(skb);
@@ -273,13 +274,6 @@ mac802154_subif_rx(struct ieee802154_hw *hw, struct sk_buff *skb)
fail:
kfree_skb(skb);
}
-
-void ieee802154_rx(struct ieee802154_hw *hw, struct sk_buff *skb)
-{
- WARN_ON_ONCE(softirq_count() == 0);
-
- mac802154_subif_rx(hw, skb);
-}
EXPORT_SYMBOL(ieee802154_rx);
void
--
2.1.2
--
To unsubscribe from this list: send the line "unsubscribe linux-wpan" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
