Jakub Sitnicki <[email protected]> writes:
> Signed-off-by: Jakub Sitnicki <[email protected]>
> ---
> drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c | 95
> ++++++++++++------------
> drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 30 ++++----
> 2 files changed, 66 insertions(+), 59 deletions(-)
I don't really see this patch adding any value - it just adds an
additional layer of convolution. Unless there is a strong reason for
applying it, I am going to drop this one.
Jes
>
> diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
> b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
> index e1f8c62..d67c668 100644
> --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
> +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
> @@ -1490,6 +1490,7 @@ static void rtl8723au_config_channel(struct
> ieee80211_hw *hw)
> static void
> rtl8723a_set_tx_power(struct rtl8xxxu_priv *priv, int channel, bool ht40)
> {
> + struct rtl8723au_tx_power *tx_power = &priv->tx_power;
> u8 cck[RTL8723A_MAX_RF_PATHS], ofdm[RTL8723A_MAX_RF_PATHS];
> u8 ofdmbase[RTL8723A_MAX_RF_PATHS], mcsbase[RTL8723A_MAX_RF_PATHS];
> u32 val32, ofdm_a, ofdm_b, mcs_a, mcs_b;
> @@ -1498,27 +1499,27 @@ rtl8723a_set_tx_power(struct rtl8xxxu_priv *priv, int
> channel, bool ht40)
>
> group = rtl8723a_channel_to_group(channel);
>
> - cck[0] = priv->cck_tx_power_index_A[group];
> - cck[1] = priv->cck_tx_power_index_B[group];
> + cck[0] = tx_power->cck_tx_power_index_A[group];
> + cck[1] = tx_power->cck_tx_power_index_B[group];
>
> - ofdm[0] = priv->ht40_1s_tx_power_index_A[group];
> - ofdm[1] = priv->ht40_1s_tx_power_index_B[group];
> + ofdm[0] = tx_power->ht40_1s_tx_power_index_A[group];
> + ofdm[1] = tx_power->ht40_1s_tx_power_index_B[group];
>
> - ofdmbase[0] = ofdm[0] + priv->ofdm_tx_power_index_diff[group].a;
> - ofdmbase[1] = ofdm[1] + priv->ofdm_tx_power_index_diff[group].b;
> + ofdmbase[0] = ofdm[0] + tx_power->ofdm_tx_power_index_diff[group].a;
> + ofdmbase[1] = ofdm[1] + tx_power->ofdm_tx_power_index_diff[group].b;
>
> mcsbase[0] = ofdm[0];
> mcsbase[1] = ofdm[1];
> if (!ht40) {
> - mcsbase[0] += priv->ht20_tx_power_index_diff[group].a;
> - mcsbase[1] += priv->ht20_tx_power_index_diff[group].b;
> + mcsbase[0] += tx_power->ht20_tx_power_index_diff[group].a;
> + mcsbase[1] += tx_power->ht20_tx_power_index_diff[group].b;
> }
>
> if (priv->tx_paths > 1) {
> - if (ofdm[0] > priv->ht40_2s_tx_power_index_diff[group].a)
> - ofdm[0] -= priv->ht40_2s_tx_power_index_diff[group].a;
> - if (ofdm[1] > priv->ht40_2s_tx_power_index_diff[group].b)
> - ofdm[1] -= priv->ht40_2s_tx_power_index_diff[group].b;
> + if (ofdm[0] > tx_power->ht40_2s_tx_power_index_diff[group].a)
> + ofdm[0] -=
> tx_power->ht40_2s_tx_power_index_diff[group].a;
> + if (ofdm[1] > tx_power->ht40_2s_tx_power_index_diff[group].b)
> + ofdm[1] -=
> tx_power->ht40_2s_tx_power_index_diff[group].b;
> }
>
> if (rtl8xxxu_debug & RTL8XXXU_DEBUG_CHANNEL)
> @@ -1780,39 +1781,40 @@ static int rtl8xxxu_identify_chip(struct
> rtl8xxxu_priv *priv)
> static int rtl8723au_parse_efuse(struct rtl8xxxu_priv *priv)
> {
> struct rtl8723au_efuse *efuse = &priv->efuse_wifi.efuse8723;
> + struct rtl8723au_tx_power *tx_power = &priv->tx_power;
>
> if (efuse->rtl_id != cpu_to_le16(0x8129))
> return -EINVAL;
>
> ether_addr_copy(priv->mac_addr, efuse->mac_addr);
>
> - memcpy(priv->cck_tx_power_index_A,
> + memcpy(tx_power->cck_tx_power_index_A,
> efuse->cck_tx_power_index_A,
> - sizeof(priv->cck_tx_power_index_A));
> - memcpy(priv->cck_tx_power_index_B,
> + sizeof(tx_power->cck_tx_power_index_A));
> + memcpy(tx_power->cck_tx_power_index_B,
> efuse->cck_tx_power_index_B,
> - sizeof(priv->cck_tx_power_index_B));
> + sizeof(tx_power->cck_tx_power_index_B));
>
> - memcpy(priv->ht40_1s_tx_power_index_A,
> + memcpy(tx_power->ht40_1s_tx_power_index_A,
> efuse->ht40_1s_tx_power_index_A,
> - sizeof(priv->ht40_1s_tx_power_index_A));
> - memcpy(priv->ht40_1s_tx_power_index_B,
> + sizeof(tx_power->ht40_1s_tx_power_index_A));
> + memcpy(tx_power->ht40_1s_tx_power_index_B,
> efuse->ht40_1s_tx_power_index_B,
> - sizeof(priv->ht40_1s_tx_power_index_B));
> + sizeof(tx_power->ht40_1s_tx_power_index_B));
>
> - memcpy(priv->ht20_tx_power_index_diff,
> + memcpy(tx_power->ht20_tx_power_index_diff,
> efuse->ht20_tx_power_index_diff,
> - sizeof(priv->ht20_tx_power_index_diff));
> - memcpy(priv->ofdm_tx_power_index_diff,
> + sizeof(tx_power->ht20_tx_power_index_diff));
> + memcpy(tx_power->ofdm_tx_power_index_diff,
> efuse->ofdm_tx_power_index_diff,
> - sizeof(priv->ofdm_tx_power_index_diff));
> + sizeof(tx_power->ofdm_tx_power_index_diff));
>
> - memcpy(priv->ht40_max_power_offset,
> + memcpy(tx_power->ht40_max_power_offset,
> efuse->ht40_max_power_offset,
> - sizeof(priv->ht40_max_power_offset));
> - memcpy(priv->ht20_max_power_offset,
> + sizeof(tx_power->ht40_max_power_offset));
> + memcpy(tx_power->ht20_max_power_offset,
> efuse->ht20_max_power_offset,
> - sizeof(priv->ht20_max_power_offset));
> + sizeof(tx_power->ht20_max_power_offset));
>
> dev_info(&priv->udev->dev, "Vendor: %.7s\n",
> efuse->vendor_name);
> @@ -1824,6 +1826,7 @@ static int rtl8723au_parse_efuse(struct rtl8xxxu_priv
> *priv)
> static int rtl8192cu_parse_efuse(struct rtl8xxxu_priv *priv)
> {
> struct rtl8192cu_efuse *efuse = &priv->efuse_wifi.efuse8192;
> + struct rtl8723au_tx_power *tx_power = &priv->tx_power;
> int i;
>
> if (efuse->rtl_id != cpu_to_le16(0x8129))
> @@ -1831,36 +1834,36 @@ static int rtl8192cu_parse_efuse(struct rtl8xxxu_priv
> *priv)
>
> ether_addr_copy(priv->mac_addr, efuse->mac_addr);
>
> - memcpy(priv->cck_tx_power_index_A,
> + memcpy(tx_power->cck_tx_power_index_A,
> efuse->cck_tx_power_index_A,
> - sizeof(priv->cck_tx_power_index_A));
> - memcpy(priv->cck_tx_power_index_B,
> + sizeof(tx_power->cck_tx_power_index_A));
> + memcpy(tx_power->cck_tx_power_index_B,
> efuse->cck_tx_power_index_B,
> - sizeof(priv->cck_tx_power_index_B));
> + sizeof(tx_power->cck_tx_power_index_B));
>
> - memcpy(priv->ht40_1s_tx_power_index_A,
> + memcpy(tx_power->ht40_1s_tx_power_index_A,
> efuse->ht40_1s_tx_power_index_A,
> - sizeof(priv->ht40_1s_tx_power_index_A));
> - memcpy(priv->ht40_1s_tx_power_index_B,
> + sizeof(tx_power->ht40_1s_tx_power_index_A));
> + memcpy(tx_power->ht40_1s_tx_power_index_B,
> efuse->ht40_1s_tx_power_index_B,
> - sizeof(priv->ht40_1s_tx_power_index_B));
> - memcpy(priv->ht40_2s_tx_power_index_diff,
> + sizeof(tx_power->ht40_1s_tx_power_index_B));
> + memcpy(tx_power->ht40_2s_tx_power_index_diff,
> efuse->ht40_2s_tx_power_index_diff,
> - sizeof(priv->ht40_2s_tx_power_index_diff));
> + sizeof(tx_power->ht40_2s_tx_power_index_diff));
>
> - memcpy(priv->ht20_tx_power_index_diff,
> + memcpy(tx_power->ht20_tx_power_index_diff,
> efuse->ht20_tx_power_index_diff,
> - sizeof(priv->ht20_tx_power_index_diff));
> - memcpy(priv->ofdm_tx_power_index_diff,
> + sizeof(tx_power->ht20_tx_power_index_diff));
> + memcpy(tx_power->ofdm_tx_power_index_diff,
> efuse->ofdm_tx_power_index_diff,
> - sizeof(priv->ofdm_tx_power_index_diff));
> + sizeof(tx_power->ofdm_tx_power_index_diff));
>
> - memcpy(priv->ht40_max_power_offset,
> + memcpy(tx_power->ht40_max_power_offset,
> efuse->ht40_max_power_offset,
> - sizeof(priv->ht40_max_power_offset));
> - memcpy(priv->ht20_max_power_offset,
> + sizeof(tx_power->ht40_max_power_offset));
> + memcpy(tx_power->ht20_max_power_offset,
> efuse->ht20_max_power_offset,
> - sizeof(priv->ht20_max_power_offset));
> + sizeof(tx_power->ht20_max_power_offset));
>
> dev_info(&priv->udev->dev, "Vendor: %.7s\n",
> efuse->vendor_name);
> diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
> b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
> index 622e6f5..1a0c88d 100644
> --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
> +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
> @@ -564,6 +564,22 @@ struct h2c_cmd {
>
> struct rtl8xxxu_fileops;
>
> +struct rtl8723au_tx_power {
> + u8 cck_tx_power_index_A[3]; /* 0x10 */
> + u8 cck_tx_power_index_B[3];
> + u8 ht40_1s_tx_power_index_A[3]; /* 0x16 */
> + u8 ht40_1s_tx_power_index_B[3];
> + /*
> + * The following entries are half-bytes split as:
> + * bits 0-3: path A, bits 4-7: path B, all values 4 bits signed
> + */
> + struct rtl8723au_idx ht40_2s_tx_power_index_diff[3];
> + struct rtl8723au_idx ht20_tx_power_index_diff[3];
> + struct rtl8723au_idx ofdm_tx_power_index_diff[3];
> + struct rtl8723au_idx ht40_max_power_offset[3];
> + struct rtl8723au_idx ht20_max_power_offset[3];
> +};
> +
> struct rtl8xxxu_priv {
> struct ieee80211_hw *hw;
> struct usb_device *udev;
> @@ -582,19 +598,7 @@ struct rtl8xxxu_priv {
>
> u8 mac_addr[ETH_ALEN];
> char chip_name[8];
> - u8 cck_tx_power_index_A[3]; /* 0x10 */
> - u8 cck_tx_power_index_B[3];
> - u8 ht40_1s_tx_power_index_A[3]; /* 0x16 */
> - u8 ht40_1s_tx_power_index_B[3];
> - /*
> - * The following entries are half-bytes split as:
> - * bits 0-3: path A, bits 4-7: path B, all values 4 bits signed
> - */
> - struct rtl8723au_idx ht40_2s_tx_power_index_diff[3];
> - struct rtl8723au_idx ht20_tx_power_index_diff[3];
> - struct rtl8723au_idx ofdm_tx_power_index_diff[3];
> - struct rtl8723au_idx ht40_max_power_offset[3];
> - struct rtl8723au_idx ht20_max_power_offset[3];
> + struct rtl8723au_tx_power tx_power;
> u32 chip_cut:4;
> u32 rom_rev:4;
> u32 is_multi_func:1;
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
