From b357cbff78224a7203addf28774ddc5b336e2c99 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Wed, 26 Mar 2008 05:57:12 +0000 Subject: [PATCH] --- yaml --- r: 88183 b: refs/heads/master c: 30ecce908b944079181938e61ddbc00c8b23798c h: refs/heads/master i: 88181: baabf4511814d6437eccac7ff910b9cf96b4a939 88179: 1429f8c72550cd9e139a793c4df2cdfb3853e650 88175: 50f9156b663916959eab3984ac991b237db48f04 v: v3 --- [refs] | 2 +- trunk/drivers/net/forcedeth.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index cdeea6ab584c..309ea7725021 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e28e3a614cedb11637f6cc7a30f0812963df62fe +refs/heads/master: 30ecce908b944079181938e61ddbc00c8b23798c diff --git a/trunk/drivers/net/forcedeth.c b/trunk/drivers/net/forcedeth.c index 980c2c229a71..419f533006ab 100644 --- a/trunk/drivers/net/forcedeth.c +++ b/trunk/drivers/net/forcedeth.c @@ -2112,9 +2112,8 @@ static inline void nv_tx_flip_ownership(struct net_device *dev) np->tx_pkts_in_progress--; if (np->tx_change_owner) { - __le32 flaglen = le32_to_cpu(np->tx_change_owner->first_tx_desc->flaglen); - flaglen |= NV_TX2_VALID; - np->tx_change_owner->first_tx_desc->flaglen = cpu_to_le32(flaglen); + np->tx_change_owner->first_tx_desc->flaglen |= + cpu_to_le32(NV_TX2_VALID); np->tx_pkts_in_progress++; np->tx_change_owner = np->tx_change_owner->next_tx_ctx;