From patchwork Sun Nov 13 21:55:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Juhl X-Patchwork-Id: 125454 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0FAD0B71FA for ; Mon, 14 Nov 2011 08:50:41 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752157Ab1KMVuJ (ORCPT ); Sun, 13 Nov 2011 16:50:09 -0500 Received: from swampdragon.chaosbits.net ([90.184.90.115]:13600 "EHLO swampdragon.chaosbits.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751210Ab1KMVuI (ORCPT ); Sun, 13 Nov 2011 16:50:08 -0500 Received: by swampdragon.chaosbits.net (Postfix, from userid 1000) id 587F89403D; Sun, 13 Nov 2011 22:55:51 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by swampdragon.chaosbits.net (Postfix) with ESMTP id 493339403B; Sun, 13 Nov 2011 22:55:51 +0100 (CET) Date: Sun, 13 Nov 2011 22:55:50 +0100 (CET) From: Jesper Juhl To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org cc: "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 Subject: [PATCH] net/packet: remove dead code and unneeded variable from prb_setup_retire_blk_timer() Message-ID: User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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. 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,