staging: rtl8192e: Rename variable bCurrentHTSupport
Commit Message
This patch renames variable bCurrentHTSupport to bcurrent_ht_support
to fix checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <tdavies@darkphysics.net>
---
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +-
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 2 +-
drivers/staging/rtl8192e/rtl819x_BAProc.c | 12 ++++++------
drivers/staging/rtl8192e/rtl819x_HT.h | 2 +-
drivers/staging/rtl8192e/rtl819x_HTProc.c | 16 ++++++++--------
drivers/staging/rtl8192e/rtllib_softmac.c | 16 ++++++++--------
drivers/staging/rtl8192e/rtllib_softmac_wx.c | 2 +-
drivers/staging/rtl8192e/rtllib_tx.c | 8 ++++----
8 files changed, 30 insertions(+), 30 deletions(-)
Comments
On 7/6/23 03:59, Tree Davies wrote:
> This patch renames variable bCurrentHTSupport to bcurrent_ht_support
> to fix checkpatch warning Avoid CamelCase.
>
> Signed-off-by: Tree Davies<tdavies@darkphysics.net>
> ---
> drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +-
> drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 2 +-
> drivers/staging/rtl8192e/rtl819x_BAProc.c | 12 ++++++------
> drivers/staging/rtl8192e/rtl819x_HT.h | 2 +-
> drivers/staging/rtl8192e/rtl819x_HTProc.c | 16 ++++++++--------
> drivers/staging/rtl8192e/rtllib_softmac.c | 16 ++++++++--------
> drivers/staging/rtl8192e/rtllib_softmac_wx.c | 2 +-
> drivers/staging/rtl8192e/rtllib_tx.c | 8 ++++----
> 8 files changed, 30 insertions(+), 30 deletions(-)
Hi Tree,
when I try to apply your patch on the top of all the other patches I get
the following error message:
kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$ git apply -v
~/Downloads/20230706-\[PATCH\]\ staging_\ rtl8192e_\ Rename\ variable\
bCurrentHTSupport-10002.txt
Checking patch drivers/staging/rtl8192e/rtl8192e/rtl_core.c...
Checking patch drivers/staging/rtl8192e/rtl8192e/rtl_wx.c...
Checking patch drivers/staging/rtl8192e/rtl819x_BAProc.c...
Checking patch drivers/staging/rtl8192e/rtl819x_HT.h...
Checking patch drivers/staging/rtl8192e/rtl819x_HTProc.c...
Checking patch drivers/staging/rtl8192e/rtllib_softmac.c...
error: while searching for:
crypt = ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx];
encrypt = ieee->host_encrypt && crypt && crypt->ops &&
((strcmp(crypt->ops->name, "R-WEP") == 0 || wpa_ie_len));
if (ieee->ht_info->bCurrentHTSupport) {
tmp_ht_cap_buf = (u8 *)&(ieee->ht_info->SelfHTCap);
tmp_ht_cap_len = sizeof(ieee->ht_info->SelfHTCap);
tmp_ht_info_buf = (u8 *)&(ieee->ht_info->SelfHTInfo);
error: patch failed: drivers/staging/rtl8192e/rtllib_softmac.c:816
error: drivers/staging/rtl8192e/rtllib_softmac.c: patch does not apply
Checking patch drivers/staging/rtl8192e/rtllib_softmac_wx.c...
Checking patch drivers/staging/rtl8192e/rtllib_tx.c...
My be the previous send patches are not taken then your chance is better
that this one will fit. Will see what happens.
You need to put your patches into a patch series.
This reduces email traffic as the reviewer can just send one email and
does not need to send four.
A possible command for a patch series is looking like this:
git format-patch -o ~/Documents/kernel/patches/ --cover-letter -n
--thread=shallow --to="Greg Kroah-Hartman
<gregkh@linuxfoundation.org>,linux-staging@lists.linux.dev,linux-kernel@vger.kernel.org"
4bbbd60d84e15fdb7bffde98a687ed168a4dfbbd^..HEAD
Use the git commit id of your first patch.
Bye Philipp
On Thu, Jul 06, 2023 at 10:48:56PM +0200, Philipp Hortmann wrote:
> On 7/6/23 03:59, Tree Davies wrote:
> > This patch renames variable bCurrentHTSupport to bcurrent_ht_support
> > to fix checkpatch warning Avoid CamelCase.
> >
> > Signed-off-by: Tree Davies<tdavies@darkphysics.net>
> > ---
> > drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +-
> > drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 2 +-
> > drivers/staging/rtl8192e/rtl819x_BAProc.c | 12 ++++++------
> > drivers/staging/rtl8192e/rtl819x_HT.h | 2 +-
> > drivers/staging/rtl8192e/rtl819x_HTProc.c | 16 ++++++++--------
> > drivers/staging/rtl8192e/rtllib_softmac.c | 16 ++++++++--------
> > drivers/staging/rtl8192e/rtllib_softmac_wx.c | 2 +-
> > drivers/staging/rtl8192e/rtllib_tx.c | 8 ++++----
> > 8 files changed, 30 insertions(+), 30 deletions(-)
>
>
> Hi Tree,
>
> when I try to apply your patch on the top of all the other patches I get the
> following error message:
>
> kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$ git apply -v
> ~/Downloads/20230706-\[PATCH\]\ staging_\ rtl8192e_\ Rename\ variable\
> bCurrentHTSupport-10002.txt
> Checking patch drivers/staging/rtl8192e/rtl8192e/rtl_core.c...
> Checking patch drivers/staging/rtl8192e/rtl8192e/rtl_wx.c...
> Checking patch drivers/staging/rtl8192e/rtl819x_BAProc.c...
> Checking patch drivers/staging/rtl8192e/rtl819x_HT.h...
> Checking patch drivers/staging/rtl8192e/rtl819x_HTProc.c...
> Checking patch drivers/staging/rtl8192e/rtllib_softmac.c...
> error: while searching for:
> crypt = ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx];
> encrypt = ieee->host_encrypt && crypt && crypt->ops &&
> ((strcmp(crypt->ops->name, "R-WEP") == 0 || wpa_ie_len));
> if (ieee->ht_info->bCurrentHTSupport) {
> tmp_ht_cap_buf = (u8 *)&(ieee->ht_info->SelfHTCap);
> tmp_ht_cap_len = sizeof(ieee->ht_info->SelfHTCap);
> tmp_ht_info_buf = (u8 *)&(ieee->ht_info->SelfHTInfo);
>
> error: patch failed: drivers/staging/rtl8192e/rtllib_softmac.c:816
> error: drivers/staging/rtl8192e/rtllib_softmac.c: patch does not apply
> Checking patch drivers/staging/rtl8192e/rtllib_softmac_wx.c...
> Checking patch drivers/staging/rtl8192e/rtllib_tx.c...
>
>
> My be the previous send patches are not taken then your chance is better
> that this one will fit. Will see what happens.
>
>
> You need to put your patches into a patch series.
> This reduces email traffic as the reviewer can just send one email and does
> not need to send four.
>
> A possible command for a patch series is looking like this:
> git format-patch -o ~/Documents/kernel/patches/ --cover-letter -n
> --thread=shallow --to="Greg Kroah-Hartman <gregkh@linuxfoundation.org>,linux-staging@lists.linux.dev,linux-kernel@vger.kernel.org"
> 4bbbd60d84e15fdb7bffde98a687ed168a4dfbbd^..HEAD
>
> Use the git commit id of your first patch.
>
> Bye Philipp
>
Thanks Philipp,
I am happy to send a v2 if needed. Let me know...
Cheers!
Tree
On Thu, Jul 06, 2023 at 10:48:56PM +0200, Philipp Hortmann wrote:
> On 7/6/23 03:59, Tree Davies wrote:
> > This patch renames variable bCurrentHTSupport to bcurrent_ht_support
> > to fix checkpatch warning Avoid CamelCase.
> >
> > Signed-off-by: Tree Davies<tdavies@darkphysics.net>
> > ---
> > drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +-
> > drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 2 +-
> > drivers/staging/rtl8192e/rtl819x_BAProc.c | 12 ++++++------
> > drivers/staging/rtl8192e/rtl819x_HT.h | 2 +-
> > drivers/staging/rtl8192e/rtl819x_HTProc.c | 16 ++++++++--------
> > drivers/staging/rtl8192e/rtllib_softmac.c | 16 ++++++++--------
> > drivers/staging/rtl8192e/rtllib_softmac_wx.c | 2 +-
> > drivers/staging/rtl8192e/rtllib_tx.c | 8 ++++----
> > 8 files changed, 30 insertions(+), 30 deletions(-)
>
>
> Hi Tree,
>
> when I try to apply your patch on the top of all the other patches I get the
> following error message:
>
> kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$ git apply -v
> ~/Downloads/20230706-\[PATCH\]\ staging_\ rtl8192e_\ Rename\ variable\
> bCurrentHTSupport-10002.txt
> Checking patch drivers/staging/rtl8192e/rtl8192e/rtl_core.c...
> Checking patch drivers/staging/rtl8192e/rtl8192e/rtl_wx.c...
> Checking patch drivers/staging/rtl8192e/rtl819x_BAProc.c...
> Checking patch drivers/staging/rtl8192e/rtl819x_HT.h...
> Checking patch drivers/staging/rtl8192e/rtl819x_HTProc.c...
> Checking patch drivers/staging/rtl8192e/rtllib_softmac.c...
> error: while searching for:
> crypt = ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx];
> encrypt = ieee->host_encrypt && crypt && crypt->ops &&
> ((strcmp(crypt->ops->name, "R-WEP") == 0 || wpa_ie_len));
> if (ieee->ht_info->bCurrentHTSupport) {
> tmp_ht_cap_buf = (u8 *)&(ieee->ht_info->SelfHTCap);
> tmp_ht_cap_len = sizeof(ieee->ht_info->SelfHTCap);
> tmp_ht_info_buf = (u8 *)&(ieee->ht_info->SelfHTInfo);
>
> error: patch failed: drivers/staging/rtl8192e/rtllib_softmac.c:816
> error: drivers/staging/rtl8192e/rtllib_softmac.c: patch does not apply
> Checking patch drivers/staging/rtl8192e/rtllib_softmac_wx.c...
> Checking patch drivers/staging/rtl8192e/rtllib_tx.c...
>
>
> My be the previous send patches are not taken then your chance is better
> that this one will fit. Will see what happens.
>
>
> You need to put your patches into a patch series.
> This reduces email traffic as the reviewer can just send one email and does
> not need to send four.
>
> A possible command for a patch series is looking like this:
> git format-patch -o ~/Documents/kernel/patches/ --cover-letter -n
> --thread=shallow --to="Greg Kroah-Hartman <gregkh@linuxfoundation.org>,linux-staging@lists.linux.dev,linux-kernel@vger.kernel.org"
> 4bbbd60d84e15fdb7bffde98a687ed168a4dfbbd^..HEAD
>
> Use the git commit id of your first patch.
>
> Bye Philipp
>
>
Philipp,
I think I understand what I did wrong. Each of these original patches were
created/based from the same commit hash. So it makes sense that only the
first one applied would apply cleanly and the others would fail.
My apologies,
Tree
On 7/15/23 22:14, Tree Davies wrote:
> Philipp,
>
> I think I understand what I did wrong. Each of these original patches were
> created/based from the same commit hash. So it makes sense that only the
> first one applied would apply cleanly and the others would fail.
>
> My apologies,
> Tree
Hi Tree,
you could work this way if you ensure that each patch does not modify
code (and some lines above and below) a previous patch modified. But it
is not a good way to do so. Existing tools assume that you create your
commits onto each other and then make patches out of them.
Another issue right now is that approximately 18 patches send in and are
possibly applied (for rtl8192e). Your patches need to fit onto those
patches. Otherwise they cannot be applied and will be rejected.
Typically Greg applies all patches once a week. But it seems that he has
a bunch of other more urgent tasks. So you need to focus on other kernel
related task like educate yourself or prepare patches without sending
them in.
Thanks for your support.
Bye Philipp
On Tue, Jul 18, 2023 at 09:56:24PM +0200, Philipp Hortmann wrote:
> On 7/15/23 22:14, Tree Davies wrote:
> > Philipp,
> >
> > I think I understand what I did wrong. Each of these original patches were
> > created/based from the same commit hash. So it makes sense that only the
> > first one applied would apply cleanly and the others would fail.
> >
> > My apologies,
> > Tree
>
> Hi Tree,
>
> you could work this way if you ensure that each patch does not modify code
> (and some lines above and below) a previous patch modified. But it is not a
> good way to do so. Existing tools assume that you create your commits onto
> each other and then make patches out of them.
>
> Another issue right now is that approximately 18 patches send in and are
> possibly applied (for rtl8192e). Your patches need to fit onto those
> patches. Otherwise they cannot be applied and will be rejected.
>
> Typically Greg applies all patches once a week. But it seems that he has a
> bunch of other more urgent tasks. So you need to focus on other kernel
> related task like educate yourself or prepare patches without sending them
> in.
>
> Thanks for your support.
>
> Bye Philipp
>
Thnaks Philipp,
No worries, I'm patient, and happy to help any way I can.
I have hardware coming in the mail this week! I already have
3 mPCIe rtl8192e devices, but I am waiting on the PCIe adapter card for
my test machine.
I'm stoked. :)
Tree
On Sat, Jul 15, 2023 at 01:14:59PM -0700, Tree Davies wrote:
> On Thu, Jul 06, 2023 at 10:48:56PM +0200, Philipp Hortmann wrote:
> > On 7/6/23 03:59, Tree Davies wrote:
> > > This patch renames variable bCurrentHTSupport to bcurrent_ht_support
> > > to fix checkpatch warning Avoid CamelCase.
> > >
> > > Signed-off-by: Tree Davies<tdavies@darkphysics.net>
> > > ---
> > > drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +-
> > > drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 2 +-
> > > drivers/staging/rtl8192e/rtl819x_BAProc.c | 12 ++++++------
> > > drivers/staging/rtl8192e/rtl819x_HT.h | 2 +-
> > > drivers/staging/rtl8192e/rtl819x_HTProc.c | 16 ++++++++--------
> > > drivers/staging/rtl8192e/rtllib_softmac.c | 16 ++++++++--------
> > > drivers/staging/rtl8192e/rtllib_softmac_wx.c | 2 +-
> > > drivers/staging/rtl8192e/rtllib_tx.c | 8 ++++----
> > > 8 files changed, 30 insertions(+), 30 deletions(-)
> >
> >
> > Hi Tree,
> >
> > when I try to apply your patch on the top of all the other patches I get the
> > following error message:
> >
> > kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$ git apply -v
> > ~/Downloads/20230706-\[PATCH\]\ staging_\ rtl8192e_\ Rename\ variable\
> > bCurrentHTSupport-10002.txt
> > Checking patch drivers/staging/rtl8192e/rtl8192e/rtl_core.c...
> > Checking patch drivers/staging/rtl8192e/rtl8192e/rtl_wx.c...
> > Checking patch drivers/staging/rtl8192e/rtl819x_BAProc.c...
> > Checking patch drivers/staging/rtl8192e/rtl819x_HT.h...
> > Checking patch drivers/staging/rtl8192e/rtl819x_HTProc.c...
> > Checking patch drivers/staging/rtl8192e/rtllib_softmac.c...
> > error: while searching for:
> > crypt = ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx];
> > encrypt = ieee->host_encrypt && crypt && crypt->ops &&
> > ((strcmp(crypt->ops->name, "R-WEP") == 0 || wpa_ie_len));
> > if (ieee->ht_info->bCurrentHTSupport) {
> > tmp_ht_cap_buf = (u8 *)&(ieee->ht_info->SelfHTCap);
> > tmp_ht_cap_len = sizeof(ieee->ht_info->SelfHTCap);
> > tmp_ht_info_buf = (u8 *)&(ieee->ht_info->SelfHTInfo);
> >
> > error: patch failed: drivers/staging/rtl8192e/rtllib_softmac.c:816
> > error: drivers/staging/rtl8192e/rtllib_softmac.c: patch does not apply
> > Checking patch drivers/staging/rtl8192e/rtllib_softmac_wx.c...
> > Checking patch drivers/staging/rtl8192e/rtllib_tx.c...
> >
> >
> > My be the previous send patches are not taken then your chance is better
> > that this one will fit. Will see what happens.
> >
> >
> > You need to put your patches into a patch series.
> > This reduces email traffic as the reviewer can just send one email and does
> > not need to send four.
> >
> > A possible command for a patch series is looking like this:
> > git format-patch -o ~/Documents/kernel/patches/ --cover-letter -n
> > --thread=shallow --to="Greg Kroah-Hartman <gregkh@linuxfoundation.org>,linux-staging@lists.linux.dev,linux-kernel@vger.kernel.org"
> > 4bbbd60d84e15fdb7bffde98a687ed168a4dfbbd^..HEAD
> >
> > Use the git commit id of your first patch.
> >
> > Bye Philipp
> >
> >
>
> Philipp,
>
> I think I understand what I did wrong. Each of these original patches were
> created/based from the same commit hash. So it makes sense that only the
> first one applied would apply cleanly and the others would fail.
Please redo them all and send them as a proper patch series.
thanks,
greg k-h
@@ -313,7 +313,7 @@ static void _rtl92e_update_beacon(void *data)
struct rtllib_device *ieee = priv->rtllib;
struct rtllib_network *net = &ieee->current_network;
- if (ieee->ht_info->bCurrentHTSupport)
+ if (ieee->ht_info->bcurrent_ht_support)
HT_update_self_and_peer_setting(ieee, net);
ieee->ht_info->current_rt2rt_long_slot_time = net->bssht.bd_rt2rt_long_slot_time;
ieee->ht_info->RT2RT_HT_Mode = net->bssht.rt2rt_ht_mode;
@@ -866,7 +866,7 @@ static int _rtl92e_wx_set_encode_ext(struct net_device *dev,
key, 0);
} else {
if ((ieee->pairwise_key_type == KEY_TYPE_CCMP) &&
- ieee->ht_info->bCurrentHTSupport)
+ ieee->ht_info->bcurrent_ht_support)
rtl92e_writeb(dev, 0x173, 1);
rtl92e_set_key(dev, 4, idx, alg,
(u8 *)ieee->ap_mac_addr, 0, key);
@@ -244,13 +244,13 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb)
pBaStartSeqCtrl = (union sequence_control *)(req + 7);
if (!ieee->current_network.qos_data.active ||
- !ieee->ht_info->bCurrentHTSupport ||
+ !ieee->ht_info->bcurrent_ht_support ||
(ieee->ht_info->iot_action & HT_IOT_ACT_REJECT_ADDBA_REQ)) {
rc = ADDBA_STATUS_REFUSED;
netdev_warn(ieee->dev,
"Failed to reply on ADDBA_REQ as some capability is not ready(%d, %d)\n",
ieee->current_network.qos_data.active,
- ieee->ht_info->bCurrentHTSupport);
+ ieee->ht_info->bcurrent_ht_support);
goto OnADDBAReq_Fail;
}
if (!GetTs(ieee, (struct ts_common_info **)&pTS, dst,
@@ -326,12 +326,12 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb)
pBaTimeoutVal = (u16 *)(tag + 7);
if (!ieee->current_network.qos_data.active ||
- !ieee->ht_info->bCurrentHTSupport ||
+ !ieee->ht_info->bcurrent_ht_support ||
!ieee->ht_info->bCurrentAMPDUEnable) {
netdev_warn(ieee->dev,
"reject to ADDBA_RSP as some capability is not ready(%d, %d, %d)\n",
ieee->current_network.qos_data.active,
- ieee->ht_info->bCurrentHTSupport,
+ ieee->ht_info->bcurrent_ht_support,
ieee->ht_info->bCurrentAMPDUEnable);
ReasonCode = DELBA_REASON_UNKNOWN_BA;
goto OnADDBARsp_Reject;
@@ -413,11 +413,11 @@ int rtllib_rx_DELBA(struct rtllib_device *ieee, struct sk_buff *skb)
}
if (!ieee->current_network.qos_data.active ||
- !ieee->ht_info->bCurrentHTSupport) {
+ !ieee->ht_info->bcurrent_ht_support) {
netdev_warn(ieee->dev,
"received DELBA while QOS or HT is not supported(%d, %d)\n",
ieee->current_network. qos_data.active,
- ieee->ht_info->bCurrentHTSupport);
+ ieee->ht_info->bcurrent_ht_support);
return -1;
}
@@ -93,7 +93,7 @@ enum ht_aggre_mode {
struct rt_hi_throughput {
u8 enable_ht;
- u8 bCurrentHTSupport;
+ u8 bcurrent_ht_support;
u8 bRegBW40MHz;
u8 bCurBW40MHz;
u8 bRegShortGI40MHz;
@@ -516,7 +516,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee)
static const u8 EWC11NHTCap[] = { 0x00, 0x90, 0x4c, 0x33 };
static const u8 EWC11NHTInfo[] = { 0x00, 0x90, 0x4c, 0x34 };
- if (!ht_info->bCurrentHTSupport) {
+ if (!ht_info->bcurrent_ht_support) {
netdev_warn(ieee->dev, "%s(): HT_DISABLE\n", __func__);
return;
}
@@ -621,7 +621,7 @@ void HTInitializeHTInfo(struct rtllib_device *ieee)
{
struct rt_hi_throughput *ht_info = ieee->ht_info;
- ht_info->bCurrentHTSupport = false;
+ ht_info->bcurrent_ht_support = false;
ht_info->bCurBW40MHz = false;
ht_info->cur_tx_bw40mhz = false;
@@ -692,7 +692,7 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee,
* function rtllib_softmac_new_net. WB 2008.09.10
*/
if (pNetwork->bssht.bd_support_ht) {
- ht_info->bCurrentHTSupport = true;
+ ht_info->bcurrent_ht_support = true;
ht_info->ePeerHTSpecVer = pNetwork->bssht.bd_ht_spec_ver;
if (pNetwork->bssht.bd_ht_cap_len > 0 &&
@@ -746,7 +746,7 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee,
if (bIOTAction)
ht_info->iot_action |= HT_IOT_ACT_CDD_FSYNC;
} else {
- ht_info->bCurrentHTSupport = false;
+ ht_info->bcurrent_ht_support = false;
ht_info->current_rt2rt_aggregation = false;
ht_info->current_rt2rt_long_slot_time = false;
ht_info->RT2RT_HT_Mode = (enum rt_ht_capability)0;
@@ -763,7 +763,7 @@ void HT_update_self_and_peer_setting(struct rtllib_device *ieee,
struct ht_info_ele *pPeerHTInfo =
(struct ht_info_ele *)pNetwork->bssht.bd_ht_info_buf;
- if (ht_info->bCurrentHTSupport) {
+ if (ht_info->bcurrent_ht_support) {
if (pNetwork->bssht.bd_ht_info_len != 0)
ht_info->current_op_mode = pPeerHTInfo->OptMode;
}
@@ -775,7 +775,7 @@ void HTUseDefaultSetting(struct rtllib_device *ieee)
struct rt_hi_throughput *ht_info = ieee->ht_info;
if (ht_info->enable_ht) {
- ht_info->bCurrentHTSupport = true;
+ ht_info->bcurrent_ht_support = true;
ht_info->bCurSuppCCK = ht_info->bRegSuppCCK;
ht_info->bCurBW40MHz = ht_info->bRegBW40MHz;
@@ -802,13 +802,13 @@ void HTUseDefaultSetting(struct rtllib_device *ieee)
ieee->HTCurrentOperaRate = ieee->HTHighestOperaRate;
} else {
- ht_info->bCurrentHTSupport = false;
+ ht_info->bcurrent_ht_support = false;
}
}
u8 HTCCheck(struct rtllib_device *ieee, u8 *pFrame)
{
- if (ieee->ht_info->bCurrentHTSupport) {
+ if (ieee->ht_info->bcurrent_ht_support) {
if ((IsQoSDataFrame(pFrame) && Frame_Order(pFrame)) == 1) {
netdev_dbg(ieee->dev, "HT CONTROL FILED EXIST!!\n");
return true;
@@ -816,7 +816,7 @@ static struct sk_buff *rtllib_probe_resp(struct rtllib_device *ieee,
crypt = ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx];
encrypt = ieee->host_encrypt && crypt && crypt->ops &&
((strcmp(crypt->ops->name, "R-WEP") == 0 || wpa_ie_len));
- if (ieee->ht_info->bCurrentHTSupport) {
+ if (ieee->ht_info->bcurrent_ht_support) {
tmp_ht_cap_buf = (u8 *)&(ieee->ht_info->SelfHTCap);
tmp_ht_cap_len = sizeof(ieee->ht_info->SelfHTCap);
tmp_ht_info_buf = (u8 *)&(ieee->ht_info->SelfHTInfo);
@@ -1135,7 +1135,7 @@ rtllib_association_req(struct rtllib_network *beacon,
ieee->mode = WIRELESS_MODE_G;
}
- if (ieee->ht_info->bCurrentHTSupport && ieee->ht_info->enable_ht) {
+ if (ieee->ht_info->bcurrent_ht_support && ieee->ht_info->enable_ht) {
ht_cap_buf = (u8 *)&(ieee->ht_info->SelfHTCap);
ht_cap_len = sizeof(ieee->ht_info->SelfHTCap);
HTConstructCapabilityElement(ieee, ht_cap_buf, &ht_cap_len,
@@ -1274,7 +1274,7 @@ rtllib_association_req(struct rtllib_network *beacon,
memcpy(tag, osCcxVerNum.Octet, osCcxVerNum.Length);
tag += osCcxVerNum.Length;
}
- if (ieee->ht_info->bCurrentHTSupport && ieee->ht_info->enable_ht) {
+ if (ieee->ht_info->bcurrent_ht_support && ieee->ht_info->enable_ht) {
if (ieee->ht_info->ePeerHTSpecVer != HT_SPEC_VER_EWC) {
tag = skb_put(skb, ht_cap_len);
*tag++ = MFIE_TYPE_HT_CAP;
@@ -1308,7 +1308,7 @@ rtllib_association_req(struct rtllib_network *beacon,
rtllib_TURBO_Info(ieee, &tag);
}
- if (ieee->ht_info->bCurrentHTSupport && ieee->ht_info->enable_ht) {
+ if (ieee->ht_info->bcurrent_ht_support && ieee->ht_info->enable_ht) {
if (ieee->ht_info->ePeerHTSpecVer == HT_SPEC_VER_EWC) {
tag = skb_put(skb, ht_cap_len);
*tag++ = MFIE_TYPE_GENERIC;
@@ -1474,13 +1474,13 @@ static void rtllib_associate_complete_wq(void *data)
ieee->set_wireless_mode(ieee->dev, WIRELESS_MODE_B);
netdev_info(ieee->dev, "Using B rates:%d\n", ieee->rate);
}
- if (ieee->ht_info->bCurrentHTSupport && ieee->ht_info->enable_ht) {
+ if (ieee->ht_info->bcurrent_ht_support && ieee->ht_info->enable_ht) {
netdev_info(ieee->dev, "Successfully associated, ht enabled\n");
HTOnAssocRsp(ieee);
} else {
netdev_info(ieee->dev,
"Successfully associated, ht not enabled(%d, %d)\n",
- ieee->ht_info->bCurrentHTSupport,
+ ieee->ht_info->bcurrent_ht_support,
ieee->ht_info->enable_ht);
memset(ieee->dot11ht_oper_rate_set, 0, 16);
}
@@ -1645,7 +1645,7 @@ inline void rtllib_softmac_new_net(struct rtllib_device *ieee,
HTResetSelfAndSavePeerSetting(ieee,
&(ieee->current_network));
else
- ieee->ht_info->bCurrentHTSupport =
+ ieee->ht_info->bcurrent_ht_support =
false;
ieee->link_state = RTLLIB_ASSOCIATING;
@@ -2579,7 +2579,7 @@ static void rtllib_start_ibss_wq(void *data)
if (ieee->mode == WIRELESS_MODE_N_24G)
HTUseDefaultSetting(ieee);
else
- ieee->ht_info->bCurrentHTSupport = false;
+ ieee->ht_info->bcurrent_ht_support = false;
ieee->SetHwRegHandler(ieee->dev, HW_VAR_MEDIA_STATUS,
(u8 *)(&ieee->link_state));
@@ -330,7 +330,7 @@ void rtllib_wx_sync_scan_wq(void *data)
ieee->ScanOperationBackupHandler(ieee->dev, SCAN_OPT_BACKUP);
- if (ieee->ht_info->bCurrentHTSupport && ieee->ht_info->enable_ht &&
+ if (ieee->ht_info->bcurrent_ht_support && ieee->ht_info->enable_ht &&
ieee->ht_info->bCurBW40MHz) {
b40M = 1;
chan_offset = ieee->ht_info->CurSTAExtChnlOffset;
@@ -273,7 +273,7 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee,
if (rtllib_act_scanning(ieee, false))
return;
- if (!ht_info->bCurrentHTSupport || !ht_info->enable_ht)
+ if (!ht_info->bcurrent_ht_support || !ht_info->enable_ht)
return;
if (!IsQoSDataFrame(skb->data))
return;
@@ -354,7 +354,7 @@ static void rtllib_query_HTCapShortGI(struct rtllib_device *ieee,
tcb_desc->bUseShortGI = false;
- if (!ht_info->bCurrentHTSupport || !ht_info->enable_ht)
+ if (!ht_info->bcurrent_ht_support || !ht_info->enable_ht)
return;
if (ht_info->forced_short_gi) {
@@ -375,7 +375,7 @@ static void rtllib_query_BandwidthMode(struct rtllib_device *ieee,
tcb_desc->bPacketBW = false;
- if (!ht_info->bCurrentHTSupport || !ht_info->enable_ht)
+ if (!ht_info->bcurrent_ht_support || !ht_info->enable_ht)
return;
if (tcb_desc->bMulticast || tcb_desc->bBroadcast)
@@ -438,7 +438,7 @@ static void rtllib_query_protectionmode(struct rtllib_device *ieee,
tcb_desc->rts_rate = MGN_24M;
break;
}
- if (ht_info->bCurrentHTSupport && ht_info->enable_ht) {
+ if (ht_info->bcurrent_ht_support && ht_info->enable_ht) {
u8 HTOpMode = ht_info->current_op_mode;
if ((ht_info->bCurBW40MHz && (HTOpMode == 2 ||