Merge branch 'linus' into cont_syslog

[safe/jmp/linux-2.6] / net / sched / act_ipt.c

diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c
index 1f95954..c7e59e6 100644 (file)
--- a/net/sched/act_ipt.c
+++ b/net/sched/act_ipt.c
@@ -235,7 +235,8 @@ static int tcf_ipt(struct sk_buff *skb, struct tc_action *a,
                break;
        default:
                if (net_ratelimit())
-                       printk("Bogus netfilter code %d assume ACCEPT\n", ret);
+                       pr_notice("tc filter: Bogus netfilter code"
+                                 " %d assume ACCEPT\n", ret);
                result = TC_POLICE_OK;
                break;
        }