From patchwork Mon Mar 30 21:13:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 456338 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 3352A1400B6 for ; Tue, 31 Mar 2015 08:16:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753619AbbC3VNq (ORCPT ); Mon, 30 Mar 2015 17:13:46 -0400 Received: from mailrelay107.isp.belgacom.be ([195.238.20.134]:48291 "EHLO mailrelay107.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753564AbbC3VNn (ORCPT ); Mon, 30 Mar 2015 17:13:43 -0400 X-Belgacom-Dynamic: yes X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=pojTLeLEEG+IB9MeyQ9xnWKWJHiyH+4Hnj5iAYu/pCk= c=1 sm=2 a=bxo8hnnGHmNjzBeyt0IA:9 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2B4DgDBuxlV/yA2QFdcgwaBLrIWAQEBAQEBBQF7mBAEAgKBPE0BAQEBAQF9QQGDUwEFJy8jEFE5HhmIMwHMDAEBCCKGD4oSBxaEFwWaUIs7iHoiggIcgVI8MYJDAQEB Received: from 32.54-64-87.adsl-dyn.isp.belgacom.be (HELO localhost.home.) ([87.64.54.32]) by relay.skynet.be with ESMTP; 30 Mar 2015 23:13:43 +0200 From: Fabian Frederick To: linux-kernel@vger.kernel.org Cc: Fabian Frederick , "David S. Miller" , netdev@vger.kernel.org Subject: [PATCH 6/9 net-next] af_packet: replace if/BUG by BUG_ON Date: Mon, 30 Mar 2015 23:13:14 +0200 Message-Id: <1427749998-28464-6-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427749998-28464-1-git-send-email-fabf@skynet.be> References: <1427749998-28464-1-git-send-email-fabf@skynet.be> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Fabian Frederick --- net/packet/af_packet.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 5102c3c..fb94c39 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -547,8 +547,7 @@ static void prb_setup_retire_blk_timer(struct packet_sock *po, int tx_ring) { struct tpacket_kbdq_core *pkc; - if (tx_ring) - BUG(); + BUG_ON(tx_ring); pkc = tx_ring ? GET_PBDQC_FROM_RB(&po->tx_ring) : GET_PBDQC_FROM_RB(&po->rx_ring);