Commit c9c6950c authored by Harvey Harrison's avatar Harvey Harrison Committed by John W. Linville
Browse files

mac80211: make ieee80211_get_hdrlen_from_skb return unsigned 



Many callers already expect it to.

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8b7b1e05

include/net/mac80211.h

+1 −1
Original line number Diff line number Diff line
@@ -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

net/mac80211/util.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

	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;