OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 17... Line 17...
17 Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com> 17 Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
18 Tested-by: Simon Wunderlich <simon.wunderlich@openmesh.com> 18 Tested-by: Simon Wunderlich <simon.wunderlich@openmesh.com>
Line 19... Line 19...
19   19  
20 --- a/src/drivers/driver.h 20 --- a/src/drivers/driver.h
21 +++ b/src/drivers/driver.h 21 +++ b/src/drivers/driver.h
22 @@ -1409,6 +1409,7 @@ struct wpa_driver_mesh_join_params { 22 @@ -1397,6 +1397,7 @@ struct wpa_driver_mesh_join_params {
23 #define WPA_DRIVER_MESH_FLAG_AMPE 0x00000008 23 #define WPA_DRIVER_MESH_FLAG_AMPE 0x00000008
24 unsigned int flags; 24 unsigned int flags;
25 u8 handle_dfs; 25 u8 handle_dfs;
26 + int mcast_rate; 26 + int mcast_rate;
Line 27... Line 27...
27 }; 27 };
28 28
29 /** 29 /**
30 --- a/src/drivers/driver_nl80211.c 30 --- a/src/drivers/driver_nl80211.c
31 +++ b/src/drivers/driver_nl80211.c 31 +++ b/src/drivers/driver_nl80211.c
Line 32... Line 32...
32 @@ -9352,6 +9352,18 @@ static int nl80211_put_mesh_id(struct nl 32 @@ -9217,6 +9217,18 @@ static int nl80211_put_mesh_id(struct nl
33 } 33 }
Line 46... Line 46...
46 + 46 +
47 + 47 +
48 static int nl80211_put_mesh_config(struct nl_msg *msg, 48 static int nl80211_put_mesh_config(struct nl_msg *msg,
49 struct wpa_driver_mesh_bss_params *params) 49 struct wpa_driver_mesh_bss_params *params)
50 { 50 {
51 @@ -9413,6 +9425,7 @@ static int nl80211_join_mesh(struct i802 51 @@ -9278,6 +9290,7 @@ static int nl80211_join_mesh(struct i802
52 nl80211_put_basic_rates(msg, params->basic_rates) || 52 nl80211_put_basic_rates(msg, params->basic_rates) ||
53 nl80211_put_mesh_id(msg, params->meshid, params->meshid_len) || 53 nl80211_put_mesh_id(msg, params->meshid, params->meshid_len) ||
54 nl80211_put_beacon_int(msg, params->beacon_int) || 54 nl80211_put_beacon_int(msg, params->beacon_int) ||
55 + nl80211_put_mcast_rate(msg, params->mcast_rate) || 55 + nl80211_put_mcast_rate(msg, params->mcast_rate) ||
56 nl80211_put_dtim_period(msg, params->dtim_period)) 56 nl80211_put_dtim_period(msg, params->dtim_period))
57 goto fail; 57 goto fail;
Line 58... Line 58...
58 58
59 --- a/wpa_supplicant/mesh.c 59 --- a/wpa_supplicant/mesh.c
60 +++ b/wpa_supplicant/mesh.c 60 +++ b/wpa_supplicant/mesh.c
Line 61... Line 61...
61 @@ -482,6 +482,7 @@ int wpa_supplicant_join_mesh(struct wpa_ 61 @@ -456,6 +456,7 @@ int wpa_supplicant_join_mesh(struct wpa_
62 62
63 params->meshid = ssid->ssid; 63 params->meshid = ssid->ssid;
64 params->meshid_len = ssid->ssid_len; 64 params->meshid_len = ssid->ssid_len;