Commit 47eae6dd authored by Mateusz Kulikowski's avatar Mateusz Kulikowski Committed by Greg Kroah-Hartman

staging: rtl8192e: Remove rtllib_device::agregation

Variable is always true; Resolve condition where it is used
(and change indentation of conditional expression).
Signed-off-by: default avatarMateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0941f87f
...@@ -1758,7 +1758,6 @@ struct rtllib_device { ...@@ -1758,7 +1758,6 @@ struct rtllib_device {
u8 AsocRetryCount; u8 AsocRetryCount;
struct sk_buff_head skb_waitQ[MAX_QUEUE_SIZE]; struct sk_buff_head skb_waitQ[MAX_QUEUE_SIZE];
struct sk_buff_head skb_aggQ[MAX_QUEUE_SIZE]; struct sk_buff_head skb_aggQ[MAX_QUEUE_SIZE];
bool aggregation;
bool bdynamic_txpower_enable; bool bdynamic_txpower_enable;
......
...@@ -1883,18 +1883,15 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee, ...@@ -1883,18 +1883,15 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee,
} }
} }
if (ieee->aggregation) {
if (network->bssht.bdSupportHT) { if (network->bssht.bdSupportHT) {
if (info_element->len >= 4 && if (info_element->len >= 4 &&
info_element->data[0] == 0x00 && info_element->data[0] == 0x00 &&
info_element->data[1] == 0xe0 && info_element->data[1] == 0xe0 &&
info_element->data[2] == 0x4c && info_element->data[2] == 0x4c &&
info_element->data[3] == 0x02) { info_element->data[3] == 0x02) {
ht_realtek_agg_len = min_t(u8, ht_realtek_agg_len = min_t(u8, info_element->len,
info_element->len,
MAX_IE_LEN); MAX_IE_LEN);
memcpy(ht_realtek_agg_buf, memcpy(ht_realtek_agg_buf, info_element->data,
info_element->data,
info_element->len); info_element->len);
} }
if (ht_realtek_agg_len >= 5) { if (ht_realtek_agg_len >= 5) {
...@@ -1914,7 +1911,6 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee, ...@@ -1914,7 +1911,6 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee,
if ((ht_realtek_agg_buf[5] & RT_HT_CAP_USE_SOFTAP)) if ((ht_realtek_agg_buf[5] & RT_HT_CAP_USE_SOFTAP))
network->bssht.RT2RT_HT_Mode |= RT_HT_CAP_USE_SOFTAP; network->bssht.RT2RT_HT_Mode |= RT_HT_CAP_USE_SOFTAP;
} }
}
if ((info_element->len >= 3 && if ((info_element->len >= 3 &&
info_element->data[0] == 0x00 && info_element->data[0] == 0x00 &&
......
...@@ -3017,7 +3017,6 @@ void rtllib_softmac_init(struct rtllib_device *ieee) ...@@ -3017,7 +3017,6 @@ void rtllib_softmac_init(struct rtllib_device *ieee)
ieee->is_set_key = false; ieee->is_set_key = false;
init_mgmt_queue(ieee); init_mgmt_queue(ieee);
ieee->aggregation = true;
ieee->tx_pending.txb = NULL; ieee->tx_pending.txb = NULL;
_setup_timer(&ieee->associate_timer, _setup_timer(&ieee->associate_timer,
......
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