]> Pileus Git - ~andy/linux/commitdiff
ksz884x: fix Endian
authorLi RongQing <roy.qing.li@gmail.com>
Mon, 9 Jul 2012 20:56:06 +0000 (20:56 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 11 Jul 2012 08:31:23 +0000 (01:31 -0700)
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 <Tristram.Ha@micrel.com>
CC: Ben Hutchings <bhutchings@solarflare.com>
CC: Joe Perches <joe@perches.com>
Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/micrel/ksz884x.c

index 37b44b91950b77071041cf405ab6d3b2822c274b..318fee91c79dad0eeaa6673bd04adb68e43b6f63 100644 (file)
@@ -4879,8 +4879,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);