Commit 61b8d268 authored by Harvey Harrison's avatar Harvey Harrison Committed by David S. Miller

wimax: replace uses of __constant_{endian}

Base versions handle constant folding now.

Edited by Inaky to fix conflicts due to changes in netdev.c
Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarInaky Perez-Gonzalez <inaky@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fd5c565c
...@@ -402,13 +402,13 @@ void i2400m_tx_timeout(struct net_device *net_dev) ...@@ -402,13 +402,13 @@ void i2400m_tx_timeout(struct net_device *net_dev)
*/ */
static static
void i2400m_rx_fake_eth_header(struct net_device *net_dev, void i2400m_rx_fake_eth_header(struct net_device *net_dev,
void *_eth_hdr, int protocol) void *_eth_hdr, __be16 protocol)
{ {
struct ethhdr *eth_hdr = _eth_hdr; struct ethhdr *eth_hdr = _eth_hdr;
memcpy(eth_hdr->h_dest, net_dev->dev_addr, sizeof(eth_hdr->h_dest)); memcpy(eth_hdr->h_dest, net_dev->dev_addr, sizeof(eth_hdr->h_dest));
memset(eth_hdr->h_source, 0, sizeof(eth_hdr->h_dest)); memset(eth_hdr->h_source, 0, sizeof(eth_hdr->h_dest));
eth_hdr->h_proto = cpu_to_be16(protocol); eth_hdr->h_proto = protocol;
} }
...@@ -474,7 +474,8 @@ void i2400m_net_rx(struct i2400m *i2400m, struct sk_buff *skb_rx, ...@@ -474,7 +474,8 @@ void i2400m_net_rx(struct i2400m *i2400m, struct sk_buff *skb_rx,
memcpy(skb_put(skb, buf_len), buf, buf_len); memcpy(skb_put(skb, buf_len), buf, buf_len);
} }
i2400m_rx_fake_eth_header(i2400m->wimax_dev.net_dev, i2400m_rx_fake_eth_header(i2400m->wimax_dev.net_dev,
skb->data - ETH_HLEN, ETH_P_IP); skb->data - ETH_HLEN,
cpu_to_be16(ETH_P_IP));
skb_set_mac_header(skb, -ETH_HLEN); skb_set_mac_header(skb, -ETH_HLEN);
skb->dev = i2400m->wimax_dev.net_dev; skb->dev = i2400m->wimax_dev.net_dev;
skb->protocol = htons(ETH_P_IP); skb->protocol = htons(ETH_P_IP);
...@@ -526,7 +527,8 @@ void i2400m_net_erx(struct i2400m *i2400m, struct sk_buff *skb, ...@@ -526,7 +527,8 @@ void i2400m_net_erx(struct i2400m *i2400m, struct sk_buff *skb,
case I2400M_CS_IPV4: case I2400M_CS_IPV4:
protocol = ETH_P_IP; protocol = ETH_P_IP;
i2400m_rx_fake_eth_header(i2400m->wimax_dev.net_dev, i2400m_rx_fake_eth_header(i2400m->wimax_dev.net_dev,
skb->data - ETH_HLEN, ETH_P_IP); skb->data - ETH_HLEN,
cpu_to_be16(ETH_P_IP));
skb_set_mac_header(skb, -ETH_HLEN); skb_set_mac_header(skb, -ETH_HLEN);
skb->dev = i2400m->wimax_dev.net_dev; skb->dev = i2400m->wimax_dev.net_dev;
skb->protocol = htons(ETH_P_IP); skb->protocol = htons(ETH_P_IP);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment