diff options
author | Patrick McHardy <kaber@trash.net> | 2007-02-07 18:07:43 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-02-08 15:39:14 -0500 |
commit | a8d0f9526ff8510d6fa5e708ef5386af19503299 (patch) | |
tree | bb88ab76ac8364ee257dc3aeeabbb8c3148d633f | |
parent | 5eb87f456ebdc983164f0913b53c199ca9673887 (diff) |
[NET]: Add UDPLITE support in a few missing spots
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/bridge/netfilter/ebt_ip.c | 1 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_log.c | 1 | ||||
-rw-r--r-- | net/ipv4/netfilter/ipt_CLUSTERIP.c | 1 | ||||
-rw-r--r-- | net/netfilter/xt_hashlimit.c | 1 | ||||
-rw-r--r-- | net/sched/sch_sfq.c | 2 |
5 files changed, 6 insertions, 0 deletions
diff --git a/net/bridge/netfilter/ebt_ip.c b/net/bridge/netfilter/ebt_ip.c index e4c642448e1b..6afa4d017d4a 100644 --- a/net/bridge/netfilter/ebt_ip.c +++ b/net/bridge/netfilter/ebt_ip.c | |||
@@ -93,6 +93,7 @@ static int ebt_ip_check(const char *tablename, unsigned int hookmask, | |||
93 | return -EINVAL; | 93 | return -EINVAL; |
94 | if (info->protocol != IPPROTO_TCP && | 94 | if (info->protocol != IPPROTO_TCP && |
95 | info->protocol != IPPROTO_UDP && | 95 | info->protocol != IPPROTO_UDP && |
96 | info->protocol != IPPROTO_UDPLITE && | ||
96 | info->protocol != IPPROTO_SCTP && | 97 | info->protocol != IPPROTO_SCTP && |
97 | info->protocol != IPPROTO_DCCP) | 98 | info->protocol != IPPROTO_DCCP) |
98 | return -EINVAL; | 99 | return -EINVAL; |
diff --git a/net/bridge/netfilter/ebt_log.c b/net/bridge/netfilter/ebt_log.c index a184f879f253..985df82e427b 100644 --- a/net/bridge/netfilter/ebt_log.c +++ b/net/bridge/netfilter/ebt_log.c | |||
@@ -96,6 +96,7 @@ ebt_log_packet(unsigned int pf, unsigned int hooknum, | |||
96 | NIPQUAD(ih->daddr), ih->tos, ih->protocol); | 96 | NIPQUAD(ih->daddr), ih->tos, ih->protocol); |
97 | if (ih->protocol == IPPROTO_TCP || | 97 | if (ih->protocol == IPPROTO_TCP || |
98 | ih->protocol == IPPROTO_UDP || | 98 | ih->protocol == IPPROTO_UDP || |
99 | ih->protocol == IPPROTO_UDPLITE || | ||
99 | ih->protocol == IPPROTO_SCTP || | 100 | ih->protocol == IPPROTO_SCTP || |
100 | ih->protocol == IPPROTO_DCCP) { | 101 | ih->protocol == IPPROTO_DCCP) { |
101 | struct tcpudphdr _ports, *pptr; | 102 | struct tcpudphdr _ports, *pptr; |
diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c index b1c11160b9de..018fea3fcb5f 100644 --- a/net/ipv4/netfilter/ipt_CLUSTERIP.c +++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c | |||
@@ -247,6 +247,7 @@ clusterip_hashfn(struct sk_buff *skb, struct clusterip_config *config) | |||
247 | switch (iph->protocol) { | 247 | switch (iph->protocol) { |
248 | case IPPROTO_TCP: | 248 | case IPPROTO_TCP: |
249 | case IPPROTO_UDP: | 249 | case IPPROTO_UDP: |
250 | case IPPROTO_UDPLITE: | ||
250 | case IPPROTO_SCTP: | 251 | case IPPROTO_SCTP: |
251 | case IPPROTO_DCCP: | 252 | case IPPROTO_DCCP: |
252 | case IPPROTO_ICMP: | 253 | case IPPROTO_ICMP: |
diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c index f28bf69d3d42..bd1f7a2048d6 100644 --- a/net/netfilter/xt_hashlimit.c +++ b/net/netfilter/xt_hashlimit.c | |||
@@ -414,6 +414,7 @@ hashlimit_init_dst(struct xt_hashlimit_htable *hinfo, struct dsthash_dst *dst, | |||
414 | switch (nexthdr) { | 414 | switch (nexthdr) { |
415 | case IPPROTO_TCP: | 415 | case IPPROTO_TCP: |
416 | case IPPROTO_UDP: | 416 | case IPPROTO_UDP: |
417 | case IPPROTO_UDPLITE: | ||
417 | case IPPROTO_SCTP: | 418 | case IPPROTO_SCTP: |
418 | case IPPROTO_DCCP: | 419 | case IPPROTO_DCCP: |
419 | ports = skb_header_pointer(skb, protoff, sizeof(_ports), | 420 | ports = skb_header_pointer(skb, protoff, sizeof(_ports), |
diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c index 459cda258a5c..82844801e421 100644 --- a/net/sched/sch_sfq.c +++ b/net/sched/sch_sfq.c | |||
@@ -143,6 +143,7 @@ static unsigned sfq_hash(struct sfq_sched_data *q, struct sk_buff *skb) | |||
143 | if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) && | 143 | if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) && |
144 | (iph->protocol == IPPROTO_TCP || | 144 | (iph->protocol == IPPROTO_TCP || |
145 | iph->protocol == IPPROTO_UDP || | 145 | iph->protocol == IPPROTO_UDP || |
146 | iph->protocol == IPPROTO_UDPLITE || | ||
146 | iph->protocol == IPPROTO_SCTP || | 147 | iph->protocol == IPPROTO_SCTP || |
147 | iph->protocol == IPPROTO_DCCP || | 148 | iph->protocol == IPPROTO_DCCP || |
148 | iph->protocol == IPPROTO_ESP)) | 149 | iph->protocol == IPPROTO_ESP)) |
@@ -156,6 +157,7 @@ static unsigned sfq_hash(struct sfq_sched_data *q, struct sk_buff *skb) | |||
156 | h2 = iph->saddr.s6_addr32[3]^iph->nexthdr; | 157 | h2 = iph->saddr.s6_addr32[3]^iph->nexthdr; |
157 | if (iph->nexthdr == IPPROTO_TCP || | 158 | if (iph->nexthdr == IPPROTO_TCP || |
158 | iph->nexthdr == IPPROTO_UDP || | 159 | iph->nexthdr == IPPROTO_UDP || |
160 | iph->nexthdr == IPPROTO_UDPLITE || | ||
159 | iph->nexthdr == IPPROTO_SCTP || | 161 | iph->nexthdr == IPPROTO_SCTP || |
160 | iph->nexthdr == IPPROTO_DCCP || | 162 | iph->nexthdr == IPPROTO_DCCP || |
161 | iph->nexthdr == IPPROTO_ESP) | 163 | iph->nexthdr == IPPROTO_ESP) |