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/351-0011-brcmfmac-don-t-remove-interface-on-link-down-firmwar.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/351-0011-brcmfmac-don-t-remove-interface-on-link-down-firmwar.patch')
-rw-r--r-- | package/kernel/mac80211/patches/351-0011-brcmfmac-don-t-remove-interface-on-link-down-firmwar.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/kernel/mac80211/patches/351-0011-brcmfmac-don-t-remove-interface-on-link-down-firmwar.patch b/package/kernel/mac80211/patches/351-0011-brcmfmac-don-t-remove-interface-on-link-down-firmwar.patch index df707a788f..167e4347d5 100644 --- a/package/kernel/mac80211/patches/351-0011-brcmfmac-don-t-remove-interface-on-link-down-firmwar.patch +++ b/package/kernel/mac80211/patches/351-0011-brcmfmac-don-t-remove-interface-on-link-down-firmwar.patch @@ -41,7 +41,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -@@ -5269,7 +5269,6 @@ brcmf_notify_connect_status_ap(struct br +@@ -5372,7 +5372,6 @@ brcmf_notify_connect_status_ap(struct br struct net_device *ndev, const struct brcmf_event_msg *e, void *data) { @@ -49,7 +49,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> static int generation; u32 event = e->event_code; u32 reason = e->reason; -@@ -5280,8 +5279,6 @@ brcmf_notify_connect_status_ap(struct br +@@ -5383,8 +5382,6 @@ brcmf_notify_connect_status_ap(struct br ndev != cfg_to_ndev(cfg)) { brcmf_dbg(CONN, "AP mode link down\n"); complete(&cfg->vif_disabled); |