From 41cb137f1030ec0d67a3172fa3b24193ce1feacd Mon Sep 17 00:00:00 2001
From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Wed, 12 Dec 2007 03:54:23 +0900
Subject: [PATCH] --- yaml --- r: 78463 b: refs/heads/master c:
 f831e90971dc942a9f2fcc918a5739eb6d4ef4c5 h: refs/heads/master i:   78461:
 0df2d2dccec16c21dcbd6c4c75c51439bca7254f   78459:
 68871cc73e4f5707573e2134e0b1d000bf8c2c70   78455:
 58a3b0b3c584fc508a18885fd1898910429ebf03   78447:
 d60cf7eb0890c2dd1c25bf9240eba22acfc68011   78431:
 01629d201c4044a4f9926b3b82330bdeadb9ee40   78399:
 5bf4aa120e54965a98699cb3f6b4a461fabe89a0   78335:
 f6319d295c1fdd660bf82bf3b5c48ff2145ac84d v: v3

---
 [refs]                   | 2 +-
 trunk/net/mac80211/rx.c  | 2 +-
 trunk/net/mac80211/wme.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d16d62ffea8b..98fee0ed316f 100644
--- 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
index 0020e409e57d..c542fc1c983d 100644
--- 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
index 8dbdededdec2..455fadc3d84e 100644
--- 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;