wireless: replace uses of __constant_{endian}

The base versions handle constant folding now.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

3 files changed, 9 insertions, 9 deletions

diff --git a/drivers/net/wireless/hostap/hostap_80211_rx.c b/drivers/net/wireless/hostap/hostap_80211_rx.c
index 19b1bf0478bd..241756318da4 100644
--- a/drivers/net/wireless/hostap/hostap_80211_rx.c
+++ b/drivers/net/wireless/hostap/hostap_80211_rx.c
@@ -193,7 +193,7 @@ hdr->f.status = s; hdr->f.len = l; hdr->f.data = d
         if (prism_header)
                 skb_pull(skb, phdrlen);
         skb->pkt_type = PACKET_OTHERHOST;
-        skb->protocol = __constant_htons(ETH_P_802_2);
+        skb->protocol = cpu_to_be16(ETH_P_802_2);
         memset(skb->cb, 0, sizeof(skb->cb));
         netif_rx(skb);
 
@@ -1094,7 +1094,7 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
         if (skb2 != NULL) {
                 /* send to wireless media */
                 skb2->dev = dev;
-                skb2->protocol = __constant_htons(ETH_P_802_3);
+                skb2->protocol = cpu_to_be16(ETH_P_802_3);
                 skb_reset_mac_header(skb2);
                 skb_reset_network_header(skb2);
                 /* skb2->network_header += ETH_HLEN; */
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c
index 0903db786d5f..0a4bf94dddfb 100644
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
@@ -609,7 +609,7 @@ static void hostap_ap_tx_cb(struct sk_buff *skb, int ok, void *data)
         skb->dev = ap->local->apdev;
         skb_pull(skb, hostap_80211_get_hdrlen(fc));
         skb->pkt_type = PACKET_OTHERHOST;
-        skb->protocol = __constant_htons(ETH_P_802_2);
+        skb->protocol = cpu_to_be16(ETH_P_802_2);
         memset(skb->cb, 0, sizeof(skb->cb));
         netif_rx(skb);
 }
@@ -2281,7 +2281,7 @@ void hostap_rx(struct net_device *dev, struct sk_buff *skb,
             WLAN_FC_GET_STYPE(fc) == IEEE80211_STYPE_BEACON)
                 goto drop;
 
-        skb->protocol = __constant_htons(ETH_P_HOSTAP);
+        skb->protocol = cpu_to_be16(ETH_P_HOSTAP);
         handle_ap_item(local, skb, rx_stats);
         return;
 
@@ -2310,7 +2310,7 @@ static void schedule_packet_send(local_info_t *local, struct sta_info *sta)
         hdr = (struct ieee80211_hdr_4addr *) skb_put(skb, 16);
 
         /* Generate a fake pspoll frame to start packet delivery */
-        hdr->frame_ctl = __constant_cpu_to_le16(
+        hdr->frame_ctl = cpu_to_le16(
                 IEEE80211_FTYPE_CTL | IEEE80211_STYPE_PSPOLL);
         memcpy(hdr->addr1, local->dev->dev_addr, ETH_ALEN);
         memcpy(hdr->addr2, sta->addr, ETH_ALEN);
@@ -2754,7 +2754,7 @@ ap_tx_ret hostap_handle_sta_tx(local_info_t *local, struct hostap_tx_data *tx)
         if (meta->flags & HOSTAP_TX_FLAGS_ADD_MOREDATA) {
                 /* indicate to STA that more frames follow */
                 hdr->frame_ctl |=
-                        __constant_cpu_to_le16(IEEE80211_FCTL_MOREDATA);
+                        cpu_to_le16(IEEE80211_FCTL_MOREDATA);
         }
 
         if (meta->flags & HOSTAP_TX_FLAGS_BUFFERED_FRAME) {
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
index c40fdf4c79de..8618b3355eb4 100644
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -1638,7 +1638,7 @@ static int prism2_request_hostscan(struct net_device *dev,
         memset(&scan_req, 0, sizeof(scan_req));
         scan_req.channel_list = cpu_to_le16(local->channel_mask &
                                             local->scan_channel_mask);
-        scan_req.txrate = __constant_cpu_to_le16(HFA384X_RATES_1MBPS);
+        scan_req.txrate = cpu_to_le16(HFA384X_RATES_1MBPS);
         if (ssid) {
                 if (ssid_len > 32)
                         return -EINVAL;
@@ -1668,7 +1668,7 @@ static int prism2_request_scan(struct net_device *dev)
         memset(&scan_req, 0, sizeof(scan_req));
         scan_req.channel_list = cpu_to_le16(local->channel_mask &
                                             local->scan_channel_mask);
-        scan_req.txrate = __constant_cpu_to_le16(HFA384X_RATES_1MBPS);
+        scan_req.txrate = cpu_to_le16(HFA384X_RATES_1MBPS);
 
         /* FIX:
          * It seems to be enough to set roaming mode for a short moment to
@@ -2514,7 +2514,7 @@ static int prism2_ioctl_priv_prism2_param(struct net_device *dev,
                 u16 rate;
 
                 memset(&scan_req, 0, sizeof(scan_req));
-                scan_req.channel_list = __constant_cpu_to_le16(0x3fff);
+                scan_req.channel_list = cpu_to_le16(0x3fff);
                 switch (value) {
                 case 1: rate = HFA384X_RATES_1MBPS; break;
                 case 2: rate = HFA384X_RATES_2MBPS; break;