From: Daniel Borkmann <dborkman@redhat•com>
To: Duan Jiong <duanj.fnst@cn•fujitsu.com>
Cc: David Miller <davem@davemloft•net>, netdev@vger•kernel.org
Subject: Re: packet: use macro GET_PBDQC_FROM_RB to simplify the codes
Date: Thu, 28 Nov 2013 11:27:02 +0100 [thread overview]
Message-ID: <52971A76.4020202@redhat.com> (raw)
In-Reply-To: <529712A7.3010604@cn.fujitsu.com>
On 11/28/2013 10:53 AM, Duan Jiong wrote:
>
>
> Signed-off-by: Duan Jiong <duanj.fnst@cn•fujitsu.com>
Please resubmit when net-next is open.
> ---
> net/packet/af_packet.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
> index 2e8286b..955611f 100644
> --- a/net/packet/af_packet.c
> +++ b/net/packet/af_packet.c
> @@ -430,7 +430,8 @@ static void prb_shutdown_retire_blk_timer(struct packet_sock *po,
> {
> struct tpacket_kbdq_core *pkc;
>
> - pkc = tx_ring ? &po->tx_ring.prb_bdqc : &po->rx_ring.prb_bdqc;
> + pkc = tx_ring ? GET_PBDQC_FROM_RB(&po->tx_ring)
> + : GET_PBDQC_FROM_RB(&po->rx_ring);
Nit: the colon should actually still be on the previous line.
It would be nice if at some point in time we could get rid of these TPACKET_V3 specific
macros and actually use some inline functions.
>
> spin_lock(&rb_queue->lock);
> pkc->delete_blk_timer = 1;
> @@ -456,7 +457,8 @@ static void prb_setup_retire_blk_timer(struct packet_sock *po, int tx_ring)
> if (tx_ring)
> BUG();
>
> - pkc = tx_ring ? &po->tx_ring.prb_bdqc : &po->rx_ring.prb_bdqc;
> + pkc = tx_ring ? GET_PBDQC_FROM_RB(&po->tx_ring)
> + : GET_RBDQC_FROM_RB(&po->rx_ring);
> prb_init_blk_timer(po, pkc, prb_retire_rx_blk_timer_expired);
> }
>
> @@ -514,7 +516,7 @@ static void init_prb_bdqc(struct packet_sock *po,
> struct pgv *pg_vec,
> union tpacket_req_u *req_u, int tx_ring)
> {
> - struct tpacket_kbdq_core *p1 = &rb->prb_bdqc;
> + struct tpacket_kbdq_core *p1 = GET_PBDQC_FROM_RB(rb);
> struct tpacket_block_desc *pbd;
>
> memset(p1, 0x0, sizeof(*p1));
> @@ -578,7 +580,7 @@ static void _prb_refresh_rx_retire_blk_timer(struct tpacket_kbdq_core *pkc)
> static void prb_retire_rx_blk_timer_expired(unsigned long data)
> {
> struct packet_sock *po = (struct packet_sock *)data;
> - struct tpacket_kbdq_core *pkc = &po->rx_ring.prb_bdqc;
> + struct tpacket_kbdq_core *pkc = GET_PBDQC_FROM_RB(&po->rx_ring);
> unsigned int frozen;
> struct tpacket_block_desc *pbd;
>
>
next prev parent reply other threads:[~2013-11-28 10:27 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-28 9:53 packet: use macro GET_PBDQC_FROM_RB to simplify the codes Duan Jiong
2013-11-28 10:27 ` Daniel Borkmann [this message]
2013-12-02 1:19 ` Duan Jiong
2013-12-02 1:32 ` 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=52971A76.4020202@redhat.com \
--to=dborkman@redhat$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=duanj.fnst@cn$(echo .)fujitsu.com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox