net: replace remaining __FUNCTION__ occurrences

[mirror_ubuntu-artful-kernel.git] / net / llc / llc_input.c

diff --git a/net/llc/llc_input.c b/net/llc/llc_input.c
index 099ed8fec1454b3f38822f0e3d8e0870108e52d7..b9143d2a04e19ffe4665d5215f0063d068801711 100644 (file)
--- a/net/llc/llc_input.c
+++ b/net/llc/llc_input.c
@@ -12,6 +12,7 @@
  * See the GNU General Public License for more details.
  */
 #include <linux/netdevice.h>
+#include <net/net_namespace.h>
 #include <net/llc.h>
 #include <net/llc_pdu.h>
 #include <net/llc_sap.h>
@@ -145,12 +146,15 @@ int llc_rcv(struct sk_buff *skb, struct net_device *dev,
        int (*rcv)(struct sk_buff *, struct net_device *,
                   struct packet_type *, struct net_device *);
 
+       if (dev->nd_net != &init_net)
+               goto drop;
+
        /*
         * When the interface is in promisc. mode, drop all the crap that it
         * receives, do not try to analyse it.
         */
        if (unlikely(skb->pkt_type == PACKET_OTHERHOST)) {
-               dprintk("%s: PACKET_OTHERHOST\n", __FUNCTION__);
+               dprintk("%s: PACKET_OTHERHOST\n", __func__);
                goto drop;
        }
        skb = skb_share_check(skb, GFP_ATOMIC);
@@ -163,7 +167,7 @@ int llc_rcv(struct sk_buff *skb, struct net_device *dev,
               goto handle_station;
        sap = llc_sap_find(pdu->dsap);
        if (unlikely(!sap)) {/* unknown SAP */
-               dprintk("%s: llc_sap_find(%02X) failed!\n", __FUNCTION__,
+               dprintk("%s: llc_sap_find(%02X) failed!\n", __func__,
                        pdu->dsap);
                goto drop;
        }