* [patch net-next] sfc: remove unneeded variable
@ 2016-11-24 11:16 Dan Carpenter
2016-11-24 12:03 ` Bert Kenward
2016-11-24 13:22 ` Edward Cree
0 siblings, 2 replies; 7+ messages in thread
From: Dan Carpenter @ 2016-11-24 11:16 UTC (permalink / raw)
To: Solarflare linux maintainers, Edward Cree
Cc: Bert Kenward, netdev, kernel-janitors
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.
* @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;
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [patch net-next] sfc: remove unneeded variable
2016-11-24 11:16 [patch net-next] sfc: remove unneeded variable Dan Carpenter
@ 2016-11-24 12:03 ` Bert Kenward
2016-11-24 13:22 ` Edward Cree
1 sibling, 0 replies; 7+ messages in thread
From: Bert Kenward @ 2016-11-24 12:03 UTC (permalink / raw)
To: Dan Carpenter, Solarflare linux maintainers, Edward Cree
Cc: netdev, kernel-janitors
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>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [patch net-next] sfc: remove unneeded variable
2016-11-24 11:16 [patch net-next] sfc: remove unneeded variable Dan Carpenter
2016-11-24 12:03 ` Bert Kenward
@ 2016-11-24 13:22 ` Edward Cree
2016-11-24 13:49 ` Dan Carpenter
2016-11-25 10:43 ` [patch v2 " Dan Carpenter
1 sibling, 2 replies; 7+ messages in thread
From: Edward Cree @ 2016-11-24 13:22 UTC (permalink / raw)
To: Dan Carpenter, Solarflare linux maintainers
Cc: Bert Kenward, netdev, kernel-janitors
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
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [patch net-next] sfc: remove unneeded variable
2016-11-24 13:22 ` Edward Cree
@ 2016-11-24 13:49 ` Dan Carpenter
2016-11-25 10:43 ` [patch v2 " Dan Carpenter
1 sibling, 0 replies; 7+ messages in thread
From: Dan Carpenter @ 2016-11-24 13:49 UTC (permalink / raw)
To: Edward Cree
Cc: Solarflare linux maintainers, Bert Kenward, netdev,
kernel-janitors
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
^ permalink raw reply [flat|nested] 7+ messages in thread* [patch v2 net-next] sfc: remove unneeded variable
2016-11-24 13:22 ` Edward Cree
2016-11-24 13:49 ` Dan Carpenter
@ 2016-11-25 10:43 ` Dan Carpenter
2016-11-25 16:12 ` Edward Cree
2016-11-28 1:30 ` David Miller
1 sibling, 2 replies; 7+ messages in thread
From: Dan Carpenter @ 2016-11-25 10:43 UTC (permalink / raw)
To: Solarflare linux maintainers, Edward Cree
Cc: Bert Kenward, netdev, kernel-janitors
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..18aceb2 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;
@@ -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 */
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;
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [patch v2 net-next] sfc: remove unneeded variable
2016-11-25 10:43 ` [patch v2 " Dan Carpenter
@ 2016-11-25 16:12 ` Edward Cree
2016-11-28 1:30 ` David Miller
1 sibling, 0 replies; 7+ messages in thread
From: Edward Cree @ 2016-11-25 16:12 UTC (permalink / raw)
To: Dan Carpenter, Solarflare linux maintainers
Cc: Bert Kenward, netdev, kernel-janitors
On 25/11/16 10:43, 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: Edward Cree <ecree@solarflare.com>
> diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h
> index f97f828..18aceb2 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;
> @@ -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 */
>
> 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;
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [patch v2 net-next] sfc: remove unneeded variable
2016-11-25 10:43 ` [patch v2 " Dan Carpenter
2016-11-25 16:12 ` Edward Cree
@ 2016-11-28 1:30 ` David Miller
1 sibling, 0 replies; 7+ messages in thread
From: David Miller @ 2016-11-28 1:30 UTC (permalink / raw)
To: dan.carpenter; +Cc: linux-net-drivers, ecree, bkenward, netdev, kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 25 Nov 2016 13:43:04 +0300
> 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>
Applied, thanks Dan.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-11-28 1:30 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-24 11:16 [patch net-next] sfc: remove unneeded variable Dan Carpenter
2016-11-24 12:03 ` Bert Kenward
2016-11-24 13:22 ` Edward Cree
2016-11-24 13:49 ` Dan Carpenter
2016-11-25 10:43 ` [patch v2 " Dan Carpenter
2016-11-25 16:12 ` Edward Cree
2016-11-28 1:30 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).