Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / net / ipv6 / xfrm6_state.c

diff --git a/net/ipv6/xfrm6_state.c b/net/ipv6/xfrm6_state.c
index 0e685b05496ee6456e5b2d7ab2d5feddd2b52e07..f417b77fa0e15762715a9498974fbd8f5071401d 100644 (file)
--- a/net/ipv6/xfrm6_state.c
+++ b/net/ipv6/xfrm6_state.c
@@ -69,7 +69,7 @@ __xfrm6_sort(void **dst, void **src, int n, int (*cmp)(void *p), int maxclass)
 
        for (i = 0; i < n; i++) {
                dst[count[class[i] - 1]++] = src[i];
-               src[i] = 0;
+               src[i] = NULL;
        }
 
        return 0;