diff options
| author | Zoltan Herpai <wigyori@uid0.hu> | 2016-09-29 15:49:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-29 15:49:20 +0200 |
| commit | ca3f1a614a1ee90fc67188b375888517f0c151df (patch) | |
| tree | 930c456200793be1ec731e819aa0dd2e4b0b0dbf /package/kernel/mac80211/patches/861-brcmfmac-register-wiphy-s-during-module_init.patch | |
| parent | d6b3ca24c50047af58135ad3090f7a3a25eee35d (diff) | |
| parent | f9755e28776fdce0c2136492b43380d0eefe3c5a (diff) | |
| download | upstream-ca3f1a614a1ee90fc67188b375888517f0c151df.tar.gz upstream-ca3f1a614a1ee90fc67188b375888517f0c151df.tar.bz2 upstream-ca3f1a614a1ee90fc67188b375888517f0c151df.zip | |
Merge pull request #105 from wigyori/chaos_calmer
CC: openssl security upgrade, sync updates from git.openwrt.org/chaos_calmer
Diffstat (limited to 'package/kernel/mac80211/patches/861-brcmfmac-register-wiphy-s-during-module_init.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/861-brcmfmac-register-wiphy-s-during-module_init.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/kernel/mac80211/patches/861-brcmfmac-register-wiphy-s-during-module_init.patch b/package/kernel/mac80211/patches/861-brcmfmac-register-wiphy-s-during-module_init.patch index 77c12741ef..f7f44f513f 100644 --- a/package/kernel/mac80211/patches/861-brcmfmac-register-wiphy-s-during-module_init.patch +++ b/package/kernel/mac80211/patches/861-brcmfmac-register-wiphy-s-during-module_init.patch @@ -13,8 +13,8 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c -@@ -1308,6 +1308,7 @@ static int __init brcmfmac_module_init(v - #endif +@@ -1200,6 +1200,7 @@ int __init brcmf_core_init(void) + { if (!schedule_work(&brcmf_driver_work)) return -EBUSY; + flush_work(&brcmf_driver_work); |