summaryrefslogtreecommitdiffstats
path: root/net/netfilter/nft_meta.c
diff options
context:
space:
mode:
authorEric W. Biederman2015-09-18 21:32:57 +0200
committerPablo Neira Ayuso2015-09-18 21:58:01 +0200
commit6aa187f21ca2d8ade791f01fd8fab908b1f27673 (patch)
tree5bc4d4acfb4e4bd57976e87c9ab2a1a4d8b017e8 /net/netfilter/nft_meta.c
parentinet netfilter: Prefer state->hook to ops->hooknum (diff)
downloadkernel-qcow2-linux-6aa187f21ca2d8ade791f01fd8fab908b1f27673.tar.gz
kernel-qcow2-linux-6aa187f21ca2d8ade791f01fd8fab908b1f27673.tar.xz
kernel-qcow2-linux-6aa187f21ca2d8ade791f01fd8fab908b1f27673.zip
netfilter: nf_tables: kill nft_pktinfo.ops
- Add nft_pktinfo.pf to replace ops->pf - Add nft_pktinfo.hook to replace ops->hooknum This simplifies the code, makes it more readable, and likely reduces cache line misses. Maintainability is enhanced as the details of nft_hook_ops are of no concern to the recpients of nft_pktinfo. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nft_meta.c')
-rw-r--r--net/netfilter/nft_meta.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nft_meta.c b/net/netfilter/nft_meta.c
index cb2f13ebb5a6..e4ad2c24bc41 100644
--- a/net/netfilter/nft_meta.c
+++ b/net/netfilter/nft_meta.c
@@ -42,7 +42,7 @@ void nft_meta_get_eval(const struct nft_expr *expr,
*(__be16 *)dest = skb->protocol;
break;
case NFT_META_NFPROTO:
- *dest = pkt->ops->pf;
+ *dest = pkt->pf;
break;
case NFT_META_L4PROTO:
*dest = pkt->tprot;
@@ -135,7 +135,7 @@ void nft_meta_get_eval(const struct nft_expr *expr,
break;
}
- switch (pkt->ops->pf) {
+ switch (pkt->pf) {
case NFPROTO_IPV4:
if (ipv4_is_multicast(ip_hdr(skb)->daddr))
*dest = PACKET_MULTICAST;