Skip to content

Commit

Permalink
mac802154: rx: rename remove mac802154_subif_rx
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
alexaring authored and holtmann committed Oct 27, 2014
1 parent 4ca18be commit 469100d
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions net/mac802154/rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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
Expand Down

0 comments on commit 469100d

Please sign in to comment.