From 8f0481f7f474ee8d14bbe08d154af2a8fc6b4b52 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Tue, 12 Jul 2011 22:30:01 -0500 Subject: [PATCH] --- yaml --- r: 267667 b: refs/heads/master c: 0e3b1830591d7d5460e2346cdb535d209de2cab9 h: refs/heads/master i: 267665: 4e36e47b674b9481784e91b37a46279971b35a32 267663: e42ab3e0f18349013f84ff69298ffbdfa7acb417 v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8192e/rtl_core.c | 4 ---- trunk/drivers/staging/rtl8192e/rtllib_softmac.c | 4 ---- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index a030a70fe684..3a1d7ce7018b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ebba6d6e34796bdc5ead494111fb19c619eb599 +refs/heads/master: 0e3b1830591d7d5460e2346cdb535d209de2cab9 diff --git a/trunk/drivers/staging/rtl8192e/rtl_core.c b/trunk/drivers/staging/rtl8192e/rtl_core.c index 976d17bdeed0..db3c64974a7d 100644 --- a/trunk/drivers/staging/rtl8192e/rtl_core.c +++ b/trunk/drivers/staging/rtl8192e/rtl_core.c @@ -1324,11 +1324,7 @@ static void rtl8192_init_priv_task(struct net_device* dev) { struct r8192_priv *priv = rtllib_priv(dev); -#ifdef PF_SYNCTHREAD - priv->priv_wq = create_workqueue(DRV_NAME,0); -#else priv->priv_wq = create_workqueue(DRV_NAME); -#endif INIT_WORK_RSL(&priv->reset_wq, (void*)rtl8192_restart, dev); INIT_WORK_RSL(&priv->rtllib->ips_leave_wq, (void*)IPSLeave_wq, dev); INIT_DELAYED_WORK_RSL(&priv->watch_dog_wq, (void*)rtl819x_watchdog_wqcallback, dev); diff --git a/trunk/drivers/staging/rtl8192e/rtllib_softmac.c b/trunk/drivers/staging/rtl8192e/rtllib_softmac.c index 281d51bdc54e..3cbfdeb6290e 100644 --- a/trunk/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/trunk/drivers/staging/rtl8192e/rtllib_softmac.c @@ -3262,11 +3262,7 @@ void rtllib_softmac_init(struct rtllib_device *ieee) (unsigned long) ieee); -#ifdef PF_SYNCTHREAD - ieee->wq = create_workqueue(DRV_NAME,0); -#else ieee->wq = create_workqueue(DRV_NAME); -#endif INIT_DELAYED_WORK_RSL(&ieee->link_change_wq,(void*)rtllib_link_change_wq,ieee); INIT_DELAYED_WORK_RSL(&ieee->start_ibss_wq,(void*)rtllib_start_ibss_wq,ieee);