AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ieee802154: cleanup WARN_ON for fc fetch

Browse Source 
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: Alexander Aring <aar@pengutronix.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Alexander Aring 2016-07-06 23:32:30 +02:00 committed by Marcel Holtmann
parent 3896129451
commit 048e7f7e66
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/net/mac802154.h
View File

@ -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;