linux-kernel - Re: [PATCH] net/packet: remove dead code and unneeded variable from prb_setup_retire_blk

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <4EC0AA31.9040403@gmail.com>
Date:	Mon, 14 Nov 2011 16:42:09 +1100
From:	Ryan Mallon <rmallon@...il.com>
To:	Jesper Juhl <jj@...osbits.net>
CC:	netdev@...r.kernel.org, linux-kernel@...r.kernel.org,
	"David S. Miller" <davem@...emloft.net>,
	Eric Dumazet <eric.dumazet@...il.com>,
	Changli Gao <xiaosuo@...il.com>,
	Ben Greear <greearb@...delatech.com>,
	Chetan Loke <loke.chetan@...il.com>,
	waltje@...lt.NL.Mugnet.ORG, gw4pts@...pts.ampr.org,
	waltje@...ux.com, ross.biro@...il.com, alan@...ux.intel.com
Subject: Re: [PATCH] net/packet: remove dead code and unneeded variable from
 prb_setup_retire_blk_timer()

On 14/11/11 08:55, Jesper Juhl wrote:

> We test for 'tx_ring' being != zero and BUG() if that's the case. So after
> that check there is no way that 'tx_ring' could be anything _but_ zero, so
> testing it again is just dead code. Once that dead code is removed, the
> 'pkc' local variable becomes entirely redundant, so remove that as well.


What if CONFIG_BUG=n?

~Ryan

 
> Signed-off-by: Jesper Juhl <jj@...osbits.net>
> ---
>  net/packet/af_packet.c |    6 ++----
>  1 files changed, 2 insertions(+), 4 deletions(-)
> 
>  only compile tested.
> 
> diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
> index 82a6f34..ab10e84 100644
> --- a/net/packet/af_packet.c
> +++ b/net/packet/af_packet.c
> @@ -516,13 +516,11 @@ static void prb_init_blk_timer(struct packet_sock *po,
>  
>  static void prb_setup_retire_blk_timer(struct packet_sock *po, int tx_ring)
>  {
> -	struct tpacket_kbdq_core *pkc;
> -
>  	if (tx_ring)
>  		BUG();
>  
> -	pkc = tx_ring ? &po->tx_ring.prb_bdqc : &po->rx_ring.prb_bdqc;
> -	prb_init_blk_timer(po, pkc, prb_retire_rx_blk_timer_expired);
> +	prb_init_blk_timer(po, &po->rx_ring.prb_bdqc,
> +			   prb_retire_rx_blk_timer_expired);
>  }
>  
>  static int prb_calc_retire_blk_tmo(struct packet_sock *po,


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/