From c9702ec6dd1902b8f551ec0163252df0d1584534 Mon Sep 17 00:00:00 2001 From: Jesse Brandeburg Date: Wed, 1 Nov 2006 08:47:42 -0800 Subject: [PATCH] --- yaml --- r: 41481 b: refs/heads/master c: 2ce9047f5d8464039da8ff986e71be5546e229c0 h: refs/heads/master i: 41479: 9ac0cadb23cab41dca5d089eeea86fc605231f0d v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000/e1000_main.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 69df20cb7dab..c80224edbfcd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 21c4d5e07859a6fc0f62be37da15b161e142c8d1 +refs/heads/master: 2ce9047f5d8464039da8ff986e71be5546e229c0 diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c index 93b97c6b8a63..681b738c6dac 100644 --- a/trunk/drivers/net/e1000/e1000_main.c +++ b/trunk/drivers/net/e1000/e1000_main.c @@ -2867,6 +2867,9 @@ e1000_tx_queue(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring, tx_ring->next_to_use = i; writel(i, adapter->hw.hw_addr + tx_ring->tdt); + /* we need this if more than one processor can write to our tail + * at a time, it syncronizes IO on IA64/Altix systems */ + mmiowb(); } /**