| Message ID | 20161124111651.GJ17225@mwanda |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
On 24/11/16 11:16, Dan Carpenter wrote: > We don't use ->heap_buf after commit 46d1efd852cc ("sfc: remove Software > TSO") so let's remove the last traces. > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Bert Kenward <bkenward@solarflare.com>
On 24/11/16 11:16, Dan Carpenter wrote: > We don't use ->heap_buf after commit 46d1efd852cc ("sfc: remove Software > TSO") so let's remove the last traces. > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > > diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h > index f97f828..fd17bda 100644 > --- a/drivers/net/ethernet/sfc/net_driver.h > +++ b/drivers/net/ethernet/sfc/net_driver.h > @@ -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. Does that mean we can also remove EFX_TX_BUF_HEAP? -Ed
On Thu, Nov 24, 2016 at 01:22:24PM +0000, Edward Cree wrote: > On 24/11/16 11:16, Dan Carpenter wrote: > > We don't use ->heap_buf after commit 46d1efd852cc ("sfc: remove Software > > TSO") so let's remove the last traces. > > > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > > > > diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h > > index f97f828..fd17bda 100644 > > --- a/drivers/net/ethernet/sfc/net_driver.h > > +++ b/drivers/net/ethernet/sfc/net_driver.h > > @@ -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. > > Does that mean we can also remove EFX_TX_BUF_HEAP? Good point. I will resend. regards, dan carpenter
diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h index f97f828..fd17bda 100644 --- a/drivers/net/ethernet/sfc/net_driver.h +++ b/drivers/net/ethernet/sfc/net_driver.h @@ -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; - }; + const struct sk_buff *skb; union { efx_qword_t option; dma_addr_t dma_addr; diff --git a/drivers/net/ethernet/sfc/tx.c b/drivers/net/ethernet/sfc/tx.c index 1aa728c..bb07034 100644 --- a/drivers/net/ethernet/sfc/tx.c +++ b/drivers/net/ethernet/sfc/tx.c @@ -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;
We don't use ->heap_buf after commit 46d1efd852cc ("sfc: remove Software TSO") so let's remove the last traces. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>