From patchwork Wed Feb 25 10:22:41 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 23695 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 3A8C1DDE23 for ; Wed, 25 Feb 2009 21:23:20 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759788AbZBYKXP (ORCPT ); Wed, 25 Feb 2009 05:23:15 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759657AbZBYKXP (ORCPT ); Wed, 25 Feb 2009 05:23:15 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:49495 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1757368AbZBYKXN (ORCPT ); Wed, 25 Feb 2009 05:23:13 -0500 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id EFA67170028; Wed, 25 Feb 2009 18:35:37 +0800 (CST) Received: from fnst.cn.fujitsu.com (localhost.localdomain [127.0.0.1]) by tang.cn.fujitsu.com (8.13.1/8.13.1) with ESMTP id n1PAOeUd009409; Wed, 25 Feb 2009 18:24:40 +0800 Received: from [127.0.0.1] (unknown [10.167.141.76]) by fnst.cn.fujitsu.com (Postfix) with ESMTP id 3F4F9DC3CB; Wed, 25 Feb 2009 18:23:24 +0800 (CST) Message-ID: <49A51BF1.2030503@cn.fujitsu.com> Date: Wed, 25 Feb 2009 18:22:41 +0800 From: Wei Yongjun User-Agent: Thunderbird 2.0.0.6 (Windows/20070728) MIME-Version: 1.0 To: "Jan \"Yenya\" Kasprzak" , Jeff Garzik CC: netdev@vger.kernel.org Subject: [PATCH] wan: remove some pointless conditionals before kfree_skb() Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove some pointless conditionals before kfree_skb(). Signed-off-by: Wei Yongjun Acked-by: Jan "Yenya" Kasprzak --- drivers/net/wan/cosa.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c index 0d7ba11..d276d72 100644 --- a/drivers/net/wan/cosa.c +++ b/drivers/net/wan/cosa.c @@ -731,8 +731,7 @@ static char *cosa_net_setup_rx(struct channel_data *chan, int size) * We can safely fall back to non-dma-able memory, because we have * the cosa->bouncebuf pre-allocated. */ - if (chan->rx_skb) - kfree_skb(chan->rx_skb); + kfree_skb(chan->rx_skb); chan->rx_skb = dev_alloc_skb(size); if (chan->rx_skb == NULL) { printk(KERN_NOTICE "%s: Memory squeeze, dropping packet\n",