diff options
| author | Petr Mladek <[email protected]> | 2019-05-06 10:33:10 +0200 |
|---|---|---|
| committer | Petr Mladek <[email protected]> | 2019-05-06 10:33:10 +0200 |
| commit | 0f46c78391e1348fe45af86a0cd52795726695af (patch) | |
| tree | ee841bfa1178ce5be421c79bed73bb5e72b6d38e /net/core/netpoll.c | |
| parent | 35e1547511fcb035437b4527184458adfb0e8f43 (diff) | |
| parent | d75f773c86a2b8b7278e2c33343b46a4024bc002 (diff) | |
Merge branch 'for-5.2-pf-removal' into for-linus
Diffstat (limited to 'net/core/netpoll.c')
| -rw-r--r-- | net/core/netpoll.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 361aabffb8c0..bf5446192d6a 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -149,7 +149,7 @@ static void poll_one_napi(struct napi_struct *napi) * indicate that we are clearing the Tx path only. */ work = napi->poll(napi, 0); - WARN_ONCE(work, "%pF exceeded budget in poll\n", napi->poll); + WARN_ONCE(work, "%pS exceeded budget in poll\n", napi->poll); trace_napi_poll(napi, work, 0); clear_bit(NAPI_STATE_NPSVC, &napi->state); @@ -346,7 +346,7 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb, } WARN_ONCE(!irqs_disabled(), - "netpoll_send_skb_on_dev(): %s enabled interrupts in poll (%pF)\n", + "netpoll_send_skb_on_dev(): %s enabled interrupts in poll (%pS)\n", dev->name, dev->netdev_ops->ndo_start_xmit); } |