From f3a1db04f0ebba577598f1577d3c8c756c8bf757 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 29 Feb 2016 17:19:04 +0000 Subject: mac80211: backport from trunk r48782 + required kernel patches and mt76, mwlwifi Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48822 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ...x-race-condition-in-msgbuf-ioctl-processi.patch | 35 ---------------------- 1 file changed, 35 deletions(-) delete mode 100644 package/kernel/mac80211/patches/317-brcmfmac-Fix-race-condition-in-msgbuf-ioctl-processi.patch (limited to 'package/kernel/mac80211/patches/317-brcmfmac-Fix-race-condition-in-msgbuf-ioctl-processi.patch') diff --git a/package/kernel/mac80211/patches/317-brcmfmac-Fix-race-condition-in-msgbuf-ioctl-processi.patch b/package/kernel/mac80211/patches/317-brcmfmac-Fix-race-condition-in-msgbuf-ioctl-processi.patch deleted file mode 100644 index e005fe73d2..0000000000 --- a/package/kernel/mac80211/patches/317-brcmfmac-Fix-race-condition-in-msgbuf-ioctl-processi.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Hante Meuleman -Date: Fri, 6 Mar 2015 18:40:41 +0100 -Subject: [PATCH] brcmfmac: Fix race condition in msgbuf ioctl processing. - -Msgbuf is using a wait_event_timeout to wait for the response on -an ioctl. The wakeup routine uses waitqueue_active to see if -wait_event_timeout has been called. There is a chance that the -response arrives before wait_event_timeout is called, this -will result in situation that wait_event_timeout never gets -woken again and assumed result will be a timeout. This patch -removes that errornous situation by always setting the -ctl_completed var before checking for queue active. - -Reviewed-by: Arend Van Spriel -Reviewed-by: Pieter-Paul Giesberts -Signed-off-by: Hante Meuleman -Signed-off-by: Arend van Spriel -Signed-off-by: Kalle Valo ---- - ---- a/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c -+++ b/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c -@@ -481,10 +481,9 @@ static int brcmf_msgbuf_ioctl_resp_wait( - - static void brcmf_msgbuf_ioctl_resp_wake(struct brcmf_msgbuf *msgbuf) - { -- if (waitqueue_active(&msgbuf->ioctl_resp_wait)) { -- msgbuf->ctl_completed = true; -+ msgbuf->ctl_completed = true; -+ if (waitqueue_active(&msgbuf->ioctl_resp_wait)) - wake_up(&msgbuf->ioctl_resp_wait); -- } - } - - -- cgit v1.2.3