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/addrlabel.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/addrlabel.c')
-rw-r--r-- | net/ipv6/addrlabel.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/ipv6/addrlabel.c b/net/ipv6/addrlabel.c index 3a8b3f52da35..de371b5997fe 100644 --- a/net/ipv6/addrlabel.c +++ b/net/ipv6/addrlabel.c | |||
@@ -166,7 +166,7 @@ u32 ipv6_addr_label(const struct in6_addr *addr, int type, int ifindex) | |||
166 | rcu_read_unlock(); | 166 | rcu_read_unlock(); |
167 | 167 | ||
168 | ADDRLABEL(KERN_DEBUG "%s(addr=" NIP6_FMT ", type=%d, ifindex=%d) => %08x\n", | 168 | ADDRLABEL(KERN_DEBUG "%s(addr=" NIP6_FMT ", type=%d, ifindex=%d) => %08x\n", |
169 | __FUNCTION__, | 169 | __func__, |
170 | NIP6(*addr), type, ifindex, | 170 | NIP6(*addr), type, ifindex, |
171 | label); | 171 | label); |
172 | 172 | ||
@@ -182,7 +182,7 @@ static struct ip6addrlbl_entry *ip6addrlbl_alloc(const struct in6_addr *prefix, | |||
182 | int addrtype; | 182 | int addrtype; |
183 | 183 | ||
184 | ADDRLABEL(KERN_DEBUG "%s(prefix=" NIP6_FMT ", prefixlen=%d, ifindex=%d, label=%u)\n", | 184 | ADDRLABEL(KERN_DEBUG "%s(prefix=" NIP6_FMT ", prefixlen=%d, ifindex=%d, label=%u)\n", |
185 | __FUNCTION__, | 185 | __func__, |
186 | NIP6(*prefix), prefixlen, | 186 | NIP6(*prefix), prefixlen, |
187 | ifindex, | 187 | ifindex, |
188 | (unsigned int)label); | 188 | (unsigned int)label); |
@@ -226,7 +226,7 @@ static int __ip6addrlbl_add(struct ip6addrlbl_entry *newp, int replace) | |||
226 | int ret = 0; | 226 | int ret = 0; |
227 | 227 | ||
228 | ADDRLABEL(KERN_DEBUG "%s(newp=%p, replace=%d)\n", | 228 | ADDRLABEL(KERN_DEBUG "%s(newp=%p, replace=%d)\n", |
229 | __FUNCTION__, | 229 | __func__, |
230 | newp, replace); | 230 | newp, replace); |
231 | 231 | ||
232 | if (hlist_empty(&ip6addrlbl_table.head)) { | 232 | if (hlist_empty(&ip6addrlbl_table.head)) { |
@@ -268,7 +268,7 @@ static int ip6addrlbl_add(const struct in6_addr *prefix, int prefixlen, | |||
268 | int ret = 0; | 268 | int ret = 0; |
269 | 269 | ||
270 | ADDRLABEL(KERN_DEBUG "%s(prefix=" NIP6_FMT ", prefixlen=%d, ifindex=%d, label=%u, replace=%d)\n", | 270 | ADDRLABEL(KERN_DEBUG "%s(prefix=" NIP6_FMT ", prefixlen=%d, ifindex=%d, label=%u, replace=%d)\n", |
271 | __FUNCTION__, | 271 | __func__, |
272 | NIP6(*prefix), prefixlen, | 272 | NIP6(*prefix), prefixlen, |
273 | ifindex, | 273 | ifindex, |
274 | (unsigned int)label, | 274 | (unsigned int)label, |
@@ -294,7 +294,7 @@ static int __ip6addrlbl_del(const struct in6_addr *prefix, int prefixlen, | |||
294 | int ret = -ESRCH; | 294 | int ret = -ESRCH; |
295 | 295 | ||
296 | ADDRLABEL(KERN_DEBUG "%s(prefix=" NIP6_FMT ", prefixlen=%d, ifindex=%d)\n", | 296 | ADDRLABEL(KERN_DEBUG "%s(prefix=" NIP6_FMT ", prefixlen=%d, ifindex=%d)\n", |
297 | __FUNCTION__, | 297 | __func__, |
298 | NIP6(*prefix), prefixlen, | 298 | NIP6(*prefix), prefixlen, |
299 | ifindex); | 299 | ifindex); |
300 | 300 | ||
@@ -318,7 +318,7 @@ static int ip6addrlbl_del(const struct in6_addr *prefix, int prefixlen, | |||
318 | int ret; | 318 | int ret; |
319 | 319 | ||
320 | ADDRLABEL(KERN_DEBUG "%s(prefix=" NIP6_FMT ", prefixlen=%d, ifindex=%d)\n", | 320 | ADDRLABEL(KERN_DEBUG "%s(prefix=" NIP6_FMT ", prefixlen=%d, ifindex=%d)\n", |
321 | __FUNCTION__, | 321 | __func__, |
322 | NIP6(*prefix), prefixlen, | 322 | NIP6(*prefix), prefixlen, |
323 | ifindex); | 323 | ifindex); |
324 | 324 | ||
@@ -335,7 +335,7 @@ static __init int ip6addrlbl_init(void) | |||
335 | int err = 0; | 335 | int err = 0; |
336 | int i; | 336 | int i; |
337 | 337 | ||
338 | ADDRLABEL(KERN_DEBUG "%s()\n", __FUNCTION__); | 338 | ADDRLABEL(KERN_DEBUG "%s()\n", __func__); |
339 | 339 | ||
340 | for (i = 0; i < ARRAY_SIZE(ip6addrlbl_init_table); i++) { | 340 | for (i = 0; i < ARRAY_SIZE(ip6addrlbl_init_table); i++) { |
341 | int ret = ip6addrlbl_add(ip6addrlbl_init_table[i].prefix, | 341 | int ret = ip6addrlbl_add(ip6addrlbl_init_table[i].prefix, |