diff options
| author |   Li RongQing <roy.qing.li@gmail.com> | 2012-07-09 20:56:06 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-07-11 01:31:23 -0700 |
| commit | 5b70ca3599071a0e26bceab9dd6d7e4c53318881 (patch) | |
| tree | 979fa357f308329817c51229e6f3f9cbb324604b | |
| parent | Merge branch 'davem-next.r8169' of git://violet.fr.zoreil.com/romieu/linux (diff) | |
| download | linux-dev-5b70ca3599071a0e26bceab9dd6d7e4c53318881.tar.xz linux-dev-5b70ca3599071a0e26bceab9dd6d7e4c53318881.zip | |
ksz884x: fix Endian
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>
| -rw-r--r-- | 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 37b44b91950b..318fee91c79d 100644 --- a/drivers/net/ethernet/micrel/ksz884x.c +++ b/drivers/net/ethernet/micrel/ksz884x.c @@ -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); |