evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

brcmfmac: use wait_event_timeout for 8021x pending count

Browse source 
brcmf_netdev_wait_pend8021x was polling to see if 8021x data was
already sent. Code was replaced using wait_event_timeout.

Reviewed-by: Arend Van Spriel <arend@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Hante Meuleman 2012-11-05 16:22:16 -08:00 • committed by John W. Linville
parent 6b028c5ee2
commit 21fff75d2f
2 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/net/wireless/brcm80211/brcmfmac/dhd.h
View file

@ -621,6 +621,7 @@ struct brcmf_pub {
struct work_struct multicast_work; struct work_struct multicast_work;
u8 macvalue[ETH_ALEN]; u8 macvalue[ETH_ALEN];
atomic_t pend_8021x_cnt; atomic_t pend_8021x_cnt;
wait_queue_head_t pend_8021x_wait;
#ifdef DEBUG #ifdef DEBUG
struct dentry *dbgfs_dir; struct dentry *dbgfs_dir;
#endif #endif

32
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
View file

@ -52,6 +52,7 @@ MODULE_DESCRIPTION("Broadcom 802.11n wireless LAN fullmac driver.");
MODULE_SUPPORTED_DEVICE("Broadcom 802.11n WLAN fullmac cards"); MODULE_SUPPORTED_DEVICE("Broadcom 802.11n WLAN fullmac cards");
MODULE_LICENSE("Dual BSD/GPL"); MODULE_LICENSE("Dual BSD/GPL");
#define MAX_WAIT_FOR_8021X_TX 50 /* msecs */
/* Error bits */ /* Error bits */
int brcmf_msg_level = BRCMF_ERROR_VAL; int brcmf_msg_level = BRCMF_ERROR_VAL;
@ -404,9 +405,11 @@ void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, bool success)
eh = (struct ethhdr *)(txp->data); eh = (struct ethhdr *)(txp->data);
type = ntohs(eh->h_proto); type = ntohs(eh->h_proto);
if (type == ETH_P_PAE) if (type == ETH_P_PAE) {
atomic_dec(&drvr->pend_8021x_cnt); atomic_dec(&drvr->pend_8021x_cnt);
if (waitqueue_active(&drvr->pend_8021x_wait))
wake_up(&drvr->pend_8021x_wait);
}
} }
static struct net_device_stats *brcmf_netdev_get_stats(struct net_device *ndev) static struct net_device_stats *brcmf_netdev_get_stats(struct net_device *ndev)
@ -822,6 +825,8 @@ int brcmf_attach(uint bus_hdrlen, struct device *dev)
INIT_LIST_HEAD(&drvr->bus_if->dcmd_list); INIT_LIST_HEAD(&drvr->bus_if->dcmd_list);
init_waitqueue_head(&drvr->pend_8021x_wait);
return ret; return ret;
fail: fail:
@ -924,26 +929,19 @@ static int brcmf_get_pend_8021x_cnt(struct brcmf_pub *drvr)
return atomic_read(&drvr->pend_8021x_cnt); return atomic_read(&drvr->pend_8021x_cnt);
} }
#define MAX_WAIT_FOR_8021X_TX 10
int brcmf_netdev_wait_pend8021x(struct net_device *ndev) int brcmf_netdev_wait_pend8021x(struct net_device *ndev)
{ {
struct brcmf_if *ifp = netdev_priv(ndev); struct brcmf_if *ifp = netdev_priv(ndev);
struct brcmf_pub *drvr = ifp->drvr; struct brcmf_pub *drvr = ifp->drvr;
int timeout = 10 * HZ / 1000; int err;
int ntimes = MAX_WAIT_FOR_8021X_TX;
int pend = brcmf_get_pend_8021x_cnt(drvr);
while (ntimes && pend) { err = wait_event_timeout(drvr->pend_8021x_wait,
if (pend) { !brcmf_get_pend_8021x_cnt(drvr),
set_current_state(TASK_INTERRUPTIBLE); msecs_to_jiffies(MAX_WAIT_FOR_8021X_TX));
schedule_timeout(timeout);
set_current_state(TASK_RUNNING); WARN_ON(!err);
ntimes--;
} return !err;
pend = brcmf_get_pend_8021x_cnt(drvr);
}
return pend;
} }
static void brcmf_driver_init(struct work_struct *work) static void brcmf_driver_init(struct work_struct *work)