diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2009-02-28 18:42:53 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-02 06:10:27 -0500 |
commit | 61b8d2688a0cc9434b18144342c719f809691d72 (patch) | |
tree | fb6d0f7d98dc4dac634e123388aff4093b0d2838 /drivers/net/wimax | |
parent | fd5c565c0c04d2716cfdac3f1de3c2261d6a457d (diff) |
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: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wimax')
-rw-r--r-- | drivers/net/wimax/i2400m/netdev.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/wimax/i2400m/netdev.c b/drivers/net/wimax/i2400m/netdev.c index 2bdd0cdbb319..a98eb4bafc56 100644 --- a/drivers/net/wimax/i2400m/netdev.c +++ b/drivers/net/wimax/i2400m/netdev.c | |||
@@ -402,13 +402,13 @@ void i2400m_tx_timeout(struct net_device *net_dev) | |||
402 | */ | 402 | */ |
403 | static | 403 | static |
404 | void i2400m_rx_fake_eth_header(struct net_device *net_dev, | 404 | void i2400m_rx_fake_eth_header(struct net_device *net_dev, |
405 | void *_eth_hdr, int protocol) | 405 | void *_eth_hdr, __be16 protocol) |
406 | { | 406 | { |
407 | struct ethhdr *eth_hdr = _eth_hdr; | 407 | struct ethhdr *eth_hdr = _eth_hdr; |
408 | 408 | ||
409 | memcpy(eth_hdr->h_dest, net_dev->dev_addr, sizeof(eth_hdr->h_dest)); | 409 | memcpy(eth_hdr->h_dest, net_dev->dev_addr, sizeof(eth_hdr->h_dest)); |
410 | memset(eth_hdr->h_source, 0, sizeof(eth_hdr->h_dest)); | 410 | memset(eth_hdr->h_source, 0, sizeof(eth_hdr->h_dest)); |
411 | eth_hdr->h_proto = cpu_to_be16(protocol); | 411 | eth_hdr->h_proto = protocol; |
412 | } | 412 | } |
413 | 413 | ||
414 | 414 | ||
@@ -474,7 +474,8 @@ void i2400m_net_rx(struct i2400m *i2400m, struct sk_buff *skb_rx, | |||
474 | memcpy(skb_put(skb, buf_len), buf, buf_len); | 474 | memcpy(skb_put(skb, buf_len), buf, buf_len); |
475 | } | 475 | } |
476 | i2400m_rx_fake_eth_header(i2400m->wimax_dev.net_dev, | 476 | i2400m_rx_fake_eth_header(i2400m->wimax_dev.net_dev, |
477 | skb->data - ETH_HLEN, ETH_P_IP); | 477 | skb->data - ETH_HLEN, |
478 | cpu_to_be16(ETH_P_IP)); | ||
478 | skb_set_mac_header(skb, -ETH_HLEN); | 479 | skb_set_mac_header(skb, -ETH_HLEN); |
479 | skb->dev = i2400m->wimax_dev.net_dev; | 480 | skb->dev = i2400m->wimax_dev.net_dev; |
480 | skb->protocol = htons(ETH_P_IP); | 481 | skb->protocol = htons(ETH_P_IP); |
@@ -526,7 +527,8 @@ void i2400m_net_erx(struct i2400m *i2400m, struct sk_buff *skb, | |||
526 | case I2400M_CS_IPV4: | 527 | case I2400M_CS_IPV4: |
527 | protocol = ETH_P_IP; | 528 | protocol = ETH_P_IP; |
528 | i2400m_rx_fake_eth_header(i2400m->wimax_dev.net_dev, | 529 | i2400m_rx_fake_eth_header(i2400m->wimax_dev.net_dev, |
529 | skb->data - ETH_HLEN, ETH_P_IP); | 530 | skb->data - ETH_HLEN, |
531 | cpu_to_be16(ETH_P_IP)); | ||
530 | skb_set_mac_header(skb, -ETH_HLEN); | 532 | skb_set_mac_header(skb, -ETH_HLEN); |
531 | skb->dev = i2400m->wimax_dev.net_dev; | 533 | skb->dev = i2400m->wimax_dev.net_dev; |
532 | skb->protocol = htons(ETH_P_IP); | 534 | skb->protocol = htons(ETH_P_IP); |