diff options
author | Thomas Pedersen <thomas@cozybit.com> | 2011-08-25 10:36:14 -0700 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-08-26 10:39:23 -0400 |
commit | c613366113c8956ee869e12558099927586785bb (patch) | |
tree | 0336b039c694ca19b9e5ce42608aebd0ec0b92fe /net/mac80211/mesh.c | |
parent | 25232490af96f899f7e17de2c136e03d2c9ded62 (diff) | |
download | op-kernel-dev-c613366113c8956ee869e12558099927586785bb.zip op-kernel-dev-c613366113c8956ee869e12558099927586785bb.tar.gz |
mac80211: mesh gate fixes
Since a v1 of the mesh gate series was accidentally applied, this patch
contains the changes in v2.
These are:
- automatically make mesh gate a root node.
- use TU_TO_EXP_TIME macro.
- initialize timer instead of checking for NULL timer function.
- cleanups.
Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mesh.c')
-rw-r--r-- | net/mac80211/mesh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 1c4f53c..28ab510 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -537,8 +537,8 @@ static void ieee80211_mesh_rootpath(struct ieee80211_sub_if_data *sdata) mesh_path_tx_root_frame(sdata); mod_timer(&ifmsh->mesh_path_root_timer, - round_jiffies(jiffies + - usecs_to_jiffies(ifmsh->mshcfg.dot11MeshHWMPRannInterval * 1024))); + round_jiffies(TU_TO_EXP_TIME( + ifmsh->mshcfg.dot11MeshHWMPRannInterval))); } #ifdef CONFIG_PM |