projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'hsi-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
[deliverable/linux.git]
/
net
/
netfilter
/
nft_meta.c
diff --git
a/net/netfilter/nft_meta.c
b/net/netfilter/nft_meta.c
index f4bad9dc15c48b0d8635632dc50179457b5c49c1..2863f3493038d8b1fd92eebb9c6d846227e99bf6 100644
(file)
--- a/
net/netfilter/nft_meta.c
+++ b/
net/netfilter/nft_meta.c
@@
-199,13
+199,6
@@
err:
}
EXPORT_SYMBOL_GPL(nft_meta_get_eval);
}
EXPORT_SYMBOL_GPL(nft_meta_get_eval);
-/* don't change or set _LOOPBACK, _USER, etc. */
-static bool pkt_type_ok(u32 p)
-{
- return p == PACKET_HOST || p == PACKET_BROADCAST ||
- p == PACKET_MULTICAST || p == PACKET_OTHERHOST;
-}
-
void nft_meta_set_eval(const struct nft_expr *expr,
struct nft_regs *regs,
const struct nft_pktinfo *pkt)
void nft_meta_set_eval(const struct nft_expr *expr,
struct nft_regs *regs,
const struct nft_pktinfo *pkt)
@@
-223,7
+216,7
@@
void nft_meta_set_eval(const struct nft_expr *expr,
break;
case NFT_META_PKTTYPE:
if (skb->pkt_type != value &&
break;
case NFT_META_PKTTYPE:
if (skb->pkt_type != value &&
-
pkt_type_ok(value) &&
pkt_type_ok(skb->pkt_type))
+
skb_pkt_type_ok(value) && skb_
pkt_type_ok(skb->pkt_type))
skb->pkt_type = value;
break;
case NFT_META_NFTRACE:
skb->pkt_type = value;
break;
case NFT_META_NFTRACE:
This page took
0.027676 seconds
and
5
git commands to generate.