From c97bbf74d505edb3b7196846aa41f0f3120afa5a Mon Sep 17 00:00:00 2001 From: Valentine Barshak Date: Thu, 27 Mar 2008 17:43:57 +0300 Subject: [PATCH] --- yaml --- r: 88023 b: refs/heads/master c: e66f4168d133b9d848dead4c031d11a84caec6dc h: refs/heads/master i: 88021: ea3fd0f86140451915a12127470ed75f7c0d1f61 88019: a5c4465c6183dcc31bb60dbba84ad49a8d33ede5 88015: 4a2c5e188656e4c8f2351f1e9f4de7c331a5c140 v: v3 --- [refs] | 2 +- trunk/drivers/net/ibm_newemac/core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6789e5193348..e4289daf20d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5beaf7d6f89c13b2414656e994d3ee6350e99d3a +refs/heads/master: e66f4168d133b9d848dead4c031d11a84caec6dc diff --git a/trunk/drivers/net/ibm_newemac/core.c b/trunk/drivers/net/ibm_newemac/core.c index 0789802d59ed..378a23963495 100644 --- a/trunk/drivers/net/ibm_newemac/core.c +++ b/trunk/drivers/net/ibm_newemac/core.c @@ -1242,8 +1242,8 @@ static int emac_close(struct net_device *ndev) static inline u16 emac_tx_csum(struct emac_instance *dev, struct sk_buff *skb) { - if (emac_has_feature(dev, EMAC_FTR_HAS_TAH && - skb->ip_summed == CHECKSUM_PARTIAL)) { + if (emac_has_feature(dev, EMAC_FTR_HAS_TAH) && + (skb->ip_summed == CHECKSUM_PARTIAL)) { ++dev->stats.tx_packets_csum; return EMAC_TX_CTRL_TAH_CSUM; }