diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-28 15:34:24 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-28 15:34:24 -0800 |
| commit | 98f8948f13b4d27c3695c49ac9a970a77166f9ee (patch) | |
| tree | a1bd981bea09615100881e841f78ed8122215774 /drivers/net/wireless/libertas/scan.c | |
| parent | 7958a45310519811134a5b911d863201786978ab (diff) | |
| parent | ab65f649d38d910f48843a275f3f0596cdbf28bf (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/libertas/scan.c')
| -rw-r--r-- | drivers/net/wireless/libertas/scan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c index 57f6c12cda20..9014950f4328 100644 --- a/drivers/net/wireless/libertas/scan.c +++ b/drivers/net/wireless/libertas/scan.c @@ -945,7 +945,7 @@ int lbs_set_scan(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { DECLARE_SSID_BUF(ssid); - struct lbs_private *priv = netdev_priv(dev); + struct lbs_private *priv = dev->ml_priv; int ret = 0; lbs_deb_enter(LBS_DEB_WEXT); @@ -1008,7 +1008,7 @@ int lbs_get_scan(struct net_device *dev, struct iw_request_info *info, struct iw_point *dwrq, char *extra) { #define SCAN_ITEM_SIZE 128 - struct lbs_private *priv = netdev_priv(dev); + struct lbs_private *priv = dev->ml_priv; int err = 0; char *ev = extra; char *stop = ev + dwrq->length; |