diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-12-09 12:17:25 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-12-09 12:17:25 -0500 |
| commit | d834a9dcecae834cd6b2bc5e50e1907738d9cf6a (patch) | |
| tree | 0589d753465d3fe359ba451ba6cb7798df03aaa2 /net/mac80211/mesh.h | |
| parent | a38c5380ef9f088be9f49b6e4c5d80af8b1b5cd4 (diff) | |
| parent | f658bcfb2607bf0808966a69cf74135ce98e5c2d (diff) | |
Merge branch 'x86/amd-nb' into x86/apic-cleanups
Reason: apic cleanup series depends on x86/apic, x86/amd-nb x86/platform
Conflicts:
arch/x86/include/asm/io_apic.h
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'net/mac80211/mesh.h')
| -rw-r--r-- | net/mac80211/mesh.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h index ebd3f1d9d889..58e741128968 100644 --- a/net/mac80211/mesh.h +++ b/net/mac80211/mesh.h | |||
| @@ -115,7 +115,7 @@ struct mesh_path { | |||
| 115 | * @hash_rnd: random value used for hash computations | 115 | * @hash_rnd: random value used for hash computations |
| 116 | * @entries: number of entries in the table | 116 | * @entries: number of entries in the table |
| 117 | * @free_node: function to free nodes of the table | 117 | * @free_node: function to free nodes of the table |
| 118 | * @copy_node: fuction to copy nodes of the table | 118 | * @copy_node: function to copy nodes of the table |
| 119 | * @size_order: determines size of the table, there will be 2^size_order hash | 119 | * @size_order: determines size of the table, there will be 2^size_order hash |
| 120 | * buckets | 120 | * buckets |
| 121 | * @mean_chain_len: maximum average length for the hash buckets' list, if it is | 121 | * @mean_chain_len: maximum average length for the hash buckets' list, if it is |