diff options
| author | Luis Carlos Cobo <luisca@cozybit.com> | 2008-02-29 12:20:39 -0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-03-06 16:40:49 -0500 |
| commit | 3b091cd4941912081730ffa17948da6d148c822d (patch) | |
| tree | a406fc67bab7790cf1ba412636080b70db694195 | |
| parent | 1d1b535969ca5572d87a6fcac49e1e1a31241b99 (diff) | |
| download | kernel_samsung_smdk4412-3b091cd4941912081730ffa17948da6d148c822d.zip kernel_samsung_smdk4412-3b091cd4941912081730ffa17948da6d148c822d.tar.gz kernel_samsung_smdk4412-3b091cd4941912081730ffa17948da6d148c822d.tar.bz2 | |
mac80211: move comment to better location
Signed-off-by: Luis Carlos Cobo <luisca@cozybit.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | net/mac80211/mesh.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 9de1ccc..54d5ced 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -48,11 +48,6 @@ bool mesh_matches_local(struct ieee802_11_elems *ie, struct net_device *dev) struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ieee80211_if_sta *sta = &sdata->u.sta; - if (sta->mesh_id_len == ie->mesh_id_len && - memcmp(sta->mesh_id, ie->mesh_id, ie->mesh_id_len) == 0 && - memcmp(sta->mesh_pp_id, ie->mesh_config + PP_OFFSET, 4) == 0 && - memcmp(sta->mesh_pm_id, ie->mesh_config + PM_OFFSET, 4) == 0 && - memcmp(sta->mesh_cc_id, ie->mesh_config + CC_OFFSET, 4) == 0) /* * As support for each feature is added, check for matching * - On mesh config capabilities @@ -63,6 +58,11 @@ bool mesh_matches_local(struct ieee802_11_elems *ie, struct net_device *dev) * - MDA enabled * - Power management control on fc */ + if (sta->mesh_id_len == ie->mesh_id_len && + memcmp(sta->mesh_id, ie->mesh_id, ie->mesh_id_len) == 0 && + memcmp(sta->mesh_pp_id, ie->mesh_config + PP_OFFSET, 4) == 0 && + memcmp(sta->mesh_pm_id, ie->mesh_config + PM_OFFSET, 4) == 0 && + memcmp(sta->mesh_cc_id, ie->mesh_config + CC_OFFSET, 4) == 0) return true; return false; |