diff options
| author | Thomas Pedersen | 2011-08-25 19:36:14 +0200 |
|---|---|---|
| committer | John W. Linville | 2011-08-26 16:39:23 +0200 |
| commit | c613366113c8956ee869e12558099927586785bb (patch) | |
| tree | 0336b039c694ca19b9e5ce42608aebd0ec0b92fe /net/mac80211/cfg.c | |
| parent | libertas: update readme file (diff) | |
| download | kernel-qcow2-linux-c613366113c8956ee869e12558099927586785bb.tar.gz kernel-qcow2-linux-c613366113c8956ee869e12558099927586785bb.tar.xz kernel-qcow2-linux-c613366113c8956ee869e12558099927586785bb.zip | |
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/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 7d17a9183b8a..6ab67ab34b5c 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1138,6 +1138,14 @@ static int ieee80211_update_mesh_config(struct wiphy *wiphy, ieee80211_mesh_root_setup(ifmsh); } if (_chg_mesh_attr(NL80211_MESHCONF_GATE_ANNOUNCEMENTS, mask)) { + /* our current gate announcement implementation rides on root + * announcements, so require this ifmsh to also be a root node + * */ + if (nconf->dot11MeshGateAnnouncementProtocol && + !conf->dot11MeshHWMPRootMode) { + conf->dot11MeshHWMPRootMode = 1; + ieee80211_mesh_root_setup(ifmsh); + } conf->dot11MeshGateAnnouncementProtocol = nconf->dot11MeshGateAnnouncementProtocol; } |