hwmon: add TI ads7871 a/d converter driver

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

diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
index b7dcfed..fdbd0b7 100644 (file)
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
@@ -158,11 +158,13 @@ static int tcf_pedit(struct sk_buff *skb, struct tc_action *a,
                        }
 
                        if (offset % 4) {
-                               printk("offset must be on 32 bit boundaries\n");
+                               pr_info("tc filter pedit"
+                                       " offset must be on 32 bit boundaries\n");
                                goto bad;
                        }
                        if (offset > 0 && offset > skb->len) {
-                               printk("offset %d cant exceed pkt length %d\n",
+                               pr_info("tc filter pedit"
+                                       " offset %d cant exceed pkt length %d\n",
                                       offset, skb->len);
                                goto bad;
                        }
@@ -176,9 +178,8 @@ static int tcf_pedit(struct sk_buff *skb, struct tc_action *a,
                if (munged)
                        skb->tc_verd = SET_TC_MUNGED(skb->tc_verd);
                goto done;
-       } else {
-               printk("pedit BUG: index %d\n", p->tcf_index);
-       }
+       } else
+               WARN(1, "pedit BUG: index %d\n", p->tcf_index);
 
 bad:
        p->tcf_qstats.overlimits++;