Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...

[cascardo/linux.git] / net / decnet / dn_fib.c

diff --git a/net/decnet/dn_fib.c b/net/decnet/dn_fib.c
index 9e885f1..7eaf987 100644 (file)
--- a/net/decnet/dn_fib.c
+++ b/net/decnet/dn_fib.c
@@ -302,11 +302,12 @@ struct dn_fib_info *dn_fib_create_info(const struct rtmsg *r, struct dn_kern_rta
                struct rtattr *attr = RTA_DATA(rta->rta_mx);
 
                while(RTA_OK(attr, attrlen)) {
-                       unsigned flavour = attr->rta_type;
+                       unsigned int flavour = attr->rta_type;
+
                        if (flavour) {
                                if (flavour > RTAX_MAX)
                                        goto err_inval;
-                               fi->fib_metrics[flavour-1] = *(unsigned*)RTA_DATA(attr);
+                               fi->fib_metrics[flavour-1] = *(unsigned int *)RTA_DATA(attr);
                        }
                        attr = RTA_NEXT(attr, attrlen);
                }
@@ -437,9 +438,8 @@ int dn_fib_semantic_match(int type, struct dn_fib_info *fi, const struct flowidn
                        res->fi = NULL;
                        return 1;
                default:
-                       if (net_ratelimit())
-                               printk("DECnet: impossible routing event : dn_fib_semantic_match type=%d\n",
-                                      type);
+                       net_err_ratelimited("DECnet: impossible routing event : dn_fib_semantic_match type=%d\n",
+                                           type);
                        res->fi = NULL;
                        return -EINVAL;
                }