Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[linux-drm-fsl-dcu.git] / net / sched / act_mirred.c

diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
index c046682054ebdffbba3f71e439d140ac5c3155c1..c0b6863e3b87dbe91679638b83a169f099ab887f 100644 (file)
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
@@ -164,8 +164,8 @@ static int tcf_mirred(struct sk_buff *skb, struct tc_action *a,
        dev = m->tcfm_dev;
        if (!(dev->flags & IFF_UP)) {
                if (net_ratelimit())
-                       printk("mirred to Houston: device %s is gone!\n",
-                              dev->name);
+                       pr_notice("tc mirred to Houston: device %s is gone!\n",
+                                 dev->name);
                goto out;
        }
 
@@ -252,7 +252,7 @@ MODULE_LICENSE("GPL");
 
 static int __init mirred_init_module(void)
 {
-       printk("Mirror/redirect action on\n");
+       pr_info("Mirror/redirect action on\n");
        return tcf_register_action(&act_mirred_ops);
 }