Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 225015
b: refs/heads/master
c: 36b973d
h: refs/heads/master
i:
  225013: 633d02f
  225011: dce5ca3
  225007: e9a13a3
v: v3
  • Loading branch information
Bruce Allan authored and Jeff Kirsher committed Dec 11, 2010
1 parent 8dfc3c5 commit 196ad90
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 073287c037083497ebaaf75ead469b769f218615
refs/heads/master: 36b973df713e1395b79896de667ad7dbb1925fa7
4 changes: 2 additions & 2 deletions trunk/drivers/net/e1000e/netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -4629,7 +4629,7 @@ static void e1000_tx_queue(struct e1000_adapter *adapter,

i = tx_ring->next_to_use;

while (count--) {
do {
buffer_info = &tx_ring->buffer_info[i];
tx_desc = E1000_TX_DESC(*tx_ring, i);
tx_desc->buffer_addr = cpu_to_le64(buffer_info->dma);
Expand All @@ -4640,7 +4640,7 @@ static void e1000_tx_queue(struct e1000_adapter *adapter,
i++;
if (i == tx_ring->count)
i = 0;
}
} while (--count > 0);

tx_desc->lower.data |= cpu_to_le32(adapter->txd_cmd);

Expand Down

0 comments on commit 196ad90

Please sign in to comment.