multipath: Fix off-by-one in hash_threshold multipath calculation.

[sliver-openvswitch.git] / datapath / brc_procfs.c

diff --git a/datapath/brc_procfs.c b/datapath/brc_procfs.c
index cfe0175..6bcb51c 100644 (file)
--- a/datapath/brc_procfs.c
+++ b/datapath/brc_procfs.c
@@ -1,11 +1,13 @@
 /*
- * Copyright (c) 2009, 2010 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011 Nicira Networks.
  * Distributed under the terms of the GNU GPL version 2.
  *
  * Significant portions of this file may be copied from parts of the Linux
  * kernel, by Linus Torvalds and others.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
@@ -69,9 +71,9 @@ static struct proc_dir_entry *brc_open_dir(const char *dir_name,
        if (!*dirp) {
                struct proc_dir_entry *dir;
                if (brc_lookup_entry(parent, dir_name)) {
-                       printk(KERN_WARNING "%s proc directory exists, can't "
-                              "simulate--probably its real module is "
-                              "loaded\n", dir_name);
+                       pr_warn("%s proc directory exists, can't simulate--"
+                               "probably its real module is loaded\n",
+                               dir_name);
                        return NULL;
                }
                dir = *dirp = proc_mkdir(dir_name, parent);
@@ -169,7 +171,7 @@ static void kill_proc_dir(const char *dir_name,
                if (!e)
                        break;
 
-               if (e->namelen >= sizeof name) {
+               if (e->namelen >= sizeof(name)) {
                        /* Can't happen: we prevent adding names this long by
                         * limiting the BRC_GENL_A_PROC_NAME string to
                         * BRC_NAME_LEN_MAX bytes.  */