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/bridge/netfilter/nft_reject_bridge.c | |
parent | net: phy: bcm7xxx: add alternate id for 7439 (diff) | |
parent | netfilter: bridge: use rcu hook to resolve br_netfilter dependency (diff) | |
download | linux-dev-515fb5c317db991e2f9877936b3b21a35c1d3190.tar.xz linux-dev-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 'net/bridge/netfilter/nft_reject_bridge.c')
-rw-r--r-- | net/bridge/netfilter/nft_reject_bridge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/netfilter/nft_reject_bridge.c b/net/bridge/netfilter/nft_reject_bridge.c index 5c6c96585acd..54a2fdf0f457 100644 --- a/net/bridge/netfilter/nft_reject_bridge.c +++ b/net/bridge/netfilter/nft_reject_bridge.c @@ -99,7 +99,7 @@ static void nft_reject_br_send_v4_unreach(struct sk_buff *oldskb, if (!pskb_may_pull(oldskb, len)) return; - if (pskb_trim_rcsum(oldskb, htons(ip_hdr(oldskb)->tot_len))) + if (pskb_trim_rcsum(oldskb, ntohs(ip_hdr(oldskb)->tot_len))) return; if (ip_hdr(oldskb)->protocol == IPPROTO_TCP || |