Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
net
/
netfilter
/
nft_reject_inet.c
diff --git
a/kernel/net/netfilter/nft_reject_inet.c
b/kernel/net/netfilter/nft_reject_inet.c
index
635dbba
..
759ca52
100644
(file)
--- a/
kernel/net/netfilter/nft_reject_inet.c
+++ b/
kernel/net/netfilter/nft_reject_inet.c
@@
-22,38
+22,37
@@
static void nft_reject_inet_eval(const struct nft_expr *expr,
const struct nft_pktinfo *pkt)
{
struct nft_reject *priv = nft_expr_priv(expr);
const struct nft_pktinfo *pkt)
{
struct nft_reject *priv = nft_expr_priv(expr);
- struct net *net = dev_net((pkt->in != NULL) ? pkt->in : pkt->out);
- switch (pkt->
ops->
pf) {
+ switch (pkt->pf) {
case NFPROTO_IPV4:
switch (priv->type) {
case NFT_REJECT_ICMP_UNREACH:
nf_send_unreach(pkt->skb, priv->icmp_code,
case NFPROTO_IPV4:
switch (priv->type) {
case NFT_REJECT_ICMP_UNREACH:
nf_send_unreach(pkt->skb, priv->icmp_code,
- pkt->
ops->hooknum
);
+ pkt->
hook
);
break;
case NFT_REJECT_TCP_RST:
break;
case NFT_REJECT_TCP_RST:
- nf_send_reset(pkt->
skb, pkt->ops->hooknum
);
+ nf_send_reset(pkt->
net, pkt->skb, pkt->hook
);
break;
case NFT_REJECT_ICMPX_UNREACH:
nf_send_unreach(pkt->skb,
nft_reject_icmp_code(priv->icmp_code),
break;
case NFT_REJECT_ICMPX_UNREACH:
nf_send_unreach(pkt->skb,
nft_reject_icmp_code(priv->icmp_code),
- pkt->
ops->hooknum
);
+ pkt->
hook
);
break;
}
break;
case NFPROTO_IPV6:
switch (priv->type) {
case NFT_REJECT_ICMP_UNREACH:
break;
}
break;
case NFPROTO_IPV6:
switch (priv->type) {
case NFT_REJECT_ICMP_UNREACH:
- nf_send_unreach6(net, pkt->skb, priv->icmp_code,
- pkt->
ops->hooknum
);
+ nf_send_unreach6(
pkt->
net, pkt->skb, priv->icmp_code,
+ pkt->
hook
);
break;
case NFT_REJECT_TCP_RST:
break;
case NFT_REJECT_TCP_RST:
- nf_send_reset6(
net, pkt->skb, pkt->ops->hooknum
);
+ nf_send_reset6(
pkt->net, pkt->skb, pkt->hook
);
break;
case NFT_REJECT_ICMPX_UNREACH:
break;
case NFT_REJECT_ICMPX_UNREACH:
- nf_send_unreach6(net, pkt->skb,
+ nf_send_unreach6(
pkt->
net, pkt->skb,
nft_reject_icmpv6_code(priv->icmp_code),
nft_reject_icmpv6_code(priv->icmp_code),
- pkt->
ops->hooknum
);
+ pkt->
hook
);
break;
}
break;
break;
}
break;