Message ID | m38wirm119.fsf@intrepid.localdomain |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Krzysztof Halasa <khc@pm.waw.pl> Date: Tue, 14 Jul 2009 23:01:54 +0200 > Maybe you apply the workaround for 2.6.31 and I (or someone) will > convert e100 to coherent allocs for packet descriptors, post-31? I think that's a good plan. Will give a few days for Intel folks to chime in before applying your patch for 2.6.31, but otherwise that's my plan. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Jul 14, 2009 at 2:05 PM, David Miller<davem@davemloft.net> wrote: > From: Krzysztof Halasa <khc@pm.waw.pl> > Date: Tue, 14 Jul 2009 23:01:54 +0200 > >> Maybe you apply the workaround for 2.6.31 and I (or someone) will >> convert e100 to coherent allocs for packet descriptors, post-31? > > I think that's a good plan. > > Will give a few days for Intel folks to chime in before applying > your patch for 2.6.31, but otherwise that's my plan. Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Date: Thu, 16 Jul 2009 15:27:01 -0700 > On Tue, Jul 14, 2009 at 2:05 PM, David Miller<davem@davemloft.net> wrote: >> From: Krzysztof Halasa <khc@pm.waw.pl> >> Date: Tue, 14 Jul 2009 23:01:54 +0200 >> >>> Maybe you apply the workaround for 2.6.31 and I (or someone) will >>> convert e100 to coherent allocs for packet descriptors, post-31? >> >> I think that's a good plan. >> >> Will give a few days for Intel folks to chime in before applying >> your patch for 2.6.31, but otherwise that's my plan. > > Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Applied, and queued for -stable, thanks everyone. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
--- a/drivers/net/e100.c +++ b/drivers/net/e100.c @@ -1762,6 +1762,9 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx, if (ioread8(&nic->csr->scb.status) & rus_no_res) nic->ru_running = RU_SUSPENDED; + pci_dma_sync_single_for_device(nic->pdev, rx->dma_addr, + sizeof(struct rfd), + PCI_DMA_BIDIRECTIONAL); return -ENODATA; }