Merge branch 'mm-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-artful-kernel.git] / net / netfilter / nft_reject_inet.c

diff --git a/net/netfilter/nft_reject_inet.c b/net/netfilter/nft_reject_inet.c
index e79d9ca2ffee0002e734ee27880c512da3066900..9e90a02cb104dad81daf84208902e90390a8f504 100644 (file)
--- a/net/netfilter/nft_reject_inet.c
+++ b/net/netfilter/nft_reject_inet.c
@@ -23,36 +23,36 @@ static void nft_reject_inet_eval(const struct nft_expr *expr,
 {
        struct nft_reject *priv = nft_expr_priv(expr);
 
-       switch (pkt->pf) {
+       switch (nft_pf(pkt)) {
        case NFPROTO_IPV4:
                switch (priv->type) {
                case NFT_REJECT_ICMP_UNREACH:
                        nf_send_unreach(pkt->skb, priv->icmp_code,
-                                       pkt->hook);
+                                       nft_hook(pkt));
                        break;
                case NFT_REJECT_TCP_RST:
-                       nf_send_reset(pkt->net, pkt->skb, pkt->hook);
+                       nf_send_reset(nft_net(pkt), pkt->skb, nft_hook(pkt));
                        break;
                case NFT_REJECT_ICMPX_UNREACH:
                        nf_send_unreach(pkt->skb,
                                        nft_reject_icmp_code(priv->icmp_code),
-                                       pkt->hook);
+                                       nft_hook(pkt));
                        break;
                }
                break;
        case NFPROTO_IPV6:
                switch (priv->type) {
                case NFT_REJECT_ICMP_UNREACH:
-                       nf_send_unreach6(pkt->net, pkt->skb, priv->icmp_code,
-                                        pkt->hook);
+                       nf_send_unreach6(nft_net(pkt), pkt->skb,
+                                        priv->icmp_code, nft_hook(pkt));
                        break;
                case NFT_REJECT_TCP_RST:
-                       nf_send_reset6(pkt->net, pkt->skb, pkt->hook);
+                       nf_send_reset6(nft_net(pkt), pkt->skb, nft_hook(pkt));
                        break;
                case NFT_REJECT_ICMPX_UNREACH:
-                       nf_send_unreach6(pkt->net, pkt->skb,
+                       nf_send_unreach6(nft_net(pkt), pkt->skb,
                                         nft_reject_icmpv6_code(priv->icmp_code),
-                                        pkt->hook);
+                                        nft_hook(pkt));
                        break;
                }
                break;