diff options
| author | David S. Miller <davem@davemloft.net> | 2014-11-14 07:01:12 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-14 07:01:12 +0100 |
| commit | 076ce4482569ea1a2c27b4ca71a309adaf91d398 (patch) | |
| tree | 2ae9e42612f35be897f190983fc292d7af781cd2 /lib/rhashtable.c | |
| parent | tcp: limit GSO packets to half cwnd (diff) | |
| parent | Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost (diff) | |
| download | linux-076ce4482569ea1a2c27b4ca71a309adaf91d398.tar.xz linux-076ce4482569ea1a2c27b4ca71a309adaf91d398.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/chelsio/cxgb4vf/sge.c
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
sge.c was overlapping two changes, one to use the new
__dev_alloc_page() in net-next, and one to use s->fl_pg_order in net.
ixgbe_phy.c was a set of overlapping whitespace changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib/rhashtable.c')
| -rw-r--r-- | lib/rhashtable.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/rhashtable.c b/lib/rhashtable.c index 25e4c213b08a..e5f5e69c7a7b 100644 --- a/lib/rhashtable.c +++ b/lib/rhashtable.c @@ -229,7 +229,7 @@ int rhashtable_expand(struct rhashtable *ht) ht->shift++; /* For each new bucket, search the corresponding old bucket - * for the first entry that hashes to the new bucket, and + * for the first entry that hashes to the new bucket, and * link the new bucket to that entry. Since all the entries * which will end up in the new bucket appear in the same * old bucket, this constructs an entirely valid new hash @@ -247,8 +247,8 @@ int rhashtable_expand(struct rhashtable *ht) } /* Publish the new table pointer. Lookups may now traverse - * the new table, but they will not benefit from any - * additional efficiency until later steps unzip the buckets. + * the new table, but they will not benefit from any + * additional efficiency until later steps unzip the buckets. */ rcu_assign_pointer(ht->tbl, new_tbl); @@ -304,14 +304,14 @@ int rhashtable_shrink(struct rhashtable *ht) ht->shift--; - /* Link each bucket in the new table to the first bucket + /* Link each bucket in the new table to the first bucket * in the old table that contains entries which will hash * to the new bucket. */ for (i = 0; i < ntbl->size; i++) { ntbl->buckets[i] = tbl->buckets[i]; - /* Link each bucket in the new table to the first bucket + /* Link each bucket in the new table to the first bucket * in the old table that contains entries which will hash * to the new bucket. */ |