diff options
| author | Alexander Aring <alex.aring@gmail.com> | 2014-10-27 17:13:34 +0100 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2014-10-27 18:07:43 +0100 |
| commit | 469100d6c2ff22cd1f50672ac6d09a1633334489 (patch) | |
| tree | 24d49994c9a7b246f40a083885d330b638dc4fe0 | |
| parent | mac802154: tx: remove monitor receive while xmit (diff) | |
| download | linux-469100d6c2ff22cd1f50672ac6d09a1633334489.tar.xz linux-469100d6c2ff22cd1f50672ac6d09a1633334489.zip | |
mac802154: rx: rename remove mac802154_subif_rx
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@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
| -rw-r--r-- | net/mac802154/rx.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/net/mac802154/rx.c b/net/mac802154/rx.c index 04f3d61719ec..246a60e8f76a 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 |