diff options
| author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2007-12-11 19:54:23 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 23:58:04 +0100 |
| commit | f831e90971dc942a9f2fcc918a5739eb6d4ef4c5 (patch) | |
| tree | c0e5fa17143ca64c3c964e435cb5a7d5903a767e | |
| parent | [IRDA]: Use htons() where appropriate. (diff) | |
| download | linux-f831e90971dc942a9f2fcc918a5739eb6d4ef4c5.tar.xz linux-f831e90971dc942a9f2fcc918a5739eb6d4ef4c5.zip | |
[MAC80211]: Use htons() where appropriate.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/mac80211/rx.c | 2 | ||||
| -rw-r--r-- | net/mac80211/wme.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 0020e409e57d..c542fc1c983d 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 8dbdededdec2..455fadc3d84e 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; |