[v2 PATCH] ksz884x: fix Endian

Subsystems: networking drivers, the rest

STALE5145d

2 messages, 2 authors, 2012-07-11 · open the first message on its own page

[v2 PATCH] ksz884x: fix Endian

From: <hidden>
Date: 2012-07-10 06:56:18

From: Li RongQing <redacted>

ETH_P_IP is host Endian, skb->protocol is big Endian, when
compare them, Using htons on skb->protocol is wrong.

And fix two code style issues: indentation and remove
unnecessary parentheses.

CC: Tristram Ha <redacted>
CC: Ben Hutchings <redacted>
CC: Joe Perches <joe@perches.com>
Signed-off-by: Li RongQing <redacted>
---
 drivers/net/ethernet/micrel/ksz884x.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c
index eaf9ff0..0fbe2e2 100644
--- a/drivers/net/ethernet/micrel/ksz884x.c
+++ b/drivers/net/ethernet/micrel/ksz884x.c
@@ -4881,8 +4881,8 @@ static netdev_tx_t netdev_tx(struct sk_buff *skb, struct net_device *dev)
 	left = hw_alloc_pkt(hw, skb->len, num);
 	if (left) {
 		if (left < num ||
-				((CHECKSUM_PARTIAL == skb->ip_summed) &&
-				(ETH_P_IPV6 == htons(skb->protocol)))) {
+		    (CHECKSUM_PARTIAL == skb->ip_summed &&
+		     skb->protocol == htons(ETH_P_IPV6))) {
 			struct sk_buff *org_skb = skb;
 
 			skb = netdev_alloc_skb(dev, org_skb->len);
-- 
1.7.1

Re: [v2 PATCH] ksz884x: fix Endian

From: David Miller <davem@davemloft.net>
Date: 2012-07-11 08:31:45

From: roy.qing.li@gmail.com
Date: Tue, 10 Jul 2012 14:56:06 +0800
From: Li RongQing <redacted>

ETH_P_IP is host Endian, skb->protocol is big Endian, when
compare them, Using htons on skb->protocol is wrong.

And fix two code style issues: indentation and remove
unnecessary parentheses.

CC: Tristram Ha <redacted>
CC: Ben Hutchings <redacted>
CC: Joe Perches <joe@perches.com>
Signed-off-by: Li RongQing <redacted>
Applied.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help