Skip to content

Commit

Permalink
qtnfmac: do not cache BSS state in per-VIF structure
Browse files Browse the repository at this point in the history 
This cached state is used only once immediately after it is
initilized, except for BSSID value that is used for events processing.
There is no reason in keeping unused data in driver's state.

Signed-off-by: Igor Mitsyanko <igor.mitsyanko.os@quantenna.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  • Loading branch information
Igor Mitsyanko authored and Kalle Valo committed Oct 13, 2017
1 parent d7b8005 commit 9766d1d
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 66 deletions.
40 changes: 7 additions & 33 deletions drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ int qtnf_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev)
vif->netdev = NULL;
vif->wdev.iftype = NL80211_IFTYPE_UNSPECIFIED;
eth_zero_addr(vif->mac_addr);
eth_zero_addr(vif->bssid);

return 0;
}
Expand Down Expand Up @@ -199,6 +200,8 @@ static struct wireless_dev *qtnf_add_virtual_intf(struct wiphy *wiphy,
qtnf_cmd_send_del_intf(vif);
err_cmd:
vif->wdev.iftype = NL80211_IFTYPE_UNSPECIFIED;
eth_zero_addr(vif->mac_addr);
eth_zero_addr(vif->bssid);

return ERR_PTR(-EFAULT);
}
Expand Down Expand Up @@ -567,7 +570,6 @@ qtnf_connect(struct wiphy *wiphy, struct net_device *dev,
struct cfg80211_connect_params *sme)
{
struct qtnf_vif *vif = qtnf_netdev_get_priv(dev);
struct qtnf_bss_config *bss_cfg;
int ret;

if (vif->wdev.iftype != NL80211_IFTYPE_STATION)
Expand All @@ -576,38 +578,10 @@ qtnf_connect(struct wiphy *wiphy, struct net_device *dev,
if (vif->sta_state != QTNF_STA_DISCONNECTED)
return -EBUSY;

bss_cfg = &vif->bss_cfg;
memset(bss_cfg, 0, sizeof(*bss_cfg));

bss_cfg->ssid_len = sme->ssid_len;
memcpy(&bss_cfg->ssid, sme->ssid, bss_cfg->ssid_len);
bss_cfg->auth_type = sme->auth_type;
bss_cfg->privacy = sme->privacy;
bss_cfg->mfp = sme->mfp;

if ((sme->bg_scan_period > 0) &&
(sme->bg_scan_period <= QTNF_MAX_BG_SCAN_PERIOD))
bss_cfg->bg_scan_period = sme->bg_scan_period;
else if (sme->bg_scan_period == -1)
bss_cfg->bg_scan_period = QTNF_DEFAULT_BG_SCAN_PERIOD;
else
bss_cfg->bg_scan_period = 0; /* disabled */

bss_cfg->connect_flags = 0;

if (sme->flags & ASSOC_REQ_DISABLE_HT)
bss_cfg->connect_flags |= QLINK_STA_CONNECT_DISABLE_HT;
if (sme->flags & ASSOC_REQ_DISABLE_VHT)
bss_cfg->connect_flags |= QLINK_STA_CONNECT_DISABLE_VHT;
if (sme->flags & ASSOC_REQ_USE_RRM)
bss_cfg->connect_flags |= QLINK_STA_CONNECT_USE_RRM;

memcpy(&bss_cfg->crypto, &sme->crypto, sizeof(bss_cfg->crypto));

if (sme->bssid)
ether_addr_copy(bss_cfg->bssid, sme->bssid);
ether_addr_copy(vif->bssid, sme->bssid);
else
eth_zero_addr(bss_cfg->bssid);
eth_zero_addr(vif->bssid);

ret = qtnf_cmd_send_connect(vif, sme);
if (ret) {
Expand Down Expand Up @@ -1021,7 +995,7 @@ void qtnf_virtual_intf_cleanup(struct net_device *ndev)
break;
case QTNF_STA_CONNECTING:
cfg80211_connect_result(vif->netdev,
vif->bss_cfg.bssid, NULL, 0,
vif->bssid, NULL, 0,
NULL, 0,
WLAN_STATUS_UNSPECIFIED_FAILURE,
GFP_KERNEL);
Expand All @@ -1048,7 +1022,7 @@ void qtnf_cfg80211_vif_reset(struct qtnf_vif *vif)
switch (vif->sta_state) {
case QTNF_STA_CONNECTING:
cfg80211_connect_result(vif->netdev,
vif->bss_cfg.bssid, NULL, 0,
vif->bssid, NULL, 0,
NULL, 0,
WLAN_STATUS_UNSPECIFIED_FAILURE,
GFP_KERNEL);
Expand Down
49 changes: 32 additions & 17 deletions drivers/net/wireless/quantenna/qtnfmac/commands.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2037,11 +2037,11 @@ int qtnf_cmd_send_connect(struct qtnf_vif *vif,
{
struct sk_buff *cmd_skb;
struct qlink_cmd_connect *cmd;
struct qtnf_bss_config *bss_cfg = &vif->bss_cfg;
struct qlink_auth_encr aen;
u16 res_code = QLINK_CMD_RESULT_OK;
int ret;
int i;
u32 connect_flags = 0;

cmd_skb = qtnf_cmd_alloc_new_cmdskb(vif->mac->macid, vif->vifid,
QLINK_CMD_CONNECT,
Expand All @@ -2053,42 +2053,57 @@ int qtnf_cmd_send_connect(struct qtnf_vif *vif,

cmd = (struct qlink_cmd_connect *)cmd_skb->data;

ether_addr_copy(cmd->bssid, bss_cfg->bssid);
ether_addr_copy(cmd->bssid, vif->bssid);

if (sme->channel)
cmd->channel = cpu_to_le16(sme->channel->hw_value);
else
cmd->channel = 0;

cmd->bg_scan_period = cpu_to_le16(bss_cfg->bg_scan_period);
if ((sme->bg_scan_period > 0) &&
(sme->bg_scan_period <= QTNF_MAX_BG_SCAN_PERIOD))
cmd->bg_scan_period = cpu_to_le16(sme->bg_scan_period);
else if (sme->bg_scan_period == -1)
cmd->bg_scan_period = cpu_to_le16(QTNF_DEFAULT_BG_SCAN_PERIOD);
else
cmd->bg_scan_period = 0; /* disabled */

if (sme->flags & ASSOC_REQ_DISABLE_HT)
connect_flags |= QLINK_STA_CONNECT_DISABLE_HT;
if (sme->flags & ASSOC_REQ_DISABLE_VHT)
connect_flags |= QLINK_STA_CONNECT_DISABLE_VHT;
if (sme->flags & ASSOC_REQ_USE_RRM)
connect_flags |= QLINK_STA_CONNECT_USE_RRM;

cmd->flags = cpu_to_le32(connect_flags);

memset(&aen, 0, sizeof(aen));
aen.auth_type = bss_cfg->auth_type;
aen.privacy = !!bss_cfg->privacy;
aen.mfp = bss_cfg->mfp;
aen.wpa_versions = cpu_to_le32(bss_cfg->crypto.wpa_versions);
aen.cipher_group = cpu_to_le32(bss_cfg->crypto.cipher_group);
aen.auth_type = sme->auth_type;
aen.privacy = !!sme->privacy;
aen.mfp = sme->mfp;
aen.wpa_versions = cpu_to_le32(sme->crypto.wpa_versions);
aen.cipher_group = cpu_to_le32(sme->crypto.cipher_group);
aen.n_ciphers_pairwise = cpu_to_le32(
bss_cfg->crypto.n_ciphers_pairwise);
sme->crypto.n_ciphers_pairwise);

for (i = 0; i < QLINK_MAX_NR_CIPHER_SUITES; i++)
aen.ciphers_pairwise[i] = cpu_to_le32(
bss_cfg->crypto.ciphers_pairwise[i]);
sme->crypto.ciphers_pairwise[i]);

aen.n_akm_suites = cpu_to_le32(bss_cfg->crypto.n_akm_suites);
aen.n_akm_suites = cpu_to_le32(sme->crypto.n_akm_suites);

for (i = 0; i < QLINK_MAX_NR_AKM_SUITES; i++)
aen.akm_suites[i] = cpu_to_le32(
bss_cfg->crypto.akm_suites[i]);
sme->crypto.akm_suites[i]);

aen.control_port = bss_cfg->crypto.control_port;
aen.control_port = sme->crypto.control_port;
aen.control_port_no_encrypt =
bss_cfg->crypto.control_port_no_encrypt;
sme->crypto.control_port_no_encrypt;
aen.control_port_ethertype = cpu_to_le16(be16_to_cpu(
bss_cfg->crypto.control_port_ethertype));
sme->crypto.control_port_ethertype));

qtnf_cmd_skb_put_tlv_arr(cmd_skb, WLAN_EID_SSID, bss_cfg->ssid,
bss_cfg->ssid_len);
qtnf_cmd_skb_put_tlv_arr(cmd_skb, WLAN_EID_SSID, sme->ssid,
sme->ssid_len);
qtnf_cmd_skb_put_tlv_arr(cmd_skb, QTN_TLV_ID_CRYPTO, (u8 *)&aen,
sizeof(aen));

Expand Down
19 changes: 3 additions & 16 deletions drivers/net/wireless/quantenna/qtnfmac/core.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,6 @@ extern const struct net_device_ops qtnf_netdev_ops;
struct qtnf_bus;
struct qtnf_vif;

struct qtnf_bss_config {
u8 ssid[IEEE80211_MAX_SSID_LEN];
u8 bssid[ETH_ALEN];
size_t ssid_len;
u8 dtim;
u16 bcn_period;
u16 auth_type;
bool privacy;
enum nl80211_mfp mfp;
struct cfg80211_crypto_settings crypto;
u16 bg_scan_period;
u32 connect_flags;
};

struct qtnf_sta_node {
struct list_head list;
u8 mac_addr[ETH_ALEN];
Expand All @@ -89,16 +75,17 @@ enum qtnf_sta_state {

struct qtnf_vif {
struct wireless_dev wdev;
u8 bssid[ETH_ALEN];
u8 mac_addr[ETH_ALEN];
u8 vifid;
u8 bss_priority;
u8 bss_status;
enum qtnf_sta_state sta_state;
u16 mgmt_frames_bitmask;
struct net_device *netdev;
struct qtnf_wmac *mac;
u8 mac_addr[ETH_ALEN];

struct work_struct reset_work;
struct qtnf_bss_config bss_cfg;
struct qtnf_sta_list sta_list;
unsigned long cons_tx_timeout_cnt;
};
Expand Down

0 comments on commit 9766d1d

Please sign in to comment.