]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[NETFILTER]: More trivial annotations.
authorAl Viro <viro@zeniv.linux.org.uk>
Wed, 15 Nov 2006 05:11:08 +0000 (21:11 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Sun, 3 Dec 2006 05:22:54 +0000 (21:22 -0800)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/netfilter_ipv4/ip_conntrack_tftp.h
net/ipv4/netfilter/ip_conntrack_amanda.c
net/ipv4/netfilter/ip_conntrack_helper_h323.c

index cde9729aa1734a341e5e6f081fc56c5cc2e448fd..a404fc0abf0e7fa3ab3f3bac05a05b67541222d5 100644 (file)
@@ -4,7 +4,7 @@
 #define TFTP_PORT 69
 
 struct tftphdr {
-       u_int16_t opcode;
+       __be16 opcode;
 };
 
 #define TFTP_OPCODE_READ       1
index 6c7383a8e42b940c355005091876de8b6396c6c7..7fca246615d5f6530f2b81a80b06ed2d88f336e1 100644 (file)
@@ -180,7 +180,7 @@ static struct ip_conntrack_helper amanda_helper = {
        .help = help,
        .name = "amanda",
 
-       .tuple = { .src = { .u = { __constant_htons(10080) } },
+       .tuple = { .src = { .u = { .udp = {.port = __constant_htons(10080) } } },
                   .dst = { .protonum = IPPROTO_UDP },
        },
        .mask = { .src = { .u = { 0xFFFF } },
index 6cb9070cd0bc3a70ea8ec7aa813a6013161b8ea5..a06b340ea41458b996fe23d553395ef15421ace0 100644 (file)
@@ -1153,7 +1153,7 @@ static struct ip_conntrack_helper ip_conntrack_helper_q931 = {
        .me = THIS_MODULE,
        .max_expected = H323_RTP_CHANNEL_MAX * 4 + 4 /* T.120 and H.245 */ ,
        .timeout = 240,
-       .tuple = {.src = {.u = {__constant_htons(Q931_PORT)}},
+       .tuple = {.src = {.u = {.tcp = {.port = __constant_htons(Q931_PORT)}}},
                  .dst = {.protonum = IPPROTO_TCP}},
        .mask = {.src = {.u = {0xFFFF}},
                 .dst = {.protonum = 0xFF}},
@@ -1746,7 +1746,7 @@ static struct ip_conntrack_helper ip_conntrack_helper_ras = {
        .me = THIS_MODULE,
        .max_expected = 32,
        .timeout = 240,
-       .tuple = {.src = {.u = {__constant_htons(RAS_PORT)}},
+       .tuple = {.src = {.u = {.tcp = {.port = __constant_htons(RAS_PORT)}}},
                  .dst = {.protonum = IPPROTO_UDP}},
        .mask = {.src = {.u = {0xFFFE}},
                 .dst = {.protonum = 0xFF}},