diff options
| author | David S. Miller <davem@davemloft.net> | 2015-03-10 12:48:47 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-10 12:48:47 -0400 |
| commit | 515fb5c317db991e2f9877936b3b21a35c1d3190 (patch) | |
| tree | 93f05ff9459d6cae977bd468a6ba5a1f59f477ad /net/ipv6 | |
| parent | 59e33c2b021322db92ca27c4d9958e57630443b6 (diff) | |
| parent | 1a4ba64d16a42c1b31d52b671accd7f9103e2626 (diff) | |
| download | op-kernel-dev-515fb5c317db991e2f9877936b3b21a35c1d3190.zip op-kernel-dev-515fb5c317db991e2f9877936b3b21a35c1d3190.tar.gz | |
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 'net/ipv6')
| -rw-r--r-- | net/ipv6/netfilter/nf_reject_ipv6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/netfilter/nf_reject_ipv6.c b/net/ipv6/netfilter/nf_reject_ipv6.c index 68e0bb4..3afdce0 100644 --- a/net/ipv6/netfilter/nf_reject_ipv6.c +++ b/net/ipv6/netfilter/nf_reject_ipv6.c @@ -65,7 +65,7 @@ EXPORT_SYMBOL_GPL(nf_reject_ip6_tcphdr_get); struct ipv6hdr *nf_reject_ip6hdr_put(struct sk_buff *nskb, const struct sk_buff *oldskb, - __be16 protocol, int hoplimit) + __u8 protocol, int hoplimit) { struct ipv6hdr *ip6h; const struct ipv6hdr *oip6h = ipv6_hdr(oldskb); |
