提交 ef81e8e9 编写于 作者: I Igor Mitsyanko 提交者: Kalle Valo

qtnfmac: do not cache current channel info in driver's state

Linux Wireless device structure already has current channel
information that can be used when needed. Start using it.
Since driver's channel info is not used anymore, remove it.
Signed-off-by: NIgor Mitsyanko <igor.mitsyanko.os@quantenna.com>
Signed-off-by: NKalle Valo <kvalo@codeaurora.org>
上级 d23d1361
...@@ -630,15 +630,15 @@ qtnf_dump_survey(struct wiphy *wiphy, struct net_device *dev, ...@@ -630,15 +630,15 @@ qtnf_dump_survey(struct wiphy *wiphy, struct net_device *dev,
int idx, struct survey_info *survey) int idx, struct survey_info *survey)
{ {
struct qtnf_wmac *mac = wiphy_priv(wiphy); struct qtnf_wmac *mac = wiphy_priv(wiphy);
struct wireless_dev *wdev = dev->ieee80211_ptr;
struct ieee80211_supported_band *sband; struct ieee80211_supported_band *sband;
struct cfg80211_chan_def *chandef; const struct cfg80211_chan_def *chandef = &wdev->chandef;
struct ieee80211_channel *chan; struct ieee80211_channel *chan;
struct qtnf_chan_stats stats; struct qtnf_chan_stats stats;
struct qtnf_vif *vif; struct qtnf_vif *vif;
int ret; int ret;
vif = qtnf_netdev_get_priv(dev); vif = qtnf_netdev_get_priv(dev);
chandef = &mac->chandef;
sband = wiphy->bands[NL80211_BAND_2GHZ]; sband = wiphy->bands[NL80211_BAND_2GHZ];
if (sband && idx >= sband->n_channels) { if (sband && idx >= sband->n_channels) {
...@@ -705,7 +705,6 @@ static int ...@@ -705,7 +705,6 @@ static int
qtnf_get_channel(struct wiphy *wiphy, struct wireless_dev *wdev, qtnf_get_channel(struct wiphy *wiphy, struct wireless_dev *wdev,
struct cfg80211_chan_def *chandef) struct cfg80211_chan_def *chandef)
{ {
struct qtnf_wmac *mac = wiphy_priv(wiphy);
struct net_device *ndev = wdev->netdev; struct net_device *ndev = wdev->netdev;
struct qtnf_vif *vif; struct qtnf_vif *vif;
int ret; int ret;
...@@ -728,8 +727,6 @@ qtnf_get_channel(struct wiphy *wiphy, struct wireless_dev *wdev, ...@@ -728,8 +727,6 @@ qtnf_get_channel(struct wiphy *wiphy, struct wireless_dev *wdev,
ret = -ENODATA; ret = -ENODATA;
} }
memcpy(&mac->chandef, chandef, sizeof(mac->chandef));
out: out:
return ret; return ret;
} }
......
...@@ -126,7 +126,6 @@ struct qtnf_wmac { ...@@ -126,7 +126,6 @@ struct qtnf_wmac {
struct qtnf_mac_info macinfo; struct qtnf_mac_info macinfo;
struct qtnf_vif iflist[QTNF_MAX_INTF]; struct qtnf_vif iflist[QTNF_MAX_INTF];
struct cfg80211_scan_request *scan_req; struct cfg80211_scan_request *scan_req;
struct cfg80211_chan_def chandef;
struct mutex mac_lock; /* lock during wmac speicific ops */ struct mutex mac_lock; /* lock during wmac speicific ops */
struct timer_list scan_timeout; struct timer_list scan_timeout;
}; };
......
...@@ -372,8 +372,6 @@ qtnf_event_handle_freq_change(struct qtnf_wmac *mac, ...@@ -372,8 +372,6 @@ qtnf_event_handle_freq_change(struct qtnf_wmac *mac,
mac->macid, chandef.chan->hw_value, chandef.center_freq1, mac->macid, chandef.chan->hw_value, chandef.center_freq1,
chandef.center_freq2, chandef.width); chandef.center_freq2, chandef.width);
memcpy(&mac->chandef, &chandef, sizeof(mac->chandef));
for (i = 0; i < QTNF_MAX_INTF; i++) { for (i = 0; i < QTNF_MAX_INTF; i++) {
vif = &mac->iflist[i]; vif = &mac->iflist[i];
if (vif->wdev.iftype == NL80211_IFTYPE_UNSPECIFIED) if (vif->wdev.iftype == NL80211_IFTYPE_UNSPECIFIED)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册