This patch moves the skb->protocol setting to the position when it's
needed. It's only needed when frame parsing was successful.
Signed-off-by: Alexander Aring <alex.aring@xxxxxxxxx>
---
net/mac802154/rx.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/net/mac802154/rx.c b/net/mac802154/rx.c
index 246a60e..c4066b5 100644
--- a/net/mac802154/rx.c
+++ b/net/mac802154/rx.c
@@ -31,6 +31,8 @@
static int mac802154_process_data(struct net_device *dev, struct sk_buff *skb)
{
+ skb->protocol = htons(ETH_P_IEEE802154);
+
return netif_receive_skb(skb);
}
@@ -224,6 +226,8 @@ mac802154_monitors_rx(struct ieee802154_local *local, struct sk_buff *skb)
u16 crc = crc_ccitt(0, skb->data, skb->len);
u8 *data;
+ skb->protocol = htons(ETH_P_IEEE802154);
+
rcu_read_lock();
list_for_each_entry_rcu(sdata, &local->interfaces, list) {
if (sdata->type != IEEE802154_DEV_MONITOR ||
@@ -248,7 +252,6 @@ void ieee802154_rx(struct ieee802154_hw *hw, struct sk_buff *skb)
WARN_ON_ONCE(softirq_count() == 0);
- skb->protocol = htons(ETH_P_IEEE802154);
skb_reset_mac_header(skb);
if (!(local->hw.flags & IEEE802154_HW_OMIT_CKSUM)) {
--
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
