aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ixgb
diff options
context:
space:
mode:
authorJesse Brandeburg <jesse.brandeburg@intel.com>2008-07-08 18:51:37 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-07-11 01:20:27 -0400
commit34336635467c5102777ea8acf34fc8bf391f98c0 (patch)
tree62476f5b198ec0fc30bae6cf76628f1a07a246e6 /drivers/net/ixgb
parenta65a604a01f710defe01f2322e108f4d8c20f6ce (diff)
ixgb: move time stamp set before setting dma pointer
a user pointed out that setting variables out of order with respect to the checks we make for tx timeout handling could result in a race where ->dma was set but ->time_stamp was set to the old value. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/ixgb')
-rw-r--r--drivers/net/ixgb/ixgb_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index 0e72dadf8b70..4bf6bbc65822 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -1290,12 +1290,12 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb,
1290 1290
1291 buffer_info->length = size; 1291 buffer_info->length = size;
1292 WARN_ON(buffer_info->dma != 0); 1292 WARN_ON(buffer_info->dma != 0);
1293 buffer_info->time_stamp = jiffies;
1293 buffer_info->dma = 1294 buffer_info->dma =
1294 pci_map_single(adapter->pdev, 1295 pci_map_single(adapter->pdev,
1295 skb->data + offset, 1296 skb->data + offset,
1296 size, 1297 size,
1297 PCI_DMA_TODEVICE); 1298 PCI_DMA_TODEVICE);
1298 buffer_info->time_stamp = jiffies;
1299 buffer_info->next_to_watch = 0; 1299 buffer_info->next_to_watch = 0;
1300 1300
1301 len -= size; 1301 len -= size;
@@ -1322,13 +1322,13 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb,
1322 size -= 4; 1322 size -= 4;
1323 1323
1324 buffer_info->length = size; 1324 buffer_info->length = size;
1325 buffer_info->time_stamp = jiffies;
1325 buffer_info->dma = 1326 buffer_info->dma =
1326 pci_map_page(adapter->pdev, 1327 pci_map_page(adapter->pdev,
1327 frag->page, 1328 frag->page,
1328 frag->page_offset + offset, 1329 frag->page_offset + offset,
1329 size, 1330 size,
1330 PCI_DMA_TODEVICE); 1331 PCI_DMA_TODEVICE);
1331 buffer_info->time_stamp = jiffies;
1332 buffer_info->next_to_watch = 0; 1332 buffer_info->next_to_watch = 0;
1333 1333
1334 len -= size; 1334 len -= size;