Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

[~andy/linux] / net / decnet / dn_table.c

diff --git a/net/decnet/dn_table.c b/net/decnet/dn_table.c
index bd0a52dd1d40e65c2c6d905172cb4fc957dd3264..a9a62f225a6b5baf2135565b4550d7e518ea51a3 100644 (file)
--- a/net/decnet/dn_table.c
+++ b/net/decnet/dn_table.c
@@ -25,7 +25,7 @@
 #include <linux/netdevice.h>
 #include <linux/timer.h>
 #include <linux/spinlock.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <asm/uaccess.h>
 #include <linux/route.h> /* RTF_xxx */
 #include <net/neighbour.h>
@@ -147,17 +147,18 @@ static void dn_rehash_zone(struct dn_zone *dz)
 
        old_divisor = dz->dz_divisor;
 
-       switch(old_divisor) {
-               case 16:
-                       new_divisor = 256;
-                       new_hashmask = 0xFF;
-                       break;
-               default:
-                       printk(KERN_DEBUG "DECnet: dn_rehash_zone: BUG! %d\n", old_divisor);
-               case 256:
-                       new_divisor = 1024;
-                       new_hashmask = 0x3FF;
-                       break;
+       switch (old_divisor) {
+       case 16:
+               new_divisor = 256;
+               new_hashmask = 0xFF;
+               break;
+       default:
+               printk(KERN_DEBUG "DECnet: dn_rehash_zone: BUG! %d\n",
+                      old_divisor);
+       case 256:
+               new_divisor = 1024;
+               new_hashmask = 0x3FF;
+               break;
        }
 
        ht = kcalloc(new_divisor, sizeof(struct dn_fib_node*), GFP_KERNEL);