projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netfilter: propagate net to nf_bridge_get_physindev
[platform/kernel/linux-starfive.git]
/
net
/
netfilter
/
nf_queue.c
diff --git
a/net/netfilter/nf_queue.c
b/net/netfilter/nf_queue.c
index
63d1516
..
e2f334f
100644
(file)
--- a/
net/netfilter/nf_queue.c
+++ b/
net/netfilter/nf_queue.c
@@
-82,11
+82,9
@@
static void __nf_queue_entry_init_physdevs(struct nf_queue_entry *entry)
{
#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
const struct sk_buff *skb = entry->skb;
{
#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
const struct sk_buff *skb = entry->skb;
- struct nf_bridge_info *nf_bridge;
- nf_bridge = nf_bridge_info_get(skb);
- if (nf_bridge) {
- entry->physin = nf_bridge_get_physindev(skb);
+ if (nf_bridge_info_exists(skb)) {
+ entry->physin = nf_bridge_get_physindev(skb, entry->state.net);
entry->physout = nf_bridge_get_physoutdev(skb);
} else {
entry->physin = NULL;
entry->physout = nf_bridge_get_physoutdev(skb);
} else {
entry->physin = NULL;