diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-11-15 00:11:08 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 00:22:54 -0500 |
commit | 42d224aa170a4f7446cea6c972d9302d524545e5 (patch) | |
tree | f4944a423c718ba4f38afce66103e915d86c75e6 /net/ipv4 | |
parent | ef296f56f8501f3ac68b8d44f63205f544126733 (diff) |
[NETFILTER]: More trivial annotations.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/netfilter/ip_conntrack_amanda.c | 2 | ||||
-rw-r--r-- | net/ipv4/netfilter/ip_conntrack_helper_h323.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_amanda.c b/net/ipv4/netfilter/ip_conntrack_amanda.c index 6c7383a8e42b..7fca246615d5 100644 --- a/net/ipv4/netfilter/ip_conntrack_amanda.c +++ b/net/ipv4/netfilter/ip_conntrack_amanda.c | |||
@@ -180,7 +180,7 @@ static struct ip_conntrack_helper amanda_helper = { | |||
180 | .help = help, | 180 | .help = help, |
181 | .name = "amanda", | 181 | .name = "amanda", |
182 | 182 | ||
183 | .tuple = { .src = { .u = { __constant_htons(10080) } }, | 183 | .tuple = { .src = { .u = { .udp = {.port = __constant_htons(10080) } } }, |
184 | .dst = { .protonum = IPPROTO_UDP }, | 184 | .dst = { .protonum = IPPROTO_UDP }, |
185 | }, | 185 | }, |
186 | .mask = { .src = { .u = { 0xFFFF } }, | 186 | .mask = { .src = { .u = { 0xFFFF } }, |
diff --git a/net/ipv4/netfilter/ip_conntrack_helper_h323.c b/net/ipv4/netfilter/ip_conntrack_helper_h323.c index 6cb9070cd0bc..a06b340ea414 100644 --- a/net/ipv4/netfilter/ip_conntrack_helper_h323.c +++ b/net/ipv4/netfilter/ip_conntrack_helper_h323.c | |||
@@ -1153,7 +1153,7 @@ static struct ip_conntrack_helper ip_conntrack_helper_q931 = { | |||
1153 | .me = THIS_MODULE, | 1153 | .me = THIS_MODULE, |
1154 | .max_expected = H323_RTP_CHANNEL_MAX * 4 + 4 /* T.120 and H.245 */ , | 1154 | .max_expected = H323_RTP_CHANNEL_MAX * 4 + 4 /* T.120 and H.245 */ , |
1155 | .timeout = 240, | 1155 | .timeout = 240, |
1156 | .tuple = {.src = {.u = {__constant_htons(Q931_PORT)}}, | 1156 | .tuple = {.src = {.u = {.tcp = {.port = __constant_htons(Q931_PORT)}}}, |
1157 | .dst = {.protonum = IPPROTO_TCP}}, | 1157 | .dst = {.protonum = IPPROTO_TCP}}, |
1158 | .mask = {.src = {.u = {0xFFFF}}, | 1158 | .mask = {.src = {.u = {0xFFFF}}, |
1159 | .dst = {.protonum = 0xFF}}, | 1159 | .dst = {.protonum = 0xFF}}, |
@@ -1746,7 +1746,7 @@ static struct ip_conntrack_helper ip_conntrack_helper_ras = { | |||
1746 | .me = THIS_MODULE, | 1746 | .me = THIS_MODULE, |
1747 | .max_expected = 32, | 1747 | .max_expected = 32, |
1748 | .timeout = 240, | 1748 | .timeout = 240, |
1749 | .tuple = {.src = {.u = {__constant_htons(RAS_PORT)}}, | 1749 | .tuple = {.src = {.u = {.tcp = {.port = __constant_htons(RAS_PORT)}}}, |
1750 | .dst = {.protonum = IPPROTO_UDP}}, | 1750 | .dst = {.protonum = IPPROTO_UDP}}, |
1751 | .mask = {.src = {.u = {0xFFFE}}, | 1751 | .mask = {.src = {.u = {0xFFFE}}, |
1752 | .dst = {.protonum = 0xFF}}, | 1752 | .dst = {.protonum = 0xFF}}, |