From f651c505370f6de3a1505453a00e65ca47a854bc Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Wed, 25 Feb 2009 00:22:41 +0000 Subject: [PATCH] --- yaml --- r: 134757 b: refs/heads/master c: fbbfb986a8a3dfb42cd4cae7b1c7f822792823af h: refs/heads/master i: 134755: 81a5e9b4a80df9b781276631797e4a3166f163c0 v: v3 --- [refs] | 2 +- trunk/drivers/net/wan/cosa.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c2b08671551e..4f3671263498 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c71a2699c511623e0520c754cfc109c191bf64e2 +refs/heads/master: fbbfb986a8a3dfb42cd4cae7b1c7f822792823af diff --git a/trunk/drivers/net/wan/cosa.c b/trunk/drivers/net/wan/cosa.c index 0d7ba117ef60..d276d72ee3b7 100644 --- a/trunk/drivers/net/wan/cosa.c +++ b/trunk/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",