Commit 99fe61b2 authored Dec 18, 2019 by Ben Dooks (Codethink) Committed by Jeff Kirsher Feb 19, 2020

e1000e: fix missing cpu_to_le64 on buffer_addr

The following warning suggests there is a missing cpu_to_le64() in
the e1000_flush_tx_ring() function (it is also the behaviour
elsewhere in the driver to do cpu_to_le64() on the buffer_addr
when setting it)

drivers/net/ethernet/intel/e1000e/netdev.c:3813:30: warning: incorrect type in assignment (different base types)
drivers/net/ethernet/intel/e1000e/netdev.c:3813:30: expected restricted __le64 [usertype] buffer_addr
drivers/net/ethernet/intel/e1000e/netdev.c:3813:30: got unsigned long long [usertype] dma

Signed-off-by: Ben Dooks (Codethink) <ben.dooks@codethink.co.uk>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent 7d51a015

drivers/net/ethernet/intel/e1000e/netdev.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3807,7 +3807,7 @@ static void e1000_flush_tx_ring(struct e1000_adapter *adapter)
		tdt = er32(TDT(0));
		BUG_ON(tdt != tx_ring->next_to_use);
		tx_desc = E1000_TX_DESC(*tx_ring, tx_ring->next_to_use);
		tx_desc->buffer_addr = tx_ring->dma;
		tx_desc->buffer_addr = cpu_to_le64(tx_ring->dma);

		tx_desc->lower.data = cpu_to_le32(txd_lower \| size);
		tx_desc->upper.data = 0;

Admin message