leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mac80211: make ieee80211_get_hdrlen_from_skb return unsigned

Browse Source 
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:
Harvey Harrison 2008-06-11 14:21:57 -07:00 committed by John W. Linville
parent 8b7b1e05b0
commit c9c6950c14
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/mac80211.h
View File

@ -1535,7 +1535,7 @@ ieee80211_get_buffered_bc(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
* *
* @skb: the frame * @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 * ieee80211_get_hdrlen - get header length from frame control

8
net/mac80211/util.c
View File

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