luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mac80211: Fix incorrectly named last_hop_metric variable in mesh_rx_path_sel_frame

Browse Source 
The last hop metric should refer to link cost (this is how
hwmp_route_info_get uses it for example). But in mesh_rx_path_sel_frame
we are not dealing with link cost but with the total cost to the origin
of a PREQ or PREP.

Signed-off-by: Alexis Green <agreen@cococorp.com>
CC: Jesse Jones <jjones@cococorp.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Alexis Green 2015-06-05 12:43:54 -07:00 committed by Johannes Berg
parent 74d803b602
commit afd2efb919
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net/mac80211/mesh_hwmp.c
View File

@ -854,7 +854,7 @@ void mesh_rx_path_sel_frame(struct ieee80211_sub_if_data *sdata,
{
struct ieee802_11_elems elems;
size_t baselen;
u32 last_hop_metric;
u32 path_metric;
struct sta_info *sta;
/* need action_code */
@ -877,21 +877,21 @@ void mesh_rx_path_sel_frame(struct ieee80211_sub_if_data *sdata,
if (elems.preq_len != 37)
/* Right now we support just 1 destination and no AE */
return;
last_hop_metric = hwmp_route_info_get(sdata, mgmt, elems.preq,
MPATH_PREQ);
if (last_hop_metric)
path_metric = hwmp_route_info_get(sdata, mgmt, elems.preq,
MPATH_PREQ);
if (path_metric)
hwmp_preq_frame_process(sdata, mgmt, elems.preq,
last_hop_metric);
path_metric);
}
if (elems.prep) {
if (elems.prep_len != 31)
/* Right now we support no AE */
return;
last_hop_metric = hwmp_route_info_get(sdata, mgmt, elems.prep,
MPATH_PREP);
if (last_hop_metric)
path_metric = hwmp_route_info_get(sdata, mgmt, elems.prep,
MPATH_PREP);
if (path_metric)
hwmp_prep_frame_process(sdata, mgmt, elems.prep,
last_hop_metric);
path_metric);
}
if (elems.perr) {
if (elems.perr_len != 15)