Commit f7c1038b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging driver fixes from Greg KH:
 "Here are some small staging driver fixes for some reported issues.

  One reverts a patch that was made to the rtl8723bs driver that turned
  out to not be needed at all as it was a bug in clang. The others fix
  up some reported issues in the rtl8188eu driver and update the
  MAINTAINERS file to point to Larry for this driver so he can get the
  bug reports easier.

  All have been in linux-next with no reported issues"

* tag 'staging-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  Revert "staging: rtl8723bs: Mark ACPI table declaration as used"
  staging: rtl8188eu: Fix module loading from tasklet for WEP encryption
  staging: rtl8188eu: Fix module loading from tasklet for CCMP encryption
  MAINTAINERS: Add entry for staging driver r8188eu
parents 437e878a 06382dea

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -14436,6 +14436,11 @@ M: Florian Schilhabel <florian.c.schilhabel@googlemail.com>. 
S:	Odd Fixes

F:	drivers/staging/rtl8712/



STAGING - REALTEK RTL8188EU DRIVERS

M:	Larry Finger <Larry.Finger@lwfinger.net>

S:	Odd Fixes

F:	drivers/staging/rtl8188eu/



STAGING - SILICON MOTION SM750 FRAME BUFFER DRIVER

M:	Sudip Mukherjee <sudipm.mukherjee@gmail.com>

M:	Teddy Wang <teddy.wang@siliconmotion.com>

drivers/staging/rtl8188eu/core/rtw_security.c

+3 −3
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ void rtw_wep_encrypt(struct adapter *padapter, u8 *pxmitframe) 


	pframe = ((struct xmit_frame *)pxmitframe)->buf_addr + hw_hdr_offset;



	crypto_ops = try_then_request_module(lib80211_get_crypto_ops("WEP"), "lib80211_crypt_wep");

	crypto_ops = lib80211_get_crypto_ops("WEP");



	if (!crypto_ops)

		return;
@@ -210,7 +210,7 @@ int rtw_wep_decrypt(struct adapter *padapter, u8 *precvframe) 
		void *crypto_private = NULL;

		int status = _SUCCESS;

		const int keyindex = prxattrib->key_index;

		struct lib80211_crypto_ops *crypto_ops = try_then_request_module(lib80211_get_crypto_ops("WEP"), "lib80211_crypt_wep");

		struct lib80211_crypto_ops *crypto_ops = lib80211_get_crypto_ops("WEP");

		char iv[4], icv[4];



		if (!crypto_ops) {
@@ -1291,7 +1291,7 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe) 
			struct sk_buff *skb = ((struct recv_frame *)precvframe)->pkt;

			void *crypto_private = NULL;

			u8 *key, *pframe = skb->data;

			struct lib80211_crypto_ops *crypto_ops = try_then_request_module(lib80211_get_crypto_ops("CCMP"), "lib80211_crypt_ccmp");

			struct lib80211_crypto_ops *crypto_ops = lib80211_get_crypto_ops("CCMP");

			struct security_priv *psecuritypriv = &padapter->securitypriv;

			char iv[8], icv[8];

drivers/staging/rtl8723bs/os_dep/sdio_intf.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ static const struct sdio_device_id sdio_ids[] = 
	{ SDIO_DEVICE(0x024c, 0xb723), },

	{ /* end: all zeroes */				},

};

static const struct acpi_device_id acpi_ids[] __used = {

static const struct acpi_device_id acpi_ids[] = {

	{"OBDA8723", 0x0000},

	{}

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE