Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / net / llc / llc_conn.c

diff --git a/net/llc/llc_conn.c b/net/llc/llc_conn.c
index 5c6d89c6d51d2726dd008162181f307c6825e8d3..3477624a4906ec3fc65957a1eb1567f0864153f4 100644 (file)
--- a/net/llc/llc_conn.c
+++ b/net/llc/llc_conn.c
@@ -332,8 +332,7 @@ int llc_conn_remove_acked_pdus(struct sock *sk, u8 nr, u16 *how_many_unacked)
 
        for (i = 0; i < pdu_pos && i < q_len; i++) {
                skb = skb_dequeue(&llc->pdu_unack_q);
-               if (skb)
-                       kfree_skb(skb);
+               kfree_skb(skb);
                nbr_acked++;
        }
 out: