Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3739099 authored by Dan Carpenter's avatar Dan Carpenter Committed by David S. Miller
Browse files

sfc: remove unneeded variable 



We don't use ->heap_buf after commit 46d1efd8 ("sfc: remove Software
TSO") so let's remove the last traces.

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarEdward Cree <ecree@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 33f8a045

drivers/net/ethernet/sfc/net_driver.h

+1 −7
Original line number Diff line number Diff line
@@ -139,8 +139,6 @@ struct efx_special_buffer { 
 * struct efx_tx_buffer - buffer state for a TX descriptor

 * @skb: When @flags & %EFX_TX_BUF_SKB, the associated socket buffer to be

 *	freed when descriptor completes

 * @heap_buf: When @flags & %EFX_TX_BUF_HEAP, the associated heap buffer to be

 *	freed when descriptor completes.

 * @option: When @flags & %EFX_TX_BUF_OPTION, a NIC-specific option descriptor.

 * @dma_addr: DMA address of the fragment.

 * @flags: Flags for allocation and DMA mapping type
@@ -151,10 +149,7 @@ struct efx_special_buffer { 
 * Only valid if @unmap_len != 0.

 */

struct efx_tx_buffer {

	union {

	const struct sk_buff *skb;

		void *heap_buf;

	};

	union {

		efx_qword_t option;

		dma_addr_t dma_addr;
@@ -166,7 +161,6 @@ struct efx_tx_buffer { 
};

#define EFX_TX_BUF_CONT		1	/* not last descriptor of packet */

#define EFX_TX_BUF_SKB		2	/* buffer is last part of skb */

#define EFX_TX_BUF_HEAP		4	/* buffer was allocated with kmalloc() */

#define EFX_TX_BUF_MAP_SINGLE	8	/* buffer was mapped with dma_map_single() */

#define EFX_TX_BUF_OPTION	0x10	/* empty buffer for option descriptor */

drivers/net/ethernet/sfc/tx.c

+0 −2
Original line number Diff line number Diff line
@@ -84,8 +84,6 @@ static void efx_dequeue_buffer(struct efx_tx_queue *tx_queue, 
		netif_vdbg(tx_queue->efx, tx_done, tx_queue->efx->net_dev,

			   "TX queue %d transmission id %x complete\n",

			   tx_queue->queue, tx_queue->read_count);

	} else if (buffer->flags & EFX_TX_BUF_HEAP) {

		kfree(buffer->heap_buf);

	}



	buffer->len = 0;