tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds f7c1038b 437e878a

+9 -4
+5
MAINTAINERS
··· 14436 14436 S: Odd Fixes 14437 14437 F: drivers/staging/rtl8712/ 14438 14438 14439 + STAGING - REALTEK RTL8188EU DRIVERS 14440 + M: Larry Finger <Larry.Finger@lwfinger.net> 14441 + S: Odd Fixes 14442 + F: drivers/staging/rtl8188eu/ 14443 + 14439 14444 STAGING - SILICON MOTION SM750 FRAME BUFFER DRIVER 14440 14445 M: Sudip Mukherjee <sudipm.mukherjee@gmail.com> 14441 14446 M: Teddy Wang <teddy.wang@siliconmotion.com>
+3 -3
drivers/staging/rtl8188eu/core/rtw_security.c
··· 154 154 155 155 pframe = ((struct xmit_frame *)pxmitframe)->buf_addr + hw_hdr_offset; 156 156 157 - crypto_ops = try_then_request_module(lib80211_get_crypto_ops("WEP"), "lib80211_crypt_wep"); 157 + crypto_ops = lib80211_get_crypto_ops("WEP"); 158 158 159 159 if (!crypto_ops) 160 160 return; ··· 210 210 void *crypto_private = NULL; 211 211 int status = _SUCCESS; 212 212 const int keyindex = prxattrib->key_index; 213 - struct lib80211_crypto_ops *crypto_ops = try_then_request_module(lib80211_get_crypto_ops("WEP"), "lib80211_crypt_wep"); 213 + struct lib80211_crypto_ops *crypto_ops = lib80211_get_crypto_ops("WEP"); 214 214 char iv[4], icv[4]; 215 215 216 216 if (!crypto_ops) { ··· 1291 1291 struct sk_buff *skb = ((struct recv_frame *)precvframe)->pkt; 1292 1292 void *crypto_private = NULL; 1293 1293 u8 *key, *pframe = skb->data; 1294 - struct lib80211_crypto_ops *crypto_ops = try_then_request_module(lib80211_get_crypto_ops("CCMP"), "lib80211_crypt_ccmp"); 1294 + struct lib80211_crypto_ops *crypto_ops = lib80211_get_crypto_ops("CCMP"); 1295 1295 struct security_priv *psecuritypriv = &padapter->securitypriv; 1296 1296 char iv[8], icv[8]; 1297 1297
+1 -1
drivers/staging/rtl8723bs/os_dep/sdio_intf.c
··· 22 22 { SDIO_DEVICE(0x024c, 0xb723), }, 23 23 { /* end: all zeroes */ }, 24 24 }; 25 - static const struct acpi_device_id acpi_ids[] __used = { 25 + static const struct acpi_device_id acpi_ids[] = { 26 26 {"OBDA8723", 0x0000}, 27 27 {} 28 28 };