diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-05 23:47:47 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-05 23:47:47 -0500 |
commit | 0dc47877a3de00ceadea0005189656ae8dc52669 (patch) | |
tree | 7440a87385fe318cb42f0ae161be195f5e967d82 /net/ipv6/mip6.c | |
parent | 6387c4bed539539b05fa773cf2ff26529dc3074c (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/mip6.c')
-rw-r--r-- | net/ipv6/mip6.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/net/ipv6/mip6.c b/net/ipv6/mip6.c index cd8a5bda13cd..42403c626c27 100644 --- a/net/ipv6/mip6.c +++ b/net/ipv6/mip6.c | |||
@@ -304,13 +304,13 @@ static int mip6_destopt_offset(struct xfrm_state *x, struct sk_buff *skb, | |||
304 | static int mip6_destopt_init_state(struct xfrm_state *x) | 304 | static int mip6_destopt_init_state(struct xfrm_state *x) |
305 | { | 305 | { |
306 | if (x->id.spi) { | 306 | if (x->id.spi) { |
307 | printk(KERN_INFO "%s: spi is not 0: %u\n", __FUNCTION__, | 307 | printk(KERN_INFO "%s: spi is not 0: %u\n", __func__, |
308 | x->id.spi); | 308 | x->id.spi); |
309 | return -EINVAL; | 309 | return -EINVAL; |
310 | } | 310 | } |
311 | if (x->props.mode != XFRM_MODE_ROUTEOPTIMIZATION) { | 311 | if (x->props.mode != XFRM_MODE_ROUTEOPTIMIZATION) { |
312 | printk(KERN_INFO "%s: state's mode is not %u: %u\n", | 312 | printk(KERN_INFO "%s: state's mode is not %u: %u\n", |
313 | __FUNCTION__, XFRM_MODE_ROUTEOPTIMIZATION, x->props.mode); | 313 | __func__, XFRM_MODE_ROUTEOPTIMIZATION, x->props.mode); |
314 | return -EINVAL; | 314 | return -EINVAL; |
315 | } | 315 | } |
316 | 316 | ||
@@ -439,13 +439,13 @@ static int mip6_rthdr_offset(struct xfrm_state *x, struct sk_buff *skb, | |||
439 | static int mip6_rthdr_init_state(struct xfrm_state *x) | 439 | static int mip6_rthdr_init_state(struct xfrm_state *x) |
440 | { | 440 | { |
441 | if (x->id.spi) { | 441 | if (x->id.spi) { |
442 | printk(KERN_INFO "%s: spi is not 0: %u\n", __FUNCTION__, | 442 | printk(KERN_INFO "%s: spi is not 0: %u\n", __func__, |
443 | x->id.spi); | 443 | x->id.spi); |
444 | return -EINVAL; | 444 | return -EINVAL; |
445 | } | 445 | } |
446 | if (x->props.mode != XFRM_MODE_ROUTEOPTIMIZATION) { | 446 | if (x->props.mode != XFRM_MODE_ROUTEOPTIMIZATION) { |
447 | printk(KERN_INFO "%s: state's mode is not %u: %u\n", | 447 | printk(KERN_INFO "%s: state's mode is not %u: %u\n", |
448 | __FUNCTION__, XFRM_MODE_ROUTEOPTIMIZATION, x->props.mode); | 448 | __func__, XFRM_MODE_ROUTEOPTIMIZATION, x->props.mode); |
449 | return -EINVAL; | 449 | return -EINVAL; |
450 | } | 450 | } |
451 | 451 | ||
@@ -480,15 +480,15 @@ static int __init mip6_init(void) | |||
480 | printk(KERN_INFO "Mobile IPv6\n"); | 480 | printk(KERN_INFO "Mobile IPv6\n"); |
481 | 481 | ||
482 | if (xfrm_register_type(&mip6_destopt_type, AF_INET6) < 0) { | 482 | if (xfrm_register_type(&mip6_destopt_type, AF_INET6) < 0) { |
483 | printk(KERN_INFO "%s: can't add xfrm type(destopt)\n", __FUNCTION__); | 483 | printk(KERN_INFO "%s: can't add xfrm type(destopt)\n", __func__); |
484 | goto mip6_destopt_xfrm_fail; | 484 | goto mip6_destopt_xfrm_fail; |
485 | } | 485 | } |
486 | if (xfrm_register_type(&mip6_rthdr_type, AF_INET6) < 0) { | 486 | if (xfrm_register_type(&mip6_rthdr_type, AF_INET6) < 0) { |
487 | printk(KERN_INFO "%s: can't add xfrm type(rthdr)\n", __FUNCTION__); | 487 | printk(KERN_INFO "%s: can't add xfrm type(rthdr)\n", __func__); |
488 | goto mip6_rthdr_xfrm_fail; | 488 | goto mip6_rthdr_xfrm_fail; |
489 | } | 489 | } |
490 | if (rawv6_mh_filter_register(mip6_mh_filter) < 0) { | 490 | if (rawv6_mh_filter_register(mip6_mh_filter) < 0) { |
491 | printk(KERN_INFO "%s: can't add rawv6 mh filter\n", __FUNCTION__); | 491 | printk(KERN_INFO "%s: can't add rawv6 mh filter\n", __func__); |
492 | goto mip6_rawv6_mh_fail; | 492 | goto mip6_rawv6_mh_fail; |
493 | } | 493 | } |
494 | 494 | ||
@@ -506,11 +506,11 @@ static int __init mip6_init(void) | |||
506 | static void __exit mip6_fini(void) | 506 | static void __exit mip6_fini(void) |
507 | { | 507 | { |
508 | if (rawv6_mh_filter_unregister(mip6_mh_filter) < 0) | 508 | if (rawv6_mh_filter_unregister(mip6_mh_filter) < 0) |
509 | printk(KERN_INFO "%s: can't remove rawv6 mh filter\n", __FUNCTION__); | 509 | printk(KERN_INFO "%s: can't remove rawv6 mh filter\n", __func__); |
510 | if (xfrm_unregister_type(&mip6_rthdr_type, AF_INET6) < 0) | 510 | if (xfrm_unregister_type(&mip6_rthdr_type, AF_INET6) < 0) |
511 | printk(KERN_INFO "%s: can't remove xfrm type(rthdr)\n", __FUNCTION__); | 511 | printk(KERN_INFO "%s: can't remove xfrm type(rthdr)\n", __func__); |
512 | if (xfrm_unregister_type(&mip6_destopt_type, AF_INET6) < 0) | 512 | if (xfrm_unregister_type(&mip6_destopt_type, AF_INET6) < 0) |
513 | printk(KERN_INFO "%s: can't remove xfrm type(destopt)\n", __FUNCTION__); | 513 | printk(KERN_INFO "%s: can't remove xfrm type(destopt)\n", __func__); |
514 | } | 514 | } |
515 | 515 | ||
516 | module_init(mip6_init); | 516 | module_init(mip6_init); |