---

yaml --- r: 88183 b: refs/heads/master c: 30ecce9 h: refs/heads/master i: 88181: baabf45 88179: 1429f8c 88175: 50f9156 v: v3
git-mirror · Apr 4, 2008 · b357cbf · b357cbf
1 parent f9a11af
commit b357cbf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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;