diff options
| author | David S. Miller | 2015-03-10 17:48:47 +0100 |
|---|---|---|
| committer | David S. Miller | 2015-03-10 17:48:47 +0100 |
| commit | 515fb5c317db991e2f9877936b3b21a35c1d3190 (patch) | |
| tree | 93f05ff9459d6cae977bd468a6ba5a1f59f477ad /include/net/netfilter/ipv4/nf_reject.h | |
| parent | net: phy: bcm7xxx: add alternate id for 7439 (diff) | |
| parent | netfilter: bridge: use rcu hook to resolve br_netfilter dependency (diff) | |
| download | kernel-qcow2-linux-515fb5c317db991e2f9877936b3b21a35c1d3190.tar.gz kernel-qcow2-linux-515fb5c317db991e2f9877936b3b21a35c1d3190.tar.xz kernel-qcow2-linux-515fb5c317db991e2f9877936b3b21a35c1d3190.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says:
====================
Netfilter fixes for net-next
The following batch contains a couple of fixes to address some fallout
from the previous pull request, they are:
1) Address link problems in the bridge code after e5de75b. Fix it by
using rcu hook to address to avoid ifdef pollution and hard
dependency between bridge and br_netfilter.
2) Address sparse warnings in the netfilter reject code, patch from
Florian Westphal.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/netfilter/ipv4/nf_reject.h')
| -rw-r--r-- | include/net/netfilter/ipv4/nf_reject.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/netfilter/ipv4/nf_reject.h b/include/net/netfilter/ipv4/nf_reject.h index 864127573c32..77862c3645f0 100644 --- a/include/net/netfilter/ipv4/nf_reject.h +++ b/include/net/netfilter/ipv4/nf_reject.h @@ -12,7 +12,7 @@ const struct tcphdr *nf_reject_ip_tcphdr_get(struct sk_buff *oldskb, struct tcphdr *_oth, int hook); struct iphdr *nf_reject_iphdr_put(struct sk_buff *nskb, const struct sk_buff *oldskb, - __be16 protocol, int ttl); + __u8 protocol, int ttl); void nf_reject_ip_tcphdr_put(struct sk_buff *nskb, const struct sk_buff *oldskb, const struct tcphdr *oth); |