UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

netfilter: reduce sparse warnings 

bridge/netfilter/ebtables.c:290:26: warning: incorrect type in assignment (different modifiers)
-> remove __pure annotation.

ipv6/netfilter/ip6t_SYNPROXY.c:240:27: warning: cast from restricted __be16
-> switch ntohs to htons and vice versa.

netfilter/core.c:391:30: warning: symbol 'nfq_ct_nat_hook' was not declared. Should it be static?
-> delete it, got removed

net/netfilter/nf_synproxy_core.c:221:48: warning: cast to restricted __be32
-> Use __be32 instead of u32.

Tested with objdiff that these changes do not affect generated code.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Florian Westphal 2015-08-28 00:16:21 +02:00 committed by Pablo Neira Ayuso
parent 98dbbfc3f1
commit 851345c5bb
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/bridge/netfilter/ebtables.c
View File

@ -176,7 +176,7 @@ ebt_basic_match(const struct ebt_entry *e, const struct sk_buff *skb,
return 0; return 0;
} }
static inline __pure static inline
struct ebt_entry *ebt_next_entry(const struct ebt_entry *entry) struct ebt_entry *ebt_next_entry(const struct ebt_entry *entry)
{ {
return (void *)entry + entry->next_offset; return (void *)entry + entry->next_offset;

2
net/ipv6/netfilter/ip6t_SYNPROXY.c
View File

@ -237,7 +237,7 @@ synproxy_send_client_ack(const struct synproxy_net *snet,
nth->ack_seq = th->ack_seq; nth->ack_seq = th->ack_seq;
tcp_flag_word(nth) = TCP_FLAG_ACK; tcp_flag_word(nth) = TCP_FLAG_ACK;
nth->doff = tcp_hdr_size / 4; nth->doff = tcp_hdr_size / 4;
nth->window = ntohs(htons(th->window) >> opts->wscale); nth->window = htons(ntohs(th->window) >> opts->wscale);
nth->check = 0; nth->check = 0;
nth->urg_ptr = 0; nth->urg_ptr = 0;

3
net/netfilter/core.c
View File

@ -388,9 +388,6 @@ EXPORT_SYMBOL(nf_conntrack_destroy);
struct nfq_ct_hook __rcu *nfq_ct_hook __read_mostly; struct nfq_ct_hook __rcu *nfq_ct_hook __read_mostly;
EXPORT_SYMBOL_GPL(nfq_ct_hook); EXPORT_SYMBOL_GPL(nfq_ct_hook);
struct nfq_ct_nat_hook __rcu *nfq_ct_nat_hook __read_mostly;
EXPORT_SYMBOL_GPL(nfq_ct_nat_hook);
#endif /* CONFIG_NF_CONNTRACK */ #endif /* CONFIG_NF_CONNTRACK */
#ifdef CONFIG_NF_NAT_NEEDED #ifdef CONFIG_NF_NAT_NEEDED

6
net/netfilter/nf_synproxy_core.c
View File

@ -188,7 +188,7 @@ unsigned int synproxy_tstamp_adjust(struct sk_buff *skb,
const struct nf_conn_synproxy *synproxy) const struct nf_conn_synproxy *synproxy)
{ {
unsigned int optoff, optend; unsigned int optoff, optend;
u32 *ptr, old; __be32 *ptr, old;
if (synproxy->tsoff == 0) if (synproxy->tsoff == 0)
return 1; return 1;
@ -216,12 +216,12 @@ unsigned int synproxy_tstamp_adjust(struct sk_buff *skb,
if (op[0] == TCPOPT_TIMESTAMP && if (op[0] == TCPOPT_TIMESTAMP &&
op[1] == TCPOLEN_TIMESTAMP) { op[1] == TCPOLEN_TIMESTAMP) {
if (CTINFO2DIR(ctinfo) == IP_CT_DIR_REPLY) { if (CTINFO2DIR(ctinfo) == IP_CT_DIR_REPLY) {
ptr = (u32 *)&op[2]; ptr = (__be32 *)&op[2];
old = *ptr; old = *ptr;
*ptr = htonl(ntohl(*ptr) - *ptr = htonl(ntohl(*ptr) -
synproxy->tsoff); synproxy->tsoff);
} else { } else {
ptr = (u32 *)&op[6]; ptr = (__be32 *)&op[6];
old = *ptr; old = *ptr;
*ptr = htonl(ntohl(*ptr) + *ptr = htonl(ntohl(*ptr) +
synproxy->tsoff); synproxy->tsoff);