Home Explore Help
Register Sign In
XCAppCollection
/
XCVMKit-OS
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Branch: master
Branches Tags
XCVMKit-OS
/
package
/
wilc-driver
/
0004-Fix-struct-station_parameters-Linux-6.1-build-failur.patch

0004-Fix-struct-station_parameters-Linux-6.1-build-failur.patch 8.5 KB
Permalink History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216 
  1. From 5f022c4d3be32493d500be82f51032ef4fb3cdc0 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Giulio Benetti <giulio.benetti@benettiengineering.com>
    3. 

  3. Date: Wed, 28 Dec 2022 21:08:45 +0100
    4. 

  4. Subject: [PATCH] Fix struct station_parameters Linux 6.1 build failure
    5. 

  5. 

  6. Starting from Linux 6.1 struct station_parameters has changed by moving
    7. 

  7. some member to its child struct link_station_parameters. Let's extract the
    8. 

  8. values of the needed members into local values at the beginning of
    9. 

  9. functions and substitute the member access with the local variables.
    10. 

  10. 

  11. [Upstream status: https://github.com/embeddedTS/wilc3000-external-module/pull/2]
    12. 

  12. Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
    13. 

  13. ---
    14. 

  14.  cfg80211.c | 48 ++++++++++++++++++++++++++++++++----------------
    15. 

  15.  hif.c      | 44 ++++++++++++++++++++++++++++++++------------
    16. 

  16.  2 files changed, 64 insertions(+), 28 deletions(-)
    17. 

  17. 

  18. diff --git a/cfg80211.c b/cfg80211.c
    19. 

  19. index 57c777d..bdd480c 100644
    20. 

  20. --- a/cfg80211.c
    21. 

  21. +++ b/cfg80211.c
    22. 

  22. @@ -1866,6 +1866,14 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev,
    23. 

  23.  	struct wilc_vif *vif = netdev_priv(dev);
    24. 

  24.  	struct wilc_priv *priv = &vif->priv;
    25. 

  25.  	u8 *assoc_bss = priv->assoc_stainfo.sta_associated_bss[params->aid];
    26. 

  26. +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
    27. 

  27. +	struct link_station_parameters *link_sta_params = &params->link_sta_params;
    28. 

  28. +	const struct ieee80211_ht_cap *ht_capa = link_sta_params->ht_capa;
    29. 

  29. +	u8 supported_rates_len = link_sta_params->supported_rates_len;
    30. 

  30. +#else
    31. 

  31. +	const struct ieee80211_ht_cap *ht_capa = params->ht_capa;
    32. 

  32. +	u8 supported_rates_len = params->supported_rates_len;
    33. 

  33. +#endif
    34. 

  34.  
    35. 

  35.  	if (vif->iftype == WILC_AP_MODE || vif->iftype == WILC_GO_MODE) {
    36. 

  36.  		memcpy(assoc_bss, mac, ETH_ALEN);
    37. 

  37. @@ -1879,27 +1887,27 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev,
    38. 

  38.  			   params->aid);
    39. 

  39.  		PRINT_INFO(vif->ndev, HOSTAPD_DBG,
    40. 

  40.  			   "Number of supported rates = %d\n",
    41. 

  41. -			   params->supported_rates_len);
    42. 

  42. +			   supported_rates_len);
    43. 

  43.  
    44. 

  44.  		PRINT_INFO(vif->ndev, CFG80211_DBG, "IS HT supported = %d\n",
    45. 

  45. -			   (!params->ht_capa) ? false : true);
    46. 

  46. +			   (!ht_capa) ? false : true);
    47. 

  47.  
    48. 

  48. -		if (params->ht_capa) {
    49. 

  49. +		if (ht_capa) {
    50. 

  50.  			PRINT_INFO(vif->ndev, CFG80211_DBG,
    51. 

  51.  				   "Capability Info = %d\n",
    52. 

  52. -				   params->ht_capa->cap_info);
    53. 

  53. +				   ht_capa->cap_info);
    54. 

  54.  			PRINT_INFO(vif->ndev, CFG80211_DBG,
    55. 

  55.  				   "AMPDU Params = %d\n",
    56. 

  56. -				   params->ht_capa->ampdu_params_info);
    57. 

  57. +				   ht_capa->ampdu_params_info);
    58. 

  58.  			PRINT_INFO(vif->ndev, CFG80211_DBG,
    59. 

  59.  				   "HT Extended params= %d\n",
    60. 

  60. -				   params->ht_capa->extended_ht_cap_info);
    61. 

  61. +				   ht_capa->extended_ht_cap_info);
    62. 

  62.  			PRINT_INFO(vif->ndev, CFG80211_DBG,
    63. 

  63.  				   "Tx Beamforming Cap= %d\n",
    64. 

  64. -				   params->ht_capa->tx_BF_cap_info);
    65. 

  65. +				   ht_capa->tx_BF_cap_info);
    66. 

  66.  			PRINT_INFO(vif->ndev, CFG80211_DBG,
    67. 

  67.  				   "Antenna selection info = %d\n",
    68. 

  68. -				   params->ht_capa->antenna_selection_info);
    69. 

  69. +				   ht_capa->antenna_selection_info);
    70. 

  70.  		}
    71. 

  71.  
    72. 

  72.  		PRINT_INFO(vif->ndev, CFG80211_DBG, "Flag Mask = %d\n",
    73. 

  73. @@ -1966,6 +1974,14 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev,
    74. 

  74.  {
    75. 

  75.  	int ret = 0;
    76. 

  76.  	struct wilc_vif *vif = netdev_priv(dev);
    77. 

  77. +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
    78. 

  78. +	struct link_station_parameters *link_sta_params = &params->link_sta_params;
    79. 

  79. +	const struct ieee80211_ht_cap *ht_capa = link_sta_params->ht_capa;
    80. 

  80. +	u8 supported_rates_len = link_sta_params->supported_rates_len;
    81. 

  81. +#else
    82. 

  82. +	const struct ieee80211_ht_cap *ht_capa = params->ht_capa;
    83. 

  83. +	u8 supported_rates_len = params->supported_rates_len;
    84. 

  84. +#endif
    85. 

  85.  
    86. 

  86.  	PRINT_D(vif->ndev, CFG80211_DBG, "Change station parameters\n");
    87. 

  87.  
    88. 

  88. @@ -1976,25 +1992,25 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev,
    89. 

  89.  			   params->aid);
    90. 

  90.  		PRINT_INFO(vif->ndev, CFG80211_DBG,
    91. 

  91.  			   "Number of supported rates = %d\n",
    92. 

  92. -			   params->supported_rates_len);
    93. 

  93. +			   supported_rates_len);
    94. 

  94.  		PRINT_INFO(vif->ndev, CFG80211_DBG, "IS HT supported = %d\n",
    95. 

  95. -			   (!params->ht_capa) ? false : true);
    96. 

  96. -		if (params->ht_capa) {
    97. 

  97. +			   (!ht_capa) ? false : true);
    98. 

  98. +		if (ht_capa) {
    99. 

  99.  			PRINT_INFO(vif->ndev, CFG80211_DBG,
    100. 

  100.  				   "Capability Info = %d\n",
    101. 

  101. -				   params->ht_capa->cap_info);
    102. 

  102. +				   ht_capa->cap_info);
    103. 

  103.  			PRINT_INFO(vif->ndev, CFG80211_DBG,
    104. 

  104.  				   "AMPDU Params = %d\n",
    105. 

  105. -				   params->ht_capa->ampdu_params_info);
    106. 

  106. +				   ht_capa->ampdu_params_info);
    107. 

  107.  			PRINT_INFO(vif->ndev, CFG80211_DBG,
    108. 

  108.  				   "HT Extended params= %d\n",
    109. 

  109. -				   params->ht_capa->extended_ht_cap_info);
    110. 

  110. +				   ht_capa->extended_ht_cap_info);
    111. 

  111.  			PRINT_INFO(vif->ndev, CFG80211_DBG,
    112. 

  112.  				   "Tx Beamforming Cap= %d\n",
    113. 

  113. -				   params->ht_capa->tx_BF_cap_info);
    114. 

  114. +				   ht_capa->tx_BF_cap_info);
    115. 

  115.  			PRINT_INFO(vif->ndev, CFG80211_DBG,
    116. 

  116.  				   "Antenna selection info = %d\n",
    117. 

  117. -				   params->ht_capa->antenna_selection_info);
    118. 

  118. +				   ht_capa->antenna_selection_info);
    119. 

  119.  		}
    120. 

  120.  		PRINT_INFO(vif->ndev, CFG80211_DBG, "Flag Mask = %d\n",
    121. 

  121.  			   params->sta_flags_mask);
    122. 

  122. diff --git a/hif.c b/hif.c
    123. 

  123. index 3f672a0..1a7365b 100644
    124. 

  124. --- a/hif.c
    125. 

  125. +++ b/hif.c
    126. 

  126. @@ -2249,6 +2249,16 @@ int wilc_add_station(struct wilc_vif *vif, const u8 *mac,
    127. 

  127.  	int result;
    128. 

  128.  	struct host_if_msg *msg;
    129. 

  129.  	struct add_sta_param *sta_params;
    130. 

  130. +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
    131. 

  131. +	struct link_station_parameters *link_sta_params = &params->link_sta_params;
    132. 

  132. +	const struct ieee80211_ht_cap *ht_capa = link_sta_params->ht_capa;
    133. 

  133. +	u8 supported_rates_len = link_sta_params->supported_rates_len;
    134. 

  134. +	const u8 *supported_rates = link_sta_params->supported_rates;
    135. 

  135. +#else
    136. 

  136. +	const struct ieee80211_ht_cap *ht_capa = params->ht_capa;
    137. 

  137. +	u8 supported_rates_len = params->supported_rates_len;
    138. 

  138. +	const u8 *supported_rates = params->supported_rates;
    139. 

  139. +#endif
    140. 

  140.  
    141. 

  141.  	PRINT_INFO(vif->ndev, HOSTINF_DBG,
    142. 

  142.  		   "Setting adding station message queue params\n");
    143. 

  143. @@ -2260,20 +2270,20 @@ int wilc_add_station(struct wilc_vif *vif, const u8 *mac,
    144. 

  144.  	sta_params = &msg->body.add_sta_info;
    145. 

  145.  	memcpy(sta_params->bssid, mac, ETH_ALEN);
    146. 

  146.  	sta_params->aid = params->aid;
    147. 

  147. -	if (!params->ht_capa) {
    148. 

  148. +	if (!ht_capa) {
    149. 

  149.  		sta_params->ht_supported = false;
    150. 

  150.  	} else {
    151. 

  151.  		sta_params->ht_supported = true;
    152. 

  152. -		memcpy(&sta_params->ht_capa, params->ht_capa,
    153. 

  153. +		memcpy(&sta_params->ht_capa, ht_capa,
    154. 

  154.  		       sizeof(struct ieee80211_ht_cap));
    155. 

  155.  	}
    156. 

  156.  	sta_params->flags_mask = params->sta_flags_mask;
    157. 

  157.  	sta_params->flags_set = params->sta_flags_set;
    158. 

  158.  
    159. 

  159. -	sta_params->supported_rates_len = params->supported_rates_len;
    160. 

  160. -	if (params->supported_rates_len > 0) {
    161. 

  161. -		sta_params->supported_rates = kmemdup(params->supported_rates,
    162. 

  162. -					    params->supported_rates_len,
    163. 

  163. +	sta_params->supported_rates_len = supported_rates_len;
    164. 

  164. +	if (supported_rates_len > 0) {
    165. 

  165. +		sta_params->supported_rates = kmemdup(supported_rates,
    166. 

  166. +					    supported_rates_len,
    167. 

  167.  					    GFP_KERNEL);
    168. 

  168.  		if (!sta_params->supported_rates) {
    169. 

  169.  			kfree(msg);
    170. 

  170. @@ -2397,6 +2407,16 @@ int wilc_edit_station(struct wilc_vif *vif, const u8 *mac,
    171. 

  171.  	int result;
    172. 

  172.  	struct host_if_msg *msg;
    173. 

  173.  	struct add_sta_param *sta_params;
    174. 

  174. +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
    175. 

  175. +	struct link_station_parameters *link_sta_params = &params->link_sta_params;
    176. 

  176. +	const struct ieee80211_ht_cap *ht_capa = link_sta_params->ht_capa;
    177. 

  177. +	u8 supported_rates_len = link_sta_params->supported_rates_len;
    178. 

  178. +	const u8 *supported_rates = link_sta_params->supported_rates;
    179. 

  179. +#else
    180. 

  180. +	const struct ieee80211_ht_cap *ht_capa = params->ht_capa;
    181. 

  181. +	u8 supported_rates_len = params->supported_rates_len;
    182. 

  182. +	const u8 *supported_rates = params->supported_rates;
    183. 

  183. +#endif
    184. 

  184.  
    185. 

  185.  	PRINT_INFO(vif->ndev, HOSTINF_DBG,
    186. 

  186.  		   "Setting editing station message queue params\n");
    187. 

  187. @@ -2408,20 +2428,20 @@ int wilc_edit_station(struct wilc_vif *vif, const u8 *mac,
    188. 

  188.  	sta_params = &msg->body.edit_sta_info;
    189. 

  189.  	memcpy(sta_params->bssid, mac, ETH_ALEN);
    190. 

  190.  	sta_params->aid = params->aid;
    191. 

  191. -	if (!params->ht_capa) {
    192. 

  192. +	if (!ht_capa) {
    193. 

  193.  		sta_params->ht_supported = false;
    194. 

  194.  	} else {
    195. 

  195.  		sta_params->ht_supported = true;
    196. 

  196. -		memcpy(&sta_params->ht_capa, params->ht_capa,
    197. 

  197. +		memcpy(&sta_params->ht_capa, ht_capa,
    198. 

  198.  		       sizeof(struct ieee80211_ht_cap));
    199. 

  199.  	}
    200. 

  200.  	sta_params->flags_mask = params->sta_flags_mask;
    201. 

  201.  	sta_params->flags_set = params->sta_flags_set;
    202. 

  202.  
    203. 

  203. -	sta_params->supported_rates_len = params->supported_rates_len;
    204. 

  204. -	if (params->supported_rates_len > 0) {
    205. 

  205. -		sta_params->supported_rates = kmemdup(params->supported_rates,
    206. 

  206. -					    params->supported_rates_len,
    207. 

  207. +	sta_params->supported_rates_len = supported_rates_len;
    208. 

  208. +	if (supported_rates_len > 0) {
    209. 

  209. +		sta_params->supported_rates = kmemdup(supported_rates,
    210. 

  210. +					    supported_rates_len,
    211. 

  211.  					    GFP_KERNEL);
    212. 

  212.  		if (!sta_params->supported_rates) {
    213. 

  213.  			kfree(msg);
    214. 

  214. -- 
    215. 

  215. 2.34.1
    216. 

  216.