summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWei Yongjun <yjwei@cn.fujitsu.com>2009-02-25 00:22:41 +0000
committerDavid S. Miller <davem@davemloft.net>2009-02-26 23:07:32 -0800
commitfbbfb986a8a3dfb42cd4cae7b1c7f822792823af (patch)
tree89edf974ff8cec79573319b340ca28fd8f1b2aaf
parentc71a2699c511623e0520c754cfc109c191bf64e2 (diff)
downloadlinux-stable-fbbfb986a8a3dfb42cd4cae7b1c7f822792823af.tar.gz
linux-stable-fbbfb986a8a3dfb42cd4cae7b1c7f822792823af.tar.bz2
linux-stable-fbbfb986a8a3dfb42cd4cae7b1c7f822792823af.zip
wan: remove some pointless conditionals before kfree_skb()
Remove some pointless conditionals before kfree_skb(). Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com> Acked-by: Jan "Yenya" Kasprzak <kas@fi.muni.cz> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/wan/cosa.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index 0d7ba117ef60..d276d72ee3b7 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",