diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-08-29 14:52:20 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-08-29 14:52:20 -0400 |
| commit | ba6e5eb107b4b26444cb67ce6fb8eb0973a97964 (patch) | |
| tree | 9377baf652e0cd8360372020b0386e238d07a30d /net/wireless/mesh.c | |
| parent | f3116f62cb56ef5efd172371fab688bb27529f69 (diff) | |
| parent | a508a6ea234571e0e7d1e9f2455fc1eca54d1fef (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'net/wireless/mesh.c')
| -rw-r--r-- | net/wireless/mesh.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/wireless/mesh.c b/net/wireless/mesh.c index 5c116083eec..4423e64c7d9 100644 --- a/net/wireless/mesh.c +++ b/net/wireless/mesh.c @@ -12,6 +12,7 @@ #define MESH_HOLD_T 100 #define MESH_PATH_TIMEOUT 5000 +#define MESH_RANN_INTERVAL 5000 /* * Minimum interval between two consecutive PREQs originated by the same @@ -49,6 +50,8 @@ const struct mesh_config default_mesh_config = { .dot11MeshHWMPmaxPREQretries = MESH_MAX_PREQ_RETRIES, .path_refresh_time = MESH_PATH_REFRESH_TIME, .min_discovery_timeout = MESH_MIN_DISCOVERY_TIMEOUT, + .dot11MeshHWMPRannInterval = MESH_RANN_INTERVAL, + .dot11MeshGateAnnouncementProtocol = false, }; const struct mesh_setup default_mesh_setup = { |