Skip to content

L
linux
Commit ecad5e1e authored by Quytelda Kahja's avatar Quytelda Kahja Committed by Greg Kroah-Hartman
Browse files
Options

staging: ks7010: Factor out repeated code into function 'ks_wlan_cap()'. 

The code that generates a WLAN capability mask is repeated in five
functions.  This change refactors that code into a new function, which is
called now in each of those functions.
Signed-off-by: default avatarQuytelda Kahja <quytelda@tamalin.org>
Reviewed-by: default avatarTobin C. Harding <me@tobin.cc>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 15b6d73e
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 65 deletions
drivers/staging/ks7010/ks_hostif.c
View file @ ecad5e1e
...@@ -1381,11 +1381,28 @@ void hostif_start_request(struct ks_wlan_private *priv, unsigned char mode) ...@@ -1381,11 +1381,28 @@ void hostif_start_request(struct ks_wlan_private *priv, unsigned char mode)
priv->scan_ind_count = 0; priv->scan_ind_count = 0;
} }
static __le16 ks_wlan_cap(struct ks_wlan_private *priv)
{
u16 capability = 0x0000;
if (priv->reg.preamble == SHORT_PREAMBLE) {
capability |= BSS_CAP_SHORT_PREAMBLE;
}
capability &= ~(BSS_CAP_PBCC); /* pbcc not support */
if (priv->reg.phy_type != D_11B_ONLY_MODE) {
capability |= BSS_CAP_SHORT_SLOT_TIME;
capability &= ~(BSS_CAP_DSSS_OFDM);
}
return cpu_to_le16((uint16_t)capability);
}
static static
void hostif_ps_adhoc_set_request(struct ks_wlan_private *priv) void hostif_ps_adhoc_set_request(struct ks_wlan_private *priv)
{ {
struct hostif_ps_adhoc_set_request_t *pp; struct hostif_ps_adhoc_set_request_t *pp;
u16 capability;
DPRINTK(3, "\n"); DPRINTK(3, "\n");
...@@ -1398,21 +1415,10 @@ void hostif_ps_adhoc_set_request(struct ks_wlan_private *priv) ...@@ -1398,21 +1415,10 @@ void hostif_ps_adhoc_set_request(struct ks_wlan_private *priv)
pp->scan_type = cpu_to_le16((uint16_t)(priv->reg.scan_type)); pp->scan_type = cpu_to_le16((uint16_t)(priv->reg.scan_type));
pp->channel = cpu_to_le16((uint16_t)(priv->reg.channel)); pp->channel = cpu_to_le16((uint16_t)(priv->reg.channel));
pp->rate_set.size = priv->reg.rate_set.size; pp->rate_set.size = priv->reg.rate_set.size;
pp->capability = ks_wlan_cap(priv);
memcpy(&pp->rate_set.body[0], &priv->reg.rate_set.body[0], memcpy(&pp->rate_set.body[0], &priv->reg.rate_set.body[0],
priv->reg.rate_set.size); priv->reg.rate_set.size);
capability = 0x0000;
if (priv->reg.preamble == SHORT_PREAMBLE) {
/* short preamble */
capability |= BSS_CAP_SHORT_PREAMBLE;
}
capability &= ~(BSS_CAP_PBCC); /* pbcc not support */
if (priv->reg.phy_type != D_11B_ONLY_MODE) {
capability |= BSS_CAP_SHORT_SLOT_TIME; /* ShortSlotTime support */
capability &= ~(BSS_CAP_DSSS_OFDM); /* DSSS OFDM */
}
pp->capability = cpu_to_le16((uint16_t)capability);
/* send to device request */ /* send to device request */
ps_confirm_wait_inc(priv); ps_confirm_wait_inc(priv);
ks_wlan_hw_tx(priv, pp, hif_align_size(sizeof(*pp)), NULL, NULL); ks_wlan_hw_tx(priv, pp, hif_align_size(sizeof(*pp)), NULL, NULL);
...@@ -1422,7 +1428,6 @@ static ...@@ -1422,7 +1428,6 @@ static
void hostif_infrastructure_set_request(struct ks_wlan_private *priv) void hostif_infrastructure_set_request(struct ks_wlan_private *priv)
{ {
struct hostif_infrastructure_set_request_t *pp; struct hostif_infrastructure_set_request_t *pp;
u16 capability;
DPRINTK(3, "ssid.size=%d\n", priv->reg.ssid.size); DPRINTK(3, "ssid.size=%d\n", priv->reg.ssid.size);
...@@ -1439,18 +1444,7 @@ void hostif_infrastructure_set_request(struct ks_wlan_private *priv) ...@@ -1439,18 +1444,7 @@ void hostif_infrastructure_set_request(struct ks_wlan_private *priv)
priv->reg.rate_set.size); priv->reg.rate_set.size);
pp->ssid.size = priv->reg.ssid.size; pp->ssid.size = priv->reg.ssid.size;
memcpy(&pp->ssid.body[0], &priv->reg.ssid.body[0], priv->reg.ssid.size); memcpy(&pp->ssid.body[0], &priv->reg.ssid.body[0], priv->reg.ssid.size);
pp->capability = ks_wlan_cap(priv);
capability = 0x0000;
if (priv->reg.preamble == SHORT_PREAMBLE) {
/* short preamble */
capability |= BSS_CAP_SHORT_PREAMBLE;
}
capability &= ~(BSS_CAP_PBCC); /* pbcc not support */
if (priv->reg.phy_type != D_11B_ONLY_MODE) {
capability |= BSS_CAP_SHORT_SLOT_TIME; /* ShortSlotTime support */
capability &= ~(BSS_CAP_DSSS_OFDM); /* DSSS OFDM not support */
}
pp->capability = cpu_to_le16((uint16_t)capability);
pp->beacon_lost_count = pp->beacon_lost_count =
cpu_to_le16((uint16_t)(priv->reg.beacon_lost_count)); cpu_to_le16((uint16_t)(priv->reg.beacon_lost_count));
pp->auth_type = cpu_to_le16((uint16_t)(priv->reg.authenticate_type)); pp->auth_type = cpu_to_le16((uint16_t)(priv->reg.authenticate_type));
...@@ -1483,7 +1477,6 @@ void hostif_infrastructure_set_request(struct ks_wlan_private *priv) ...@@ -1483,7 +1477,6 @@ void hostif_infrastructure_set_request(struct ks_wlan_private *priv)
static void hostif_infrastructure_set2_request(struct ks_wlan_private *priv) static void hostif_infrastructure_set2_request(struct ks_wlan_private *priv)
{ {
struct hostif_infrastructure_set2_request_t *pp; struct hostif_infrastructure_set2_request_t *pp;
u16 capability;
DPRINTK(2, "ssid.size=%d\n", priv->reg.ssid.size); DPRINTK(2, "ssid.size=%d\n", priv->reg.ssid.size);
...@@ -1500,18 +1493,7 @@ static void hostif_infrastructure_set2_request(struct ks_wlan_private *priv) ...@@ -1500,18 +1493,7 @@ static void hostif_infrastructure_set2_request(struct ks_wlan_private *priv)
priv->reg.rate_set.size); priv->reg.rate_set.size);
pp->ssid.size = priv->reg.ssid.size; pp->ssid.size = priv->reg.ssid.size;
memcpy(&pp->ssid.body[0], &priv->reg.ssid.body[0], priv->reg.ssid.size); memcpy(&pp->ssid.body[0], &priv->reg.ssid.body[0], priv->reg.ssid.size);
pp->capability = ks_wlan_cap(priv);
capability = 0x0000;
if (priv->reg.preamble == SHORT_PREAMBLE) {
/* short preamble */
capability |= BSS_CAP_SHORT_PREAMBLE;
}
capability &= ~(BSS_CAP_PBCC); /* pbcc not support */
if (priv->reg.phy_type != D_11B_ONLY_MODE) {
capability |= BSS_CAP_SHORT_SLOT_TIME; /* ShortSlotTime support */
capability &= ~(BSS_CAP_DSSS_OFDM); /* DSSS OFDM not support */
}
pp->capability = cpu_to_le16((uint16_t)capability);
pp->beacon_lost_count = pp->beacon_lost_count =
cpu_to_le16((uint16_t)(priv->reg.beacon_lost_count)); cpu_to_le16((uint16_t)(priv->reg.beacon_lost_count));
pp->auth_type = cpu_to_le16((uint16_t)(priv->reg.authenticate_type)); pp->auth_type = cpu_to_le16((uint16_t)(priv->reg.authenticate_type));
...@@ -1547,7 +1529,6 @@ static ...@@ -1547,7 +1529,6 @@ static
void hostif_adhoc_set_request(struct ks_wlan_private *priv) void hostif_adhoc_set_request(struct ks_wlan_private *priv)
{ {
struct hostif_adhoc_set_request_t *pp; struct hostif_adhoc_set_request_t *pp;
u16 capability;
DPRINTK(3, "\n"); DPRINTK(3, "\n");
...@@ -1564,18 +1545,7 @@ void hostif_adhoc_set_request(struct ks_wlan_private *priv) ...@@ -1564,18 +1545,7 @@ void hostif_adhoc_set_request(struct ks_wlan_private *priv)
priv->reg.rate_set.size); priv->reg.rate_set.size);
pp->ssid.size = priv->reg.ssid.size; pp->ssid.size = priv->reg.ssid.size;
memcpy(&pp->ssid.body[0], &priv->reg.ssid.body[0], priv->reg.ssid.size); memcpy(&pp->ssid.body[0], &priv->reg.ssid.body[0], priv->reg.ssid.size);
pp->capability = ks_wlan_cap(priv);
capability = 0x0000;
if (priv->reg.preamble == SHORT_PREAMBLE) {
/* short preamble */
capability |= BSS_CAP_SHORT_PREAMBLE;
}
capability &= ~(BSS_CAP_PBCC); /* pbcc not support */
if (priv->reg.phy_type != D_11B_ONLY_MODE) {
capability |= BSS_CAP_SHORT_SLOT_TIME; /* ShortSlotTime support */
capability &= ~(BSS_CAP_DSSS_OFDM); /* DSSS OFDM not support */
}
pp->capability = cpu_to_le16((uint16_t)capability);
/* send to device request */ /* send to device request */
ps_confirm_wait_inc(priv); ps_confirm_wait_inc(priv);
...@@ -1586,7 +1556,6 @@ static ...@@ -1586,7 +1556,6 @@ static
void hostif_adhoc_set2_request(struct ks_wlan_private *priv) void hostif_adhoc_set2_request(struct ks_wlan_private *priv)
{ {
struct hostif_adhoc_set2_request_t *pp; struct hostif_adhoc_set2_request_t *pp;
u16 capability;
DPRINTK(3, "\n"); DPRINTK(3, "\n");
...@@ -1602,18 +1571,7 @@ void hostif_adhoc_set2_request(struct ks_wlan_private *priv) ...@@ -1602,18 +1571,7 @@ void hostif_adhoc_set2_request(struct ks_wlan_private *priv)
priv->reg.rate_set.size); priv->reg.rate_set.size);
pp->ssid.size = priv->reg.ssid.size; pp->ssid.size = priv->reg.ssid.size;
memcpy(&pp->ssid.body[0], &priv->reg.ssid.body[0], priv->reg.ssid.size); memcpy(&pp->ssid.body[0], &priv->reg.ssid.body[0], priv->reg.ssid.size);
pp->capability = ks_wlan_cap(priv);
capability = 0x0000;
if (priv->reg.preamble == SHORT_PREAMBLE) {
/* short preamble */
capability |= BSS_CAP_SHORT_PREAMBLE;
}
capability &= ~(BSS_CAP_PBCC); /* pbcc not support */
if (priv->reg.phy_type != D_11B_ONLY_MODE) {
capability |= BSS_CAP_SHORT_SLOT_TIME; /* ShortSlotTime support */
capability &= ~(BSS_CAP_DSSS_OFDM); /* DSSS OFDM not support */
}
pp->capability = cpu_to_le16((uint16_t)capability);
pp->channel_list.body[0] = priv->reg.channel; pp->channel_list.body[0] = priv->reg.channel;
pp->channel_list.size = 1; pp->channel_list.size = 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7