Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sch_dsmark: use correct func name in print messages

In dsmark_drop(), the function name printed by pr_debug
is "dsmark_reset", correct it to "dsmark_drop" by using
__func__ .

BTW, replace the other function names with __func__ .

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Yang Yingliang and committed by
David S. Miller
c76f2a2c a071d272

+19 -18
+19 -18
net/sched/sch_dsmark.c
··· 57 57 { 58 58 struct dsmark_qdisc_data *p = qdisc_priv(sch); 59 59 60 - pr_debug("dsmark_graft(sch %p,[qdisc %p],new %p,old %p)\n", 61 - sch, p, new, old); 60 + pr_debug("%s(sch %p,[qdisc %p],new %p,old %p)\n", 61 + __func__, sch, p, new, old); 62 62 63 63 if (new == NULL) { 64 64 new = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops, ··· 85 85 86 86 static unsigned long dsmark_get(struct Qdisc *sch, u32 classid) 87 87 { 88 - pr_debug("dsmark_get(sch %p,[qdisc %p],classid %x)\n", 89 - sch, qdisc_priv(sch), classid); 88 + pr_debug("%s(sch %p,[qdisc %p],classid %x)\n", 89 + __func__, sch, qdisc_priv(sch), classid); 90 90 91 91 return TC_H_MIN(classid) + 1; 92 92 } ··· 118 118 int err = -EINVAL; 119 119 u8 mask = 0; 120 120 121 - pr_debug("dsmark_change(sch %p,[qdisc %p],classid %x,parent %x)," 122 - "arg 0x%lx\n", sch, p, classid, parent, *arg); 121 + pr_debug("%s(sch %p,[qdisc %p],classid %x,parent %x), arg 0x%lx\n", 122 + __func__, sch, p, classid, parent, *arg); 123 123 124 124 if (!dsmark_valid_index(p, *arg)) { 125 125 err = -ENOENT; ··· 166 166 struct dsmark_qdisc_data *p = qdisc_priv(sch); 167 167 int i; 168 168 169 - pr_debug("dsmark_walk(sch %p,[qdisc %p],walker %p)\n", sch, p, walker); 169 + pr_debug("%s(sch %p,[qdisc %p],walker %p)\n", 170 + __func__, sch, p, walker); 170 171 171 172 if (walker->stop) 172 173 return; ··· 200 199 struct dsmark_qdisc_data *p = qdisc_priv(sch); 201 200 int err; 202 201 203 - pr_debug("dsmark_enqueue(skb %p,sch %p,[qdisc %p])\n", skb, sch, p); 202 + pr_debug("%s(skb %p,sch %p,[qdisc %p])\n", __func__, skb, sch, p); 204 203 205 204 if (p->set_tc_index) { 206 205 switch (skb->protocol) { ··· 276 275 struct sk_buff *skb; 277 276 u32 index; 278 277 279 - pr_debug("dsmark_dequeue(sch %p,[qdisc %p])\n", sch, p); 278 + pr_debug("%s(sch %p,[qdisc %p])\n", __func__, sch, p); 280 279 281 280 skb = p->q->ops->dequeue(p->q); 282 281 if (skb == NULL) ··· 304 303 * and don't need yet another qdisc as a bypass. 305 304 */ 306 305 if (p->mask[index] != 0xff || p->value[index]) 307 - pr_warn("dsmark_dequeue: unsupported protocol %d\n", 308 - ntohs(skb->protocol)); 306 + pr_warn("%s: unsupported protocol %d\n", 307 + __func__, ntohs(skb->protocol)); 309 308 break; 310 309 } 311 310 ··· 316 315 { 317 316 struct dsmark_qdisc_data *p = qdisc_priv(sch); 318 317 319 - pr_debug("dsmark_peek(sch %p,[qdisc %p])\n", sch, p); 318 + pr_debug("%s(sch %p,[qdisc %p])\n", __func__, sch, p); 320 319 321 320 return p->q->ops->peek(p->q); 322 321 } ··· 326 325 struct dsmark_qdisc_data *p = qdisc_priv(sch); 327 326 unsigned int len; 328 327 329 - pr_debug("dsmark_reset(sch %p,[qdisc %p])\n", sch, p); 328 + pr_debug("%s(sch %p,[qdisc %p])\n", __func__, sch, p); 330 329 331 330 if (p->q->ops->drop == NULL) 332 331 return 0; ··· 347 346 u16 indices; 348 347 u8 *mask; 349 348 350 - pr_debug("dsmark_init(sch %p,[qdisc %p],opt %p)\n", sch, p, opt); 349 + pr_debug("%s(sch %p,[qdisc %p],opt %p)\n", __func__, sch, p, opt); 351 350 352 351 if (!opt) 353 352 goto errout; ··· 385 384 if (p->q == NULL) 386 385 p->q = &noop_qdisc; 387 386 388 - pr_debug("dsmark_init: qdisc %p\n", p->q); 387 + pr_debug("%s: qdisc %p\n", __func__, p->q); 389 388 390 389 err = 0; 391 390 errout: ··· 396 395 { 397 396 struct dsmark_qdisc_data *p = qdisc_priv(sch); 398 397 399 - pr_debug("dsmark_reset(sch %p,[qdisc %p])\n", sch, p); 398 + pr_debug("%s(sch %p,[qdisc %p])\n", __func__, sch, p); 400 399 qdisc_reset(p->q); 401 400 sch->q.qlen = 0; 402 401 } ··· 405 404 { 406 405 struct dsmark_qdisc_data *p = qdisc_priv(sch); 407 406 408 - pr_debug("dsmark_destroy(sch %p,[qdisc %p])\n", sch, p); 407 + pr_debug("%s(sch %p,[qdisc %p])\n", __func__, sch, p); 409 408 410 409 tcf_destroy_chain(&p->filter_list); 411 410 qdisc_destroy(p->q); ··· 418 417 struct dsmark_qdisc_data *p = qdisc_priv(sch); 419 418 struct nlattr *opts = NULL; 420 419 421 - pr_debug("dsmark_dump_class(sch %p,[qdisc %p],class %ld\n", sch, p, cl); 420 + pr_debug("%s(sch %p,[qdisc %p],class %ld\n", __func__, sch, p, cl); 422 421 423 422 if (!dsmark_valid_index(p, cl)) 424 423 return -EINVAL;