VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / net / atm / clip.c

diff --git a/net/atm/clip.c b/net/atm/clip.c
index 7dc72dd..4417df3 100644 (file)
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -503,7 +503,7 @@ static int clip_mkip(struct atm_vcc *vcc,int timeout)
        skb_queue_head_init(&copy);
        skb_migrate(&vcc->sk->sk_receive_queue, &copy);
        /* re-process everything received between connection setup and MKIP */
-       while ((skb = skb_dequeue(&copy)))
+       while ((skb = skb_dequeue(&copy)) != NULL)
                if (!clip_devs) {
                        atm_return(vcc,skb->truesize);
                        kfree_skb(skb);
@@ -998,7 +998,7 @@ static int __init atm_clip_init(void)
 
        /* so neigh_ifdown() doesn't complain */
        clip_tbl.proxy_timer.data = 0;
-       clip_tbl.proxy_timer.function = 0;
+       clip_tbl.proxy_timer.function = NULL;
        init_timer(&clip_tbl.proxy_timer);
        skb_queue_head_init(&clip_tbl.proxy_queue);