diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-02-25 17:39:16 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-02-25 17:39:16 +0100 |
| commit | 14ef2b0c026558d37662e5e095d59c64597d5769 (patch) | |
| tree | 230c09cc65bc94384c687fed87e6ada954f80609 /drivers/net/igbvf | |
| parent | 57ab12e418ec4fe24c11788bb1bbdabb29d05679 (diff) | |
| parent | 71b38bd4c1cc4f2b653064357e4efab77dfd711d (diff) | |
Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus
Conflicts:
drivers/hid/Kconfig
Diffstat (limited to 'drivers/net/igbvf')
| -rw-r--r-- | drivers/net/igbvf/netdev.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c index 297a5ddd77f..2aa71a766c3 100644 --- a/drivers/net/igbvf/netdev.c +++ b/drivers/net/igbvf/netdev.c @@ -2117,6 +2117,7 @@ static inline int igbvf_tx_map_adv(struct igbvf_adapter *adapter, /* set time_stamp *before* dma to help avoid a possible race */ buffer_info->time_stamp = jiffies; buffer_info->next_to_watch = i; + buffer_info->mapped_as_page = false; buffer_info->dma = pci_map_single(pdev, skb->data, len, PCI_DMA_TODEVICE); if (pci_dma_mapping_error(pdev, buffer_info->dma)) |