summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/bcmdhd/wldev_common.c
diff options
context:
space:
mode:
authorHoward M. Harte <hharte@broadcom.com>2011-06-15 18:52:15 -0700
committerDmitry Shmidt <dimitrysh@google.com>2011-06-17 10:42:54 -0700
commit0d9f3c2791c1e19796d3a41d8ec45093583817e7 (patch)
treee39143aca1da3943af7945677dd79f1ae6811ebf /drivers/net/wireless/bcmdhd/wldev_common.c
parent097d39641dc94f9e5891481e066ef14b12cca408 (diff)
net: wireless: bcmdhd: Combined patch from 4.218.248-31
bcmdhd: Allocate skb with GFP_KERNEL flag if possible: fix for older kernels. bcmdhd: Fix race conditions for sysioc_thread * Fix up formatting and #ifdefs. net: wireless: bcmdhd: Fix get_customized_country_code() for older kernels. net: wireless: bcmdhd: Move PNO function prototypes to dhd.h. Add private command support. net: wireless: bcmdhd: Set proper read barrier net: wireless: bcmdhd: Fix memory leak in case of dhd_bus_init() failure net: wireless: bcmdhd: Fix wake_lock symmetry net: wireless: bcmdhd: Ignore error if scan results are empty net: wireless: bcmdhd: Add sdlock to firmware loading net: wireless: bcmdhd: Fix watchdog syncronization during start/stop net: wireless: bcmdhd: Fix Makefile to allow WEXT compilation Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'drivers/net/wireless/bcmdhd/wldev_common.c')
-rw-r--r--drivers/net/wireless/bcmdhd/wldev_common.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/net/wireless/bcmdhd/wldev_common.c b/drivers/net/wireless/bcmdhd/wldev_common.c
index c81fccad6c2d..1afb54c1454c 100644
--- a/drivers/net/wireless/bcmdhd/wldev_common.c
+++ b/drivers/net/wireless/bcmdhd/wldev_common.c
@@ -236,3 +236,19 @@ s32 wldev_iovar_getint_bsscfg(
}
return err;
}
+
+int
+wldev_get_link_speed(
+ struct net_device *dev)
+{
+ int error;
+ int link_speed;
+
+ error = wldev_ioctl(dev, WLC_GET_RATE, &link_speed, sizeof(link_speed), 0);
+ if (error < 0)
+ return error;
+ /* Convert internal 500Kbps to Kbps */
+ link_speed *= 500;
+
+ return link_speed;
+}