mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-20 14:16:02 +00:00
mac80211: make ieee80211_get_hdrlen_from_skb return unsigned
Many callers already expect it to. Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
8b7b1e05b0
commit
c9c6950c14
2 changed files with 5 additions and 5 deletions
|
@ -1535,7 +1535,7 @@ ieee80211_get_buffered_bc(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
|
|||
*
|
||||
* @skb: the frame
|
||||
*/
|
||||
int ieee80211_get_hdrlen_from_skb(const struct sk_buff *skb);
|
||||
unsigned int ieee80211_get_hdrlen_from_skb(const struct sk_buff *skb);
|
||||
|
||||
/**
|
||||
* ieee80211_get_hdrlen - get header length from frame control
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue