Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 048e7f7e authored by Alexander Aring's avatar Alexander Aring Committed by Marcel Holtmann
Browse files

ieee802154: cleanup WARN_ON for fc fetch 



This patch cleanups the WARN_ON which occurs when the sk buffer has
insufficient buffer space by moving the WARN_ON into if condition.

Signed-off-by: default avatarAlexander Aring <aar@pengutronix.de>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 38961294

include/net/mac802154.h

+3 −4
Original line number Diff line number Diff line
@@ -250,11 +250,10 @@ static inline __le16 ieee802154_get_fc_from_skb(const struct sk_buff *skb) 
	__le16 fc;



	/* check if we can fc at skb_mac_header of sk buffer */

	if (unlikely(!skb_mac_header_was_set(skb) ||

		     (skb_tail_pointer(skb) - skb_mac_header(skb)) < 2)) {

		WARN_ON(1);

	if (WARN_ON(!skb_mac_header_was_set(skb) ||

		    (skb_tail_pointer(skb) -

		     skb_mac_header(skb)) < IEEE802154_FC_LEN))

		return cpu_to_le16(0);

	}



	memcpy(&fc, skb_mac_header(skb), IEEE802154_FC_LEN);

	return fc;