Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
+8
-1
net/ipv4/fib_semantics.c
+8
-1
net/ipv4/fib_semantics.c
···
593
struct hlist_head *new_laddrhash,
594
unsigned int new_size)
595
{
596
unsigned int old_size = fib_hash_size;
597
-
unsigned int i;
598
599
write_lock(&fib_info_lock);
600
fib_hash_size = new_size;
601
602
for (i = 0; i < old_size; i++) {
···
639
fib_info_laddrhash = new_laddrhash;
640
641
write_unlock(&fib_info_lock);
642
}
643
644
struct fib_info *
···
593
struct hlist_head *new_laddrhash,
594
unsigned int new_size)
595
{
596
+
struct hlist_head *old_info_hash, *old_laddrhash;
597
unsigned int old_size = fib_hash_size;
598
+
unsigned int i, bytes;
599
600
write_lock(&fib_info_lock);
601
+
old_info_hash = fib_info_hash;
602
+
old_laddrhash = fib_info_laddrhash;
603
fib_hash_size = new_size;
604
605
for (i = 0; i < old_size; i++) {
···
636
fib_info_laddrhash = new_laddrhash;
637
638
write_unlock(&fib_info_lock);
639
+
640
+
bytes = old_size * sizeof(struct hlist_head *);
641
+
fib_hash_free(old_info_hash, bytes);
642
+
fib_hash_free(old_laddrhash, bytes);
643
}
644
645
struct fib_info *