From: Alexander Aring Date: Mon, 27 Oct 2014 16:13:34 +0000 (+0100) Subject: mac802154: rx: rename remove mac802154_subif_rx X-Git-Tag: v3.19-rc1~118^2~234^2~3^2~54 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=469100d6c2ff22cd1f50672ac6d09a1633334489;p=~emulex%2Finfiniband.git 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 Signed-off-by: Marcel Holtmann --- diff --git a/net/mac802154/rx.c b/net/mac802154/rx.c index 04f3d61719e..246a60e8f76 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