Commit 3e707eb6 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'staging-5.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging driver fixes from Greg KH:
 "Here are two rtl8192e staging driver fixes for reported problems.

  Both of these have been in linux-next for a while with no reported
  issues"

* tag 'staging-5.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: rtl8192e: Change state information from u16 to u8
  staging: rtl8192e: Fix incorrect source in memcpy()
parents 0d2c5a9e e78836ae
...@@ -1105,7 +1105,7 @@ struct rtllib_network { ...@@ -1105,7 +1105,7 @@ struct rtllib_network {
bool bWithAironetIE; bool bWithAironetIE;
bool bCkipSupported; bool bCkipSupported;
bool bCcxRmEnable; bool bCcxRmEnable;
u16 CcxRmState[2]; u8 CcxRmState[2];
bool bMBssidValid; bool bMBssidValid;
u8 MBssidMask; u8 MBssidMask;
u8 MBssid[ETH_ALEN]; u8 MBssid[ETH_ALEN];
......
...@@ -1967,7 +1967,7 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee, ...@@ -1967,7 +1967,7 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee,
info_element->data[2] == 0x96 && info_element->data[2] == 0x96 &&
info_element->data[3] == 0x01) { info_element->data[3] == 0x01) {
if (info_element->len == 6) { if (info_element->len == 6) {
memcpy(network->CcxRmState, &info_element[4], 2); memcpy(network->CcxRmState, &info_element->data[4], 2);
if (network->CcxRmState[0] != 0) if (network->CcxRmState[0] != 0)
network->bCcxRmEnable = true; network->bCcxRmEnable = true;
else else
......
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