diff mbox

wimax: replace uses of __constant_{endian}

Message ID 1235900574-15319-7-git-send-email-inaky@linux.intel.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Inaky Perez-Gonzalez March 1, 2009, 9:42 a.m. UTC 
From: Harvey Harrison <harvey.harrison@gmail.com>

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>
---
 drivers/net/wimax/i2400m/netdev.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

Comments

Harvey Harrison March 1, 2009, 7:06 p.m. UTC | #1 
On Sun, 2009-03-01 at 01:42 -0800, Inaky Perez-Gonzalez wrote:
> From: Harvey Harrison <harvey.harrison@gmail.com>
> 
> 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>
> ---

I'm not sure the description matches the patch...or the rest of the
patch is missing.

Harvey

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Inaky Perez-Gonzalez March 2, 2009, 12:07 a.m. UTC | #2 
On Sunday 01 March 2009, Harvey Harrison wrote:
> On Sun, 2009-03-01 at 01:42 -0800, Inaky Perez-Gonzalez wrote:
> > From: Harvey Harrison <harvey.harrison@gmail.com>
> >
> > 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>
> > ---
>
> I'm not sure the description matches the patch...or the rest of the
> patch is missing.

This is a conflict fix -- yours (the original) is still in the tree, (way) 
before this series. 

However, some of the code merged in with my fixes conflicted with your 
edits, so only those are changed to reflect the new code (hence the 
"Edited" line).

Hope this clarifies
diff mbox

Patch

diff --git a/drivers/net/wimax/i2400m/netdev.c b/drivers/net/wimax/i2400m/netdev.c
index 2bdd0cd..a98eb4b 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)
  */
 static
 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;
 
 	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));
-	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,
 		memcpy(skb_put(skb, buf_len), buf, buf_len);
 	}
 	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->dev = i2400m->wimax_dev.net_dev;
 	skb->protocol = htons(ETH_P_IP);
@@ -526,7 +527,8 @@  void i2400m_net_erx(struct i2400m *i2400m, struct sk_buff *skb,
 	case I2400M_CS_IPV4:
 		protocol = ETH_P_IP;
 		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->dev = i2400m->wimax_dev.net_dev;
 		skb->protocol = htons(ETH_P_IP);