Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2afdac7 authored by Vasanthakumar Thiagarajan's avatar Vasanthakumar Thiagarajan Committed by Kalle Valo
Browse files

ath6kl: Group wiphy initialization into ath6kl_cfg80211_init() 



There are some code which initializes various wiphy members
left outside ath6kl_cfg80211_init(), in ath6kl_core_init().
Move them into a single palce.

Signed-off-by: default avatarVasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent faaf1929

drivers/net/wireless/ath/ath6kl/cfg80211.c

+14 −0
Original line number Diff line number Diff line
@@ -3077,6 +3077,20 @@ int ath6kl_cfg80211_init(struct ath6kl *ar) 


	wiphy->max_sched_scan_ssids = 10;



	ar->wiphy->flags |= WIPHY_FLAG_SUPPORTS_FW_ROAM |

			    WIPHY_FLAG_HAVE_AP_SME |

			    WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL |

			    WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD;



	if (test_bit(ATH6KL_FW_CAPABILITY_SCHED_SCAN, ar->fw_capabilities))

		ar->wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;



	ar->wiphy->probe_resp_offload =

		NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS |

		NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS2 |

		NL80211_PROBE_RESP_OFFLOAD_SUPPORT_P2P |

		NL80211_PROBE_RESP_OFFLOAD_SUPPORT_80211U;



	ret = wiphy_register(wiphy);

	if (ret < 0) {

		ath6kl_err("couldn't register wiphy device\n");

drivers/net/wireless/ath/ath6kl/core.c

+0 −14
Original line number Diff line number Diff line
@@ -154,20 +154,6 @@ int ath6kl_core_init(struct ath6kl *ar) 
	if (uart_debug)

		ar->conf_flags |= ATH6KL_CONF_UART_DEBUG;



	ar->wiphy->flags |= WIPHY_FLAG_SUPPORTS_FW_ROAM |

			    WIPHY_FLAG_HAVE_AP_SME |

			    WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL |

			    WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD;



	if (test_bit(ATH6KL_FW_CAPABILITY_SCHED_SCAN, ar->fw_capabilities))

		ar->wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;



	ar->wiphy->probe_resp_offload =

		NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS |

		NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS2 |

		NL80211_PROBE_RESP_OFFLOAD_SUPPORT_P2P |

		NL80211_PROBE_RESP_OFFLOAD_SUPPORT_80211U;



	set_bit(FIRST_BOOT, &ar->flag);



	ndev->hw_features |= NETIF_F_IP_CSUM | NETIF_F_RXCSUM;