diff options
author | Luis Carlos Cobo <luisca@cozybit.com> | 2008-02-29 15:20:39 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-03-06 16:40:49 -0500 |
commit | 3b091cd4941912081730ffa17948da6d148c822d (patch) | |
tree | a406fc67bab7790cf1ba412636080b70db694195 /net/mac80211/mesh.c | |
parent | 1d1b535969ca5572d87a6fcac49e1e1a31241b99 (diff) |
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>
Diffstat (limited to 'net/mac80211/mesh.c')
-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 9de1ccc11cf9..54d5ced566ef 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) | |||
48 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); | 48 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); |
49 | struct ieee80211_if_sta *sta = &sdata->u.sta; | 49 | struct ieee80211_if_sta *sta = &sdata->u.sta; |
50 | 50 | ||
51 | if (sta->mesh_id_len == ie->mesh_id_len && | ||
52 | memcmp(sta->mesh_id, ie->mesh_id, ie->mesh_id_len) == 0 && | ||
53 | memcmp(sta->mesh_pp_id, ie->mesh_config + PP_OFFSET, 4) == 0 && | ||
54 | memcmp(sta->mesh_pm_id, ie->mesh_config + PM_OFFSET, 4) == 0 && | ||
55 | memcmp(sta->mesh_cc_id, ie->mesh_config + CC_OFFSET, 4) == 0) | ||
56 | /* | 51 | /* |
57 | * As support for each feature is added, check for matching | 52 | * As support for each feature is added, check for matching |
58 | * - On mesh config capabilities | 53 | * - On mesh config capabilities |
@@ -63,6 +58,11 @@ bool mesh_matches_local(struct ieee802_11_elems *ie, struct net_device *dev) | |||
63 | * - MDA enabled | 58 | * - MDA enabled |
64 | * - Power management control on fc | 59 | * - Power management control on fc |
65 | */ | 60 | */ |
61 | if (sta->mesh_id_len == ie->mesh_id_len && | ||
62 | memcmp(sta->mesh_id, ie->mesh_id, ie->mesh_id_len) == 0 && | ||
63 | memcmp(sta->mesh_pp_id, ie->mesh_config + PP_OFFSET, 4) == 0 && | ||
64 | memcmp(sta->mesh_pm_id, ie->mesh_config + PM_OFFSET, 4) == 0 && | ||
65 | memcmp(sta->mesh_cc_id, ie->mesh_config + CC_OFFSET, 4) == 0) | ||
66 | return true; | 66 | return true; |
67 | 67 | ||
68 | return false; | 68 | return false; |