From: YOSHIFUJI Hideaki Date: Tue, 11 Dec 2007 18:54:23 +0000 (+0900) Subject: [MAC80211]: Use htons() where appropriate. X-Git-Tag: v2.6.25-rc1~1162^2~1085 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f831e90971dc942a9f2fcc918a5739eb6d4ef4c5;p=linux-2.6 [MAC80211]: Use htons() where appropriate. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller --- diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 0020e409e5..c542fc1c98 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1193,7 +1193,7 @@ ieee80211_deliver_skb(struct ieee80211_txrx_data *rx) if (xmit_skb) { /* send to wireless media */ - xmit_skb->protocol = __constant_htons(ETH_P_802_3); + xmit_skb->protocol = htons(ETH_P_802_3); skb_set_network_header(xmit_skb, 0); skb_set_mac_header(xmit_skb, 0); dev_queue_xmit(xmit_skb); diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c index 8dbdededde..455fadc3d8 100644 --- a/net/mac80211/wme.c +++ b/net/mac80211/wme.c @@ -55,7 +55,7 @@ static inline unsigned classify_1d(struct sk_buff *skb, struct Qdisc *qd) /* check there is a valid IP header present */ offset = ieee80211_get_hdrlen_from_skb(skb) + 8 /* LLC + proto */; - if (skb->protocol != __constant_htons(ETH_P_IP) || + if (skb->protocol != htons(ETH_P_IP) || skb->len < offset + sizeof(*ip)) return 0;