Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[cascardo/linux.git] / net / ipv4 / inet_fragment.c

diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c
index 7e06641..c5313a9 100644 (file)
--- a/net/ipv4/inet_fragment.c
+++ b/net/ipv4/inet_fragment.c
@@ -93,7 +93,7 @@ void inet_frags_init(struct inet_frags *f)
        }
        rwlock_init(&f->lock);
 
-       f->rnd = (u32) ((num_physpages ^ (num_physpages>>7)) ^
+       f->rnd = (u32) ((totalram_pages ^ (totalram_pages >> 7)) ^
                                   (jiffies ^ (jiffies >> 6)));
 
        setup_timer(&f->secret_timer, inet_frag_secret_rebuild,
@@ -247,8 +247,6 @@ static struct inet_frag_queue *inet_frag_intern(struct netns_frags *nf,
 {
        struct inet_frag_bucket *hb;
        struct inet_frag_queue *qp;
-#ifdef CONFIG_SMP
-#endif
        unsigned int hash;
 
        read_lock(&f->lock); /* Protects against hash rebuild */