diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-28 15:49:40 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-28 15:49:40 -0500 |
commit | 0191b625ca5a46206d2fb862bb08f36f2fcb3b31 (patch) | |
tree | 454d1842b1833d976da62abcbd5c47521ebe9bd7 /net/mac80211/mesh.h | |
parent | 54a696bd07c14d3b1192d03ce7269bc59b45209a (diff) | |
parent | eb56092fc168bf5af199d47af50c0d84a96db898 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429 commits)
net: Allow dependancies of FDDI & Tokenring to be modular.
igb: Fix build warning when DCA is disabled.
net: Fix warning fallout from recent NAPI interface changes.
gro: Fix potential use after free
sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
sfc: When disabling the NIC, close the device rather than unregistering it
sfc: SFT9001: Add cable diagnostics
sfc: Add support for multiple PHY self-tests
sfc: Merge top-level functions for self-tests
sfc: Clean up PHY mode management in loopback self-test
sfc: Fix unreliable link detection in some loopback modes
sfc: Generate unique names for per-NIC workqueues
802.3ad: use standard ethhdr instead of ad_header
802.3ad: generalize out mac address initializer
802.3ad: initialize ports LACPDU from const initializer
802.3ad: remove typedef around ad_system
802.3ad: turn ports is_individual into a bool
802.3ad: turn ports is_enabled into a bool
802.3ad: make ntt bool
ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
...
Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
to the conversion to %pI (in this networking merge) and the addition of
doing IPv6 addresses (from the earlier merge of CIFS).
Diffstat (limited to 'net/mac80211/mesh.h')
-rw-r--r-- | net/mac80211/mesh.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h index e10471c6ba42..c197ab545e54 100644 --- a/net/mac80211/mesh.h +++ b/net/mac80211/mesh.h | |||
@@ -145,9 +145,6 @@ struct mesh_rmc { | |||
145 | }; | 145 | }; |
146 | 146 | ||
147 | 147 | ||
148 | /* Mesh IEs constants */ | ||
149 | #define MESH_CFG_LEN 19 | ||
150 | |||
151 | /* | 148 | /* |
152 | * MESH_CFG_COMP_LEN Includes: | 149 | * MESH_CFG_COMP_LEN Includes: |
153 | * - Active path selection protocol ID. | 150 | * - Active path selection protocol ID. |
@@ -157,7 +154,7 @@ struct mesh_rmc { | |||
157 | * Does not include mesh capabilities, which may vary across nodes in the same | 154 | * Does not include mesh capabilities, which may vary across nodes in the same |
158 | * mesh | 155 | * mesh |
159 | */ | 156 | */ |
160 | #define MESH_CFG_CMP_LEN 17 | 157 | #define MESH_CFG_CMP_LEN (IEEE80211_MESH_CONFIG_LEN - 2) |
161 | 158 | ||
162 | /* Default values, timeouts in ms */ | 159 | /* Default values, timeouts in ms */ |
163 | #define MESH_TTL 5 | 160 | #define MESH_TTL 5 |