Commit 0dc47877 authored by Harvey Harrison's avatar Harvey Harrison Committed by David S. Miller
Browse files

net: replace remaining __FUNCTION__ occurrences 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6387c4be

net/8021q/vlan_dev.c

+6 −6
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev, 
	skb->dev = __find_vlan_dev(dev, vid);

	if (!skb->dev) {

		pr_debug("%s: ERROR: No net_device for VID: %u on dev: %s\n",

			 __FUNCTION__, (unsigned int)vid, dev->name);

			 __func__, (unsigned int)vid, dev->name);

		goto err_unlock;

	}
@@ -187,7 +187,7 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev, 
						  ntohs(vhdr->h_vlan_TCI));



	pr_debug("%s: priority: %u for TCI: %hu\n",

		 __FUNCTION__, skb->priority, ntohs(vhdr->h_vlan_TCI));

		 __func__, skb->priority, ntohs(vhdr->h_vlan_TCI));



	switch (skb->pkt_type) {

	case PACKET_BROADCAST: /* Yeah, stats collect these together.. */
@@ -268,7 +268,7 @@ static int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev, 
	struct net_device *vdev = dev;



	pr_debug("%s: skb: %p type: %hx len: %u vlan_id: %hx, daddr: %p\n",

		 __FUNCTION__, skb, type, len, vlan_dev_info(dev)->vlan_id,

		 __func__, skb, type, len, vlan_dev_info(dev)->vlan_id,

		 daddr);



	/* build vlan header only if re_order_header flag is NOT set.  This
@@ -340,7 +340,7 @@ static int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev, 
			return -ENOMEM;

		}

		vlan_dev_info(vdev)->cnt_inc_headroom_on_tx++;

		pr_debug("%s: %s: had to grow skb\n", __FUNCTION__, vdev->name);

		pr_debug("%s: %s: had to grow skb\n", __func__, vdev->name);

	}



	if (build_vlan_header) {
@@ -382,7 +382,7 @@ static int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) 
		vlan_dev_info(dev)->cnt_encap_on_xmit++;



		pr_debug("%s: proto to encap: 0x%hx\n",

			 __FUNCTION__, htons(veth->h_vlan_proto));

			 __func__, htons(veth->h_vlan_proto));

		/* Construct the second two bytes. This field looks something

		 * like:

		 * usr_priority: 3 bits	 (high bits)
@@ -403,7 +403,7 @@ static int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	}



	pr_debug("%s: about to send skb: %p to dev: %s\n",

		__FUNCTION__, skb, skb->dev->name);

		__func__, skb, skb->dev->name);

	pr_debug("  " MAC_FMT " " MAC_FMT " %4hx %4hx %4hx\n",

		 veth->h_dest[0], veth->h_dest[1], veth->h_dest[2],

		 veth->h_dest[3], veth->h_dest[4], veth->h_dest[5],

net/8021q/vlanproc.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ int __init vlan_proc_init(void) 
	return 0;



err:

	pr_err("%s: can't create entry in proc filesystem!\n", __FUNCTION__);

	pr_err("%s: can't create entry in proc filesystem!\n", __func__);

	vlan_proc_cleanup();

	return -ENOBUFS;

}

net/9p/error.c

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ int p9_errstr2errno(char *errstr, int len) 
	if (errno == 0) {

		/* TODO: if error isn't found, add it dynamically */

		errstr[len] = 0;

		printk(KERN_ERR "%s: errstr :%s: not found\n", __FUNCTION__,

		printk(KERN_ERR "%s: errstr :%s: not found\n", __func__,

		       errstr);

		errno = 1;

	}

net/bridge/br_sysfs_br.c

+3 −3
Original line number Diff line number Diff line
@@ -415,21 +415,21 @@ int br_sysfs_addbr(struct net_device *dev) 
	err = sysfs_create_group(brobj, &bridge_group);

	if (err) {

		pr_info("%s: can't create group %s/%s\n",

			__FUNCTION__, dev->name, bridge_group.name);

			__func__, dev->name, bridge_group.name);

		goto out1;

	}



	err = sysfs_create_bin_file(brobj, &bridge_forward);

	if (err) {

		pr_info("%s: can't create attribute file %s/%s\n",

			__FUNCTION__, dev->name, bridge_forward.attr.name);

			__func__, dev->name, bridge_forward.attr.name);

		goto out2;

	}



	br->ifobj = kobject_create_and_add(SYSFS_BRIDGE_PORT_SUBDIR, brobj);

	if (!br->ifobj) {

		pr_info("%s: can't add kobject (directory) %s/%s\n",

			__FUNCTION__, dev->name, SYSFS_BRIDGE_PORT_SUBDIR);

			__func__, dev->name, SYSFS_BRIDGE_PORT_SUBDIR);

		goto out3;

	}

	return 0;

net/core/sock.c

+1 −1
Original line number Diff line number Diff line
@@ -981,7 +981,7 @@ void sk_free(struct sock *sk) 


	if (atomic_read(&sk->sk_omem_alloc))

		printk(KERN_DEBUG "%s: optmem leakage (%d bytes) detected.\n",

		       __FUNCTION__, atomic_read(&sk->sk_omem_alloc));

		       __func__, atomic_read(&sk->sk_omem_alloc));



	put_net(sk->sk_net);

	sk_prot_free(sk->sk_prot_creator, sk);