From a72229050ffdc3f87a0ed45201a4150e976fc202 Mon Sep 17 00:00:00 2001
From: Marcin Slusarz <marcin.slusarz@gmail.com>
Date: Tue, 4 Mar 2008 15:19:20 -0800
Subject: [PATCH] --- yaml --- r: 90391 b: refs/heads/master c:
 b39b5a2bc339d8ea04fde2e343bcb4c8f38df692 h: refs/heads/master i:   90389:
 f63a06a2f2678de5b060ede59a068aadb3798203   90387:
 5bd3a534a4e7baeb5c200d7754e9bc0f0e6acfd9   90383:
 5ff07975ca6778d6fe713406babf5f7cfff8d384 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/qla3xxx.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 463ee19ac3de..cb6b8ba0dd7b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a6d84c1b26fd8a1deb28a4bbed672959f7f26ae
+refs/heads/master: b39b5a2bc339d8ea04fde2e343bcb4c8f38df692
diff --git a/trunk/drivers/net/qla3xxx.c b/trunk/drivers/net/qla3xxx.c
index a6aeb9d60443..b7f7b2227d56 100644
--- a/trunk/drivers/net/qla3xxx.c
+++ b/trunk/drivers/net/qla3xxx.c
@@ -2472,8 +2472,7 @@ static int ql_send_map(struct ql3_adapter *qdev,
 
 	if (seg_cnt == 1) {
 		/* Terminate the last segment. */
-		oal_entry->len =
-		    cpu_to_le32(le32_to_cpu(oal_entry->len) | OAL_LAST_ENTRY);
+		oal_entry->len |= cpu_to_le32(OAL_LAST_ENTRY);
 	} else {
 		oal = tx_cb->oal;
 		for (completed_segs=0; completed_segs<frag_cnt; completed_segs++,seg++) {
@@ -2530,8 +2529,7 @@ static int ql_send_map(struct ql3_adapter *qdev,
 					  frag->size);
 		}
 		/* Terminate the last segment. */
-		oal_entry->len =
-		    cpu_to_le32(le32_to_cpu(oal_entry->len) | OAL_LAST_ENTRY);
+		oal_entry->len |= cpu_to_le32(OAL_LAST_ENTRY);
 	}
 
 	return NETDEV_TX_OK;