From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ryan Mallon Subject: Re: [PATCH] net/packet: remove dead code and unneeded variable from prb_setup_retire_blk_timer() Date: Mon, 14 Nov 2011 16:42:09 +1100 Message-ID: <4EC0AA31.9040403@gmail.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "David S. Miller" , Eric Dumazet , Changli Gao , Ben Greear , Chetan Loke , waltje@uWalt.NL.Mugnet.ORG, gw4pts@gw4pts.ampr.org, waltje@linux.com, ross.biro@gmail.com, alan@linux.intel.com To: Jesper Juhl Return-path: In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org 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 > --- > 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,