From: Rick Jones <rick.jones2@hp.com>
To: Eric Dumazet <eric.dumazet@gmail.com>, Rick Jones <raj@tardy.usa.hp.com>
Cc: netdev@vger.kernel.org, davem@davemloft.net,
sshah@solarflare.com, linux-net-drivers@solarflare.com
Subject: Re: [PATCH net-next] sfc: Convert the normal transmit complete path to dev_consume_skb_any()
Date: Tue, 09 Sep 2014 16:38:32 -0700 [thread overview]
Message-ID: <540F8F78.9020502@hp.com> (raw)
In-Reply-To: <1410304704.7106.22.camel@edumazet-glaptop2.roam.corp.google.com>
On 09/09/2014 04:18 PM, Eric Dumazet wrote:
> On Tue, 2014-09-09 at 14:43 -0700, Rick Jones wrote:
>> From: Rick Jones <rick.jones2@hp.com>
>> ...
>> Compile tested only. Also a fixup to make scripts/checkpatch.pl
>> happy.
>>
>> diff --git a/drivers/net/ethernet/sfc/tx.c b/drivers/net/ethernet/sfc/tx.c
>> index 65c220f..3206098 100644
>> --- a/drivers/net/ethernet/sfc/tx.c
>> +++ b/drivers/net/ethernet/sfc/tx.c
>> @@ -78,7 +78,7 @@ static void efx_dequeue_buffer(struct efx_tx_queue *tx_queue,
>> if (buffer->flags & EFX_TX_BUF_SKB) {
>> (*pkts_compl)++;
>> (*bytes_compl) += buffer->skb->len;
>> - dev_kfree_skb_any((struct sk_buff *) buffer->skb);
>> + dev_consume_skb_any((struct sk_buff *)buffer->skb);
>> 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);
>
> Right, but please remove this ugly cast while you are at it ;)
>
I can remove that const, and then smooth the ripples stemming from it to
arrive at something like:
diff --git a/drivers/net/ethernet/sfc/net_driver.h
b/drivers/net/ethernet/sfc/ne
index 9ede320..a75aa08 100644
--- a/drivers/net/ethernet/sfc/net_driver.h
+++ b/drivers/net/ethernet/sfc/net_driver.h
@@ -148,7 +148,7 @@ struct efx_special_buffer {
*/
struct efx_tx_buffer {
union {
- const struct sk_buff *skb;
+ struct sk_buff *skb;
void *heap_buf;
};
union {
diff --git a/drivers/net/ethernet/sfc/tx.c b/drivers/net/ethernet/sfc/tx.c
index 65c220f..a43c0c5 100644
--- a/drivers/net/ethernet/sfc/tx.c
+++ b/drivers/net/ethernet/sfc/tx.c
@@ -78,7 +78,7 @@ static void efx_dequeue_buffer(struct efx_tx_queue
*tx_queue,
if (buffer->flags & EFX_TX_BUF_SKB) {
(*pkts_compl)++;
(*bytes_compl) += buffer->skb->len;
- dev_kfree_skb_any((struct sk_buff *) buffer->skb);
+ dev_consume_skb_any(buffer->skb);
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);
@@ -1086,7 +1086,7 @@ static int tso_get_fragment(struct tso_state *st,
struct e
* of fragment or end-of-packet.
*/
static void tso_fill_packet_with_fragment(struct efx_tx_queue *tx_queue,
- const struct sk_buff *skb,
+ struct sk_buff *skb,
struct tso_state *st)
{
struct efx_tx_buffer *buffer;
(might be mangled by this email client)
But perhaps someone from SolarFlare can say why that was a const to
begin with.
rick
next prev parent reply other threads:[~2014-09-09 23:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-09 21:43 [PATCH net-next] sfc: Convert the normal transmit complete path to dev_consume_skb_any() Rick Jones
2014-09-09 23:18 ` Eric Dumazet
2014-09-09 23:38 ` Rick Jones [this message]
2014-09-09 23:46 ` David Miller
2014-09-10 0:25 ` Eric Dumazet
2014-09-10 0:34 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=540F8F78.9020502@hp.com \
--to=rick.jones2@hp.com \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=linux-net-drivers@solarflare.com \
--cc=netdev@vger.kernel.org \
--cc=raj@tardy.usa.hp.com \
--cc=sshah@solarflare.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.