---

yaml --- r: 78463 b: refs/heads/master c: f831e90 h: refs/heads/master i: 78461: 0df2d2d 78459: 68871cc 78455: 58a3b0b 78447: d60cf7e 78431: 01629d2 78399: 5bf4aa1 78335: f6319d2 v: v3
git-mirror · Jan 28, 2008 · 41cb137 · 41cb137
1 parent f696998
commit 41cb137
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d82de9e576ea84b549b927e6a7775d918a427b5
+refs/heads/master: f831e90971dc942a9f2fcc918a5739eb6d4ef4c5
diff --git a/trunk/net/mac80211/rx.c b/trunk/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/trunk/net/mac80211/wme.c b/trunk/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;