Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

[linux-2.6.git] / net / ipv4 / inet_diag.c

diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
index 06df780..e81c685 100644 (file)
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@ -36,8 +36,8 @@
 static const struct inet_diag_handler **inet_diag_table;
 
 struct inet_diag_entry {
-       u32 *saddr;
-       u32 *daddr;
+       __be32 *saddr;
+       __be32 *daddr;
        u16 sport;
        u16 dport;
        u16 family;
@@ -294,7 +294,7 @@ out:
        return err;
 }
 
-static int bitstring_match(const u32 *a1, const u32 *a2, int bits)
+static int bitstring_match(const __be32 *a1, const __be32 *a2, int bits)
 {
        int words = bits >> 5;
 
@@ -305,8 +305,8 @@ static int bitstring_match(const u32 *a1, const u32 *a2, int bits)
                        return 0;
        }
        if (bits) {
-               __u32 w1, w2;
-               __u32 mask;
+               __be32 w1, w2;
+               __be32 mask;
 
                w1 = a1[words];
                w2 = a2[words];
@@ -352,7 +352,7 @@ static int inet_diag_bc_run(const void *bc, int len,
                case INET_DIAG_BC_S_COND:
                case INET_DIAG_BC_D_COND: {
                        struct inet_diag_hostcond *cond;
-                       u32 *addr;
+                       __be32 *addr;
 
                        cond = (struct inet_diag_hostcond *)(op + 1);
                        if (cond->port != -1 &&
@@ -693,7 +693,7 @@ static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
                        sk_for_each(sk, node, &hashinfo->listening_hash[i]) {
                                struct inet_sock *inet = inet_sk(sk);
 
-                               if (!vx_check(sk->sk_xid, VX_IDENT|VX_WATCH))
+                               if (!nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
                                        continue;
                                if (num < s_num) {
                                        num++;
@@ -755,7 +755,7 @@ skip_listen_ht:
                sk_for_each(sk, node, &head->chain) {
                        struct inet_sock *inet = inet_sk(sk);
 
-                       if (!vx_check(sk->sk_xid, VX_IDENT|VX_WATCH))
+                       if (!nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
                                continue;
                        if (num < s_num)
                                goto next_normal;
@@ -781,7 +781,7 @@ next_normal:
                        inet_twsk_for_each(tw, node,
                                    &hashinfo->ehash[i + hashinfo->ehash_size].chain) {
 
-                               if (!vx_check(tw->tw_xid, VX_IDENT|VX_WATCH))
+                               if (!nx_check(tw->tw_nid, VS_WATCH_P|VS_IDENT))
                                        continue;
                                if (num < s_num)
                                        goto next_dying;