diff options
| author | David S. Miller <davem@davemloft.net> | 2017-03-24 01:11:56 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-24 02:41:27 +0300 |
| commit | 16ae1f223601c44e5cb65c99257ffae003504704 (patch) | |
| tree | 1f5284c0e82e4d94ca07eb022fa7911d99bb0cb6 /net/ipv4/netfilter/nft_masq_ipv4.c | |
| parent | 6f359f99b8c2ff3b09329611da00fe39a7c10e7e (diff) | |
| parent | d038e3dcfff6e3de132726a9c7174d8170032aa4 (diff) | |
| download | linux-16ae1f223601c44e5cb65c99257ffae003504704.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/genet/bcmmii.c
drivers/net/hyperv/netvsc.c
kernel/bpf/hashtab.c
Almost entirely overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/netfilter/nft_masq_ipv4.c')
| -rw-r--r-- | net/ipv4/netfilter/nft_masq_ipv4.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/netfilter/nft_masq_ipv4.c b/net/ipv4/netfilter/nft_masq_ipv4.c index a0ea8aad1bf1..f18677277119 100644 --- a/net/ipv4/netfilter/nft_masq_ipv4.c +++ b/net/ipv4/netfilter/nft_masq_ipv4.c @@ -26,10 +26,10 @@ static void nft_masq_ipv4_eval(const struct nft_expr *expr, memset(&range, 0, sizeof(range)); range.flags = priv->flags; if (priv->sreg_proto_min) { - range.min_proto.all = - *(__be16 *)®s->data[priv->sreg_proto_min]; - range.max_proto.all = - *(__be16 *)®s->data[priv->sreg_proto_max]; + range.min_proto.all = (__force __be16)nft_reg_load16( + ®s->data[priv->sreg_proto_min]); + range.max_proto.all = (__force __be16)nft_reg_load16( + ®s->data[priv->sreg_proto_max]); } regs->verdict.code = nf_nat_masquerade_ipv4(pkt->skb, nft_hook(pkt), &range, nft_out(pkt)); |