summaryrefslogtreecommitdiffstats
path: root/net/mac80211/util.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-06-11 23:21:57 +0200
committerJohn W. Linville <linville@tuxdriver.com>2008-06-14 18:18:12 +0200
commitc9c6950c14ffc0e30e592fec1ebcb203ad3dff10 (patch)
treebcfdd7dea25e8b6acfea1a54ea28394a531e3fae /net/mac80211/util.c
parentmac80211: remove ieee80211_get_morefrag (diff)
downloadlinux-c9c6950c14ffc0e30e592fec1ebcb203ad3dff10.tar.xz
linux-c9c6950c14ffc0e30e592fec1ebcb203ad3dff10.zip
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>
Diffstat (limited to 'net/mac80211/util.c')
-rw-r--r--net/mac80211/util.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 6513bc2d2707..f3c30d00b21e 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -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;