aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ndisc.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-03-05 23:47:47 -0500
committerDavid S. Miller <davem@davemloft.net>2008-03-05 23:47:47 -0500
commit0dc47877a3de00ceadea0005189656ae8dc52669 (patch)
tree7440a87385fe318cb42f0ae161be195f5e967d82 /net/ipv6/ndisc.c
parent6387c4bed539539b05fa773cf2ff26529dc3074c (diff)
net: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ndisc.c')
-rw-r--r--net/ipv6/ndisc.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index b5b4fd173e98..e0d023360a88 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -270,7 +270,7 @@ static struct ndisc_options *ndisc_parse_options(u8 *opt, int opt_len,
270 if (ndopts->nd_opt_array[nd_opt->nd_opt_type]) { 270 if (ndopts->nd_opt_array[nd_opt->nd_opt_type]) {
271 ND_PRINTK2(KERN_WARNING 271 ND_PRINTK2(KERN_WARNING
272 "%s(): duplicated ND6 option found: type=%d\n", 272 "%s(): duplicated ND6 option found: type=%d\n",
273 __FUNCTION__, 273 __func__,
274 nd_opt->nd_opt_type); 274 nd_opt->nd_opt_type);
275 } else { 275 } else {
276 ndopts->nd_opt_array[nd_opt->nd_opt_type] = nd_opt; 276 ndopts->nd_opt_array[nd_opt->nd_opt_type] = nd_opt;
@@ -301,7 +301,7 @@ static struct ndisc_options *ndisc_parse_options(u8 *opt, int opt_len,
301 */ 301 */
302 ND_PRINTK2(KERN_NOTICE 302 ND_PRINTK2(KERN_NOTICE
303 "%s(): ignored unsupported option; type=%d, len=%d\n", 303 "%s(): ignored unsupported option; type=%d, len=%d\n",
304 __FUNCTION__, 304 __func__,
305 nd_opt->nd_opt_type, nd_opt->nd_opt_len); 305 nd_opt->nd_opt_type, nd_opt->nd_opt_len);
306 } 306 }
307 } 307 }
@@ -484,7 +484,7 @@ static void __ndisc_send(struct net_device *dev,
484 if (!skb) { 484 if (!skb) {
485 ND_PRINTK0(KERN_ERR 485 ND_PRINTK0(KERN_ERR
486 "ICMPv6 ND: %s() failed to allocate an skb.\n", 486 "ICMPv6 ND: %s() failed to allocate an skb.\n",
487 __FUNCTION__); 487 __func__);
488 dst_release(dst); 488 dst_release(dst);
489 return; 489 return;
490 } 490 }
@@ -647,7 +647,7 @@ static void ndisc_solicit(struct neighbour *neigh, struct sk_buff *skb)
647 ND_PRINTK1(KERN_DEBUG 647 ND_PRINTK1(KERN_DEBUG
648 "%s(): trying to ucast probe in NUD_INVALID: " 648 "%s(): trying to ucast probe in NUD_INVALID: "
649 NIP6_FMT "\n", 649 NIP6_FMT "\n",
650 __FUNCTION__, 650 __func__,
651 NIP6(*target)); 651 NIP6(*target));
652 } 652 }
653 ndisc_send_ns(dev, neigh, target, target, saddr); 653 ndisc_send_ns(dev, neigh, target, target, saddr);
@@ -1149,7 +1149,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)
1149 if (rt == NULL) { 1149 if (rt == NULL) {
1150 ND_PRINTK0(KERN_ERR 1150 ND_PRINTK0(KERN_ERR
1151 "ICMPv6 RA: %s() failed to add default route.\n", 1151 "ICMPv6 RA: %s() failed to add default route.\n",
1152 __FUNCTION__); 1152 __func__);
1153 in6_dev_put(in6_dev); 1153 in6_dev_put(in6_dev);
1154 return; 1154 return;
1155 } 1155 }
@@ -1158,7 +1158,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)
1158 if (neigh == NULL) { 1158 if (neigh == NULL) {
1159 ND_PRINTK0(KERN_ERR 1159 ND_PRINTK0(KERN_ERR
1160 "ICMPv6 RA: %s() got default router without neighbour.\n", 1160 "ICMPv6 RA: %s() got default router without neighbour.\n",
1161 __FUNCTION__); 1161 __func__);
1162 dst_release(&rt->u.dst); 1162 dst_release(&rt->u.dst);
1163 in6_dev_put(in6_dev); 1163 in6_dev_put(in6_dev);
1164 return; 1164 return;
@@ -1471,7 +1471,7 @@ void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh,
1471 if (buff == NULL) { 1471 if (buff == NULL) {
1472 ND_PRINTK0(KERN_ERR 1472 ND_PRINTK0(KERN_ERR
1473 "ICMPv6 Redirect: %s() failed to allocate an skb.\n", 1473 "ICMPv6 Redirect: %s() failed to allocate an skb.\n",
1474 __FUNCTION__); 1474 __func__);
1475 dst_release(dst); 1475 dst_release(dst);
1476 return; 1476 return;
1477 } 1477 }