diff options
Diffstat (limited to 'net/mac80211')
-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) | |||
1193 | 1193 | ||
1194 | if (xmit_skb) { | 1194 | if (xmit_skb) { |
1195 | /* send to wireless media */ | 1195 | /* send to wireless media */ |
1196 | xmit_skb->protocol = __constant_htons(ETH_P_802_3); | 1196 | xmit_skb->protocol = htons(ETH_P_802_3); |
1197 | skb_set_network_header(xmit_skb, 0); | 1197 | skb_set_network_header(xmit_skb, 0); |
1198 | skb_set_mac_header(xmit_skb, 0); | 1198 | skb_set_mac_header(xmit_skb, 0); |
1199 | dev_queue_xmit(xmit_skb); | 1199 | 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) | |||
55 | 55 | ||
56 | /* check there is a valid IP header present */ | 56 | /* check there is a valid IP header present */ |
57 | offset = ieee80211_get_hdrlen_from_skb(skb) + 8 /* LLC + proto */; | 57 | offset = ieee80211_get_hdrlen_from_skb(skb) + 8 /* LLC + proto */; |
58 | if (skb->protocol != __constant_htons(ETH_P_IP) || | 58 | if (skb->protocol != htons(ETH_P_IP) || |
59 | skb->len < offset + sizeof(*ip)) | 59 | skb->len < offset + sizeof(*ip)) |
60 | return 0; | 60 | return 0; |
61 | 61 | ||