projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netfilter: bridge: add helpers for fetching physin/outdev
[deliverable/linux.git]
/
net
/
netfilter
/
nf_queue.c
diff --git
a/net/netfilter/nf_queue.c
b/net/netfilter/nf_queue.c
index 4c8b68e5fa164fd71b6f613b66b36d52e6717bf4..fb045b4c29665c4243292343539e136c4a74ba3b 100644
(file)
--- a/
net/netfilter/nf_queue.c
+++ b/
net/netfilter/nf_queue.c
@@
-10,6
+10,7
@@
#include <linux/proc_fs.h>
#include <linux/skbuff.h>
#include <linux/netfilter.h>
#include <linux/proc_fs.h>
#include <linux/skbuff.h>
#include <linux/netfilter.h>
+#include <linux/netfilter_bridge.h>
#include <linux/seq_file.h>
#include <linux/rcupdate.h>
#include <net/protocol.h>
#include <linux/seq_file.h>
#include <linux/rcupdate.h>
#include <net/protocol.h>
@@
-54,12
+55,14
@@
void nf_queue_entry_release_refs(struct nf_queue_entry *entry)
dev_put(entry->outdev);
#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
if (entry->skb->nf_bridge) {
dev_put(entry->outdev);
#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
if (entry->skb->nf_bridge) {
- struct n
f_bridge_info *nf_bridge = entry->skb->nf_bridge
;
+ struct n
et_device *physdev
;
- if (nf_bridge->physindev)
- dev_put(nf_bridge->physindev);
- if (nf_bridge->physoutdev)
- dev_put(nf_bridge->physoutdev);
+ physdev = nf_bridge_get_physindev(entry->skb);
+ if (physdev)
+ dev_put(physdev);
+ physdev = nf_bridge_get_physoutdev(entry->skb);
+ if (physdev)
+ dev_put(physdev);
}
#endif
/* Drop reference to owner of hook which queued us. */
}
#endif
/* Drop reference to owner of hook which queued us. */
@@
-79,13
+82,12
@@
bool nf_queue_entry_get_refs(struct nf_queue_entry *entry)
dev_hold(entry->outdev);
#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
if (entry->skb->nf_bridge) {
dev_hold(entry->outdev);
#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
if (entry->skb->nf_bridge) {
- struct nf_bridge_info *nf_bridge = entry->skb->nf_bridge;
struct net_device *physdev;
struct net_device *physdev;
- physdev = nf_bridge
->physindev
;
+ physdev = nf_bridge
_get_physindev(entry->skb)
;
if (physdev)
dev_hold(physdev);
if (physdev)
dev_hold(physdev);
- physdev = nf_bridge
->physoutdev
;
+ physdev = nf_bridge
_get_physoutdev(entry->skb)
;
if (physdev)
dev_hold(physdev);
}
if (physdev)
dev_hold(physdev);
}
This page took
0.025708 seconds
and
5
git commands to generate.