Merge branch 'for-linus' of git://github.com/ericvh/linux

[pandora-kernel.git] / net / wireless / mesh.c

diff --git a/net/wireless/mesh.c b/net/wireless/mesh.c
index 5c11608..4423e64 100644 (file)
--- 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 = {