From bfdbbdc1c5e5bb8611c8f024a6e95a4c95408428 Mon Sep 17 00:00:00 2001 From: Li RongQing Date: Mon, 9 Jul 2012 20:56:06 +0000 Subject: [PATCH] --- yaml --- r: 315116 b: refs/heads/master c: 5b70ca3599071a0e26bceab9dd6d7e4c53318881 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/micrel/ksz884x.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3ea1423ffb04..c2b2b64ce3fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e01df28d45464d82894bc7e3b551fc8e59fb76e +refs/heads/master: 5b70ca3599071a0e26bceab9dd6d7e4c53318881 diff --git a/trunk/drivers/net/ethernet/micrel/ksz884x.c b/trunk/drivers/net/ethernet/micrel/ksz884x.c index 37b44b91950b..318fee91c79d 100644 --- a/trunk/drivers/net/ethernet/micrel/ksz884x.c +++ b/trunk/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);