netfilter: propagate net to nf_bridge_get_physindev

[platform/kernel/linux-starfive.git] / net / netfilter / nf_log_syslog.c

diff --git a/net/netfilter/nf_log_syslog.c b/net/netfilter/nf_log_syslog.c
index c66689a..5840222 100644 (file)
--- a/net/netfilter/nf_log_syslog.c
+++ b/net/netfilter/nf_log_syslog.c
@@ -111,7 +111,8 @@ nf_log_dump_packet_common(struct nf_log_buf *m, u8 pf,
                          unsigned int hooknum, const struct sk_buff *skb,
                          const struct net_device *in,
                          const struct net_device *out,
-                         const struct nf_loginfo *loginfo, const char *prefix)
+                         const struct nf_loginfo *loginfo, const char *prefix,
+                         struct net *net)
 {
        const struct net_device *physoutdev __maybe_unused;
        const struct net_device *physindev __maybe_unused;
@@ -121,7 +122,7 @@ nf_log_dump_packet_common(struct nf_log_buf *m, u8 pf,
                        in ? in->name : "",
                        out ? out->name : "");
 #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
-       physindev = nf_bridge_get_physindev(skb);
+       physindev = nf_bridge_get_physindev(skb, net);
        if (physindev && in != physindev)
                nf_log_buf_add(m, "PHYSIN=%s ", physindev->name);
        physoutdev = nf_bridge_get_physoutdev(skb);
@@ -148,7 +149,7 @@ static void nf_log_arp_packet(struct net *net, u_int8_t pf,
                loginfo = &default_loginfo;
 
        nf_log_dump_packet_common(m, pf, hooknum, skb, in, out, loginfo,
-                                 prefix);
+                                 prefix, net);
        dump_arp_packet(m, loginfo, skb, skb_network_offset(skb));
 
        nf_log_buf_close(m);
@@ -845,7 +846,7 @@ static void nf_log_ip_packet(struct net *net, u_int8_t pf,
                loginfo = &default_loginfo;
 
        nf_log_dump_packet_common(m, pf, hooknum, skb, in,
-                                 out, loginfo, prefix);
+                                 out, loginfo, prefix, net);
 
        if (in)
                dump_mac_header(m, loginfo, skb);
@@ -880,7 +881,7 @@ static void nf_log_ip6_packet(struct net *net, u_int8_t pf,
                loginfo = &default_loginfo;
 
        nf_log_dump_packet_common(m, pf, hooknum, skb, in, out,
-                                 loginfo, prefix);
+                                 loginfo, prefix, net);
 
        if (in)
                dump_mac_header(m, loginfo, skb);
@@ -916,7 +917,7 @@ static void nf_log_unknown_packet(struct net *net, u_int8_t pf,
                loginfo = &default_loginfo;
 
        nf_log_dump_packet_common(m, pf, hooknum, skb, in, out, loginfo,
-                                 prefix);
+                                 prefix, net);
 
        dump_mac_header(m, loginfo, skb);