diff options
author | Dan Williams <dan.j.williams@intel.com> | 2017-04-12 21:59:01 -0700 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2017-04-12 21:59:01 -0700 |
commit | bfca9acf1a5df0ff98fbf47e363adb48612bb7ec (patch) | |
tree | a50287c88fdc60a73912d205d7bce41b7af53827 /net/netfilter/nft_nat.c | |
parent | 92a3fa075d3d2716b9c662814540f1d660cbf2f5 (diff) | |
parent | 11e63f6d920d6f2dfd3cd421e939a4aec9a58dcd (diff) |
Merge branch 'for-4.11/libnvdimm' into for-4.12/dax
Diffstat (limited to 'net/netfilter/nft_nat.c')
-rw-r--r-- | net/netfilter/nft_nat.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/netfilter/nft_nat.c b/net/netfilter/nft_nat.c index 19a7bf3236f9..439e0bd152a0 100644 --- a/net/netfilter/nft_nat.c +++ b/net/netfilter/nft_nat.c @@ -65,10 +65,10 @@ static void nft_nat_eval(const struct nft_expr *expr, } 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]); range.flags |= NF_NAT_RANGE_PROTO_SPECIFIED; } |