|
@@ -133,14 +133,14 @@ int ieee80211_get_hdrlen(u16 fc)
|
|
|
}
|
|
|
EXPORT_SYMBOL(ieee80211_get_hdrlen);
|
|
|
|
|
|
-int ieee80211_get_hdrlen_from_skb(const struct sk_buff *skb)
|
|
|
+unsigned int ieee80211_get_hdrlen_from_skb(const struct sk_buff *skb)
|
|
|
{
|
|
|
- const struct ieee80211_hdr *hdr = (const struct ieee80211_hdr *) skb->data;
|
|
|
- int hdrlen;
|
|
|
+ const struct ieee80211_hdr *hdr = (const struct ieee80211_hdr *)skb->data;
|
|
|
+ unsigned int hdrlen;
|
|
|
|
|
|
if (unlikely(skb->len < 10))
|
|
|
return 0;
|
|
|
- hdrlen = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_control));
|
|
|
+ hdrlen = ieee80211_hdrlen(hdr->frame_control);
|
|
|
if (unlikely(hdrlen > skb->len))
|
|
|
return 0;
|
|
|
return hdrlen;
|