github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-10 15:42:19 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Revert "net: wireless: bcmdhd: HACK - force active power mode"

Browse Source 
This reverts commit 956df1fbda.

Conflicts:

	drivers/net/wireless/bcmdhd/dhd_linux.c
This commit is contained in:
Dmitry Shmidt 2012-06-11 10:12:35 -07:00
parent 49c5e7668f
commit 8f620fa940
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/bcmdhd/dhd_linux.c
View File

@ -3010,7 +3010,7 @@ dhd_preinit_ioctls(dhd_pub_t *dhd)
char eventmask[WL_EVENTING_MASK_LEN];
char iovbuf[WL_EVENTING_MASK_LEN + 12]; /* Room for "event_msgs" + '\0' + bitvec */
uint power_mode = PM_OFF; /* PM_FAST; */
uint power_mode = PM_FAST;
uint32 dongle_align = DHD_SDALIGN;
uint32 glom = 0;
uint bcn_timeout = 4;

2
drivers/net/wireless/bcmdhd/wl_cfg80211.c
View File

@ -3204,7 +3204,7 @@ wl_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,
return err;
}
pm = PM_OFF; /* enabled ? PM_FAST : PM_OFF; */
pm = enabled ? PM_FAST : PM_OFF;
/* Do not enable the power save after assoc if it is p2p interface */
if (wl->p2p && wl->p2p->vif_created) {
WL_DBG(("Do not enable the power save for p2p interfaces even after assoc\n"));