[PATCH] iwconfig crashes if mesh interface is supported by FW.
Kiran Divekar
dkiran at marvell.com
Wed Feb 18 00:22:33 EST 2009
When FW supports mesh interface, the msh0 interface is created. There are s=
ome
wext handlers which are common for the eth0 and msh0 interface. The functio=
n
netdev_priv returns correct pointer for eth0, but incorrect pointer is retu=
rned
for msh0. Hence, iwconfig msh0 command crashes.
Added code to initialize ml_priv structure for eth0 interface and use the
ml_priv pointer for all eth0, msh0 and rtap interface.
Signed-off-by: Kiran Divekar <dkiran at marvell.com>
---
drivers/net/wireless/libertas/ethtool.c | 12 ++--
drivers/net/wireless/libertas/if_usb.c | 4 +-
drivers/net/wireless/libertas/main.c | 31 ++++++------
drivers/net/wireless/libertas/persistcfg.c | 16 +++---
drivers/net/wireless/libertas/scan.c | 4 +-
drivers/net/wireless/libertas/tx.c | 2 +-
drivers/net/wireless/libertas/wext.c | 72 ++++++++++++++----------=
----
7 files changed, 71 insertions(+), 70 deletions(-)
diff --git a/drivers/net/wireless/libertas/ethtool.c b/drivers/net/wireless=
/libertas/ethtool.c
index 61d2f50..b118a35 100644
--- a/drivers/net/wireless/libertas/ethtool.c
+++ b/drivers/net/wireless/libertas/ethtool.c
@@ -23,7 +23,7 @@ static const char * mesh_stat_strings[]=3D {
static void lbs_ethtool_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *info)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
snprintf(info->fw_version, 32, "%u.%u.%u.p%u",
priv->fwrelease >> 24 & 0xff,
@@ -47,7 +47,7 @@ static int lbs_ethtool_get_eeprom_len(struct net_device *=
dev)
static int lbs_ethtool_get_eeprom(struct net_device *dev,
struct ethtool_eeprom *eeprom, u8 * byte=
s)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
struct cmd_ds_802_11_eeprom_access cmd;
int ret;
@@ -76,7 +76,7 @@ out:
static void lbs_ethtool_get_stats(struct net_device *dev,
struct ethtool_stats *stats, uint64_t *da=
ta)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
struct cmd_ds_mesh_access mesh_access;
int ret;
@@ -113,7 +113,7 @@ static void lbs_ethtool_get_stats(struct net_device *de=
v,
static int lbs_ethtool_get_sset_count(struct net_device *dev, int sset)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
if (sset =3D=3D ETH_SS_STATS && dev =3D=3D priv->mesh_dev)
return MESH_STATS_NUM;
@@ -143,7 +143,7 @@ static void lbs_ethtool_get_strings(struct net_device *=
dev,
static void lbs_ethtool_get_wol(struct net_device *dev,
struct ethtool_wolinfo *wol)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
if (priv->wol_criteria =3D=3D 0xffffffff) {
/* Interface driver didn't configure wake */
@@ -166,7 +166,7 @@ static void lbs_ethtool_get_wol(struct net_device *dev,
static int lbs_ethtool_set_wol(struct net_device *dev,
struct ethtool_wolinfo *wol)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
uint32_t criteria =3D 0;
if (priv->wol_criteria =3D=3D 0xffffffff && wol->wolopts)
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/=
libertas/if_usb.c
index 2fc637a..ea3dc03 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -59,7 +59,7 @@ static int if_usb_reset_device(struct if_usb_card *cardp)=
;
static ssize_t if_usb_firmware_set(struct device *dev,
struct device_attribute *attr, const char *buf, size_t coun=
t)
{
- struct lbs_private *priv =3D netdev_priv(to_net_dev(dev));
+ struct lbs_private *priv =3D to_net_dev(dev)->ml_priv;
struct if_usb_card *cardp =3D priv->card;
char fwname[FIRMWARE_NAME_MAX];
int ret;
@@ -86,7 +86,7 @@ static DEVICE_ATTR(lbs_flash_fw, 0200, NULL, if_usb_firmw=
are_set);
static ssize_t if_usb_boot2_set(struct device *dev,
struct device_attribute *attr, const char *buf, size_t coun=
t)
{
- struct lbs_private *priv =3D netdev_priv(to_net_dev(dev));
+ struct lbs_private *priv =3D to_net_dev(dev)->ml_priv;
struct if_usb_card *cardp =3D priv->card;
char fwname[FIRMWARE_NAME_MAX];
int ret;
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/li=
bertas/main.c
index 4c73c4a..005c08c 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -222,7 +222,7 @@ u8 lbs_data_rate_to_fw_index(u32 rate)
static ssize_t lbs_anycast_get(struct device *dev,
struct device_attribute *attr, char * buf)
{
- struct lbs_private *priv =3D netdev_priv(to_net_dev(dev));
+ struct lbs_private *priv =3D to_net_dev(dev)->ml_priv;
struct cmd_ds_mesh_access mesh_access;
int ret;
@@ -241,7 +241,7 @@ static ssize_t lbs_anycast_get(struct device *dev,
static ssize_t lbs_anycast_set(struct device *dev,
struct device_attribute *attr, const char * buf, size_t cou=
nt)
{
- struct lbs_private *priv =3D netdev_priv(to_net_dev(dev));
+ struct lbs_private *priv =3D to_net_dev(dev)->ml_priv;
struct cmd_ds_mesh_access mesh_access;
uint32_t datum;
int ret;
@@ -263,7 +263,7 @@ static ssize_t lbs_anycast_set(struct device *dev,
static ssize_t lbs_prb_rsp_limit_get(struct device *dev,
struct device_attribute *attr, char *buf)
{
- struct lbs_private *priv =3D netdev_priv(to_net_dev(dev));
+ struct lbs_private *priv =3D to_net_dev(dev)->ml_priv;
struct cmd_ds_mesh_access mesh_access;
int ret;
u32 retry_limit;
@@ -286,7 +286,7 @@ static ssize_t lbs_prb_rsp_limit_get(struct device *dev=
,
static ssize_t lbs_prb_rsp_limit_set(struct device *dev,
struct device_attribute *attr, const char *buf, size_t coun=
t)
{
- struct lbs_private *priv =3D netdev_priv(to_net_dev(dev));
+ struct lbs_private *priv =3D to_net_dev(dev)->ml_priv;
struct cmd_ds_mesh_access mesh_access;
int ret;
unsigned long retry_limit;
@@ -321,7 +321,7 @@ static void lbs_remove_mesh(struct lbs_private *priv);
static ssize_t lbs_rtap_get(struct device *dev,
struct device_attribute *attr, char * buf)
{
- struct lbs_private *priv =3D netdev_priv(to_net_dev(dev));
+ struct lbs_private *priv =3D to_net_dev(dev)->ml_priv;
return snprintf(buf, 5, "0x%X\n", priv->monitormode);
}
@@ -332,7 +332,7 @@ static ssize_t lbs_rtap_set(struct device *dev,
struct device_attribute *attr, const char * buf, size_t cou=
nt)
{
int monitor_mode;
- struct lbs_private *priv =3D netdev_priv(to_net_dev(dev));
+ struct lbs_private *priv =3D to_net_dev(dev)->ml_priv;
sscanf(buf, "%x", &monitor_mode);
if (monitor_mode) {
@@ -383,7 +383,7 @@ static DEVICE_ATTR(lbs_rtap, 0644, lbs_rtap_get, lbs_rt=
ap_set );
static ssize_t lbs_mesh_get(struct device *dev,
struct device_attribute *attr, char * buf)
{
- struct lbs_private *priv =3D netdev_priv(to_net_dev(dev));
+ struct lbs_private *priv =3D to_net_dev(dev)->ml_priv;
return snprintf(buf, 5, "0x%X\n", !!priv->mesh_dev);
}
@@ -393,7 +393,7 @@ static ssize_t lbs_mesh_get(struct device *dev,
static ssize_t lbs_mesh_set(struct device *dev,
struct device_attribute *attr, const char * buf, size_t cou=
nt)
{
- struct lbs_private *priv =3D netdev_priv(to_net_dev(dev));
+ struct lbs_private *priv =3D to_net_dev(dev)->ml_priv;
int enable;
int ret, action =3D CMD_ACT_MESH_CONFIG_STOP;
@@ -452,7 +452,7 @@ static struct attribute_group lbs_mesh_attr_group =3D {
*/
static int lbs_dev_open(struct net_device *dev)
{
- struct lbs_private *priv =3D netdev_priv(dev) ;
+ struct lbs_private *priv =3D dev->ml_priv ;
int ret =3D 0;
lbs_deb_enter(LBS_DEB_NET);
@@ -521,7 +521,7 @@ static int lbs_mesh_stop(struct net_device *dev)
*/
static int lbs_eth_stop(struct net_device *dev)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
lbs_deb_enter(LBS_DEB_NET);
@@ -538,7 +538,7 @@ static int lbs_eth_stop(struct net_device *dev)
static void lbs_tx_timeout(struct net_device *dev)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
lbs_deb_enter(LBS_DEB_TX);
@@ -590,7 +590,7 @@ EXPORT_SYMBOL_GPL(lbs_host_to_card_done);
*/
static struct net_device_stats *lbs_get_stats(struct net_device *dev)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
lbs_deb_enter(LBS_DEB_NET);
return &priv->stats;
@@ -599,7 +599,7 @@ static struct net_device_stats *lbs_get_stats(struct ne=
t_device *dev)
static int lbs_set_mac_address(struct net_device *dev, void *addr)
{
int ret =3D 0;
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
struct sockaddr *phwaddr =3D addr;
struct cmd_ds_802_11_mac_address cmd;
@@ -732,7 +732,7 @@ static void lbs_set_mcast_worker(struct work_struct *wo=
rk)
static void lbs_set_multicast_list(struct net_device *dev)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
schedule_work(&priv->mcast_work);
}
@@ -748,7 +748,7 @@ static void lbs_set_multicast_list(struct net_device *d=
ev)
static int lbs_thread(void *data)
{
struct net_device *dev =3D data;
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
wait_queue_t wait;
lbs_deb_enter(LBS_DEB_THREAD);
@@ -1184,6 +1184,7 @@ struct lbs_private *lbs_add_card(void *card, struct d=
evice *dmdev)
goto done;
}
priv =3D netdev_priv(dev);
+ dev->ml_priv =3D priv;
if (lbs_init_adapter(priv)) {
lbs_pr_err("failed to initialize adapter structure.\n");
diff --git a/drivers/net/wireless/libertas/persistcfg.c b/drivers/net/wirel=
ess/libertas/persistcfg.c
index d42b7a5..18fe29f 100644
--- a/drivers/net/wireless/libertas/persistcfg.c
+++ b/drivers/net/wireless/libertas/persistcfg.c
@@ -18,7 +18,7 @@
static int mesh_get_default_parameters(struct device *dev,
struct mrvl_mesh_defaults *defs)
{
- struct lbs_private *priv =3D netdev_priv(to_net_dev(dev));
+ struct lbs_private *priv =3D to_net_dev(dev)->ml_priv;
struct cmd_ds_mesh_config cmd;
int ret;
@@ -57,7 +57,7 @@ static ssize_t bootflag_get(struct device *dev,
static ssize_t bootflag_set(struct device *dev, struct device_attribute *a=
ttr,
const char *buf, size_t count)
{
- struct lbs_private *priv =3D netdev_priv(to_net_dev(dev));
+ struct lbs_private *priv =3D to_net_dev(dev)->ml_priv;
struct cmd_ds_mesh_config cmd;
uint32_t datum;
int ret;
@@ -100,7 +100,7 @@ static ssize_t boottime_get(struct device *dev,
static ssize_t boottime_set(struct device *dev,
struct device_attribute *attr, const char *buf, size_t coun=
t)
{
- struct lbs_private *priv =3D netdev_priv(to_net_dev(dev));
+ struct lbs_private *priv =3D to_net_dev(dev)->ml_priv;
struct cmd_ds_mesh_config cmd;
uint32_t datum;
int ret;
@@ -152,7 +152,7 @@ static ssize_t channel_get(struct device *dev,
static ssize_t channel_set(struct device *dev, struct device_attribute *at=
tr,
const char *buf, size_t count)
{
- struct lbs_private *priv =3D netdev_priv(to_net_dev(dev));
+ struct lbs_private *priv =3D to_net_dev(dev)->ml_priv;
struct cmd_ds_mesh_config cmd;
uint32_t datum;
int ret;
@@ -210,7 +210,7 @@ static ssize_t mesh_id_set(struct device *dev, struct d=
evice_attribute *attr,
struct cmd_ds_mesh_config cmd;
struct mrvl_mesh_defaults defs;
struct mrvl_meshie *ie;
- struct lbs_private *priv =3D netdev_priv(to_net_dev(dev));
+ struct lbs_private *priv =3D to_net_dev(dev)->ml_priv;
int len;
int ret;
@@ -269,7 +269,7 @@ static ssize_t protocol_id_set(struct device *dev,
struct cmd_ds_mesh_config cmd;
struct mrvl_mesh_defaults defs;
struct mrvl_meshie *ie;
- struct lbs_private *priv =3D netdev_priv(to_net_dev(dev));
+ struct lbs_private *priv =3D to_net_dev(dev)->ml_priv;
uint32_t datum;
int ret;
@@ -323,7 +323,7 @@ static ssize_t metric_id_set(struct device *dev, struct=
device_attribute *attr,
struct cmd_ds_mesh_config cmd;
struct mrvl_mesh_defaults defs;
struct mrvl_meshie *ie;
- struct lbs_private *priv =3D netdev_priv(to_net_dev(dev));
+ struct lbs_private *priv =3D to_net_dev(dev)->ml_priv;
uint32_t datum;
int ret;
@@ -377,7 +377,7 @@ static ssize_t capability_set(struct device *dev, struc=
t device_attribute *attr,
struct cmd_ds_mesh_config cmd;
struct mrvl_mesh_defaults defs;
struct mrvl_meshie *ie;
- struct lbs_private *priv =3D netdev_priv(to_net_dev(dev));
+ struct lbs_private *priv =3D to_net_dev(dev)->ml_priv;
uint32_t datum;
int ret;
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/li=
bertas/scan.c
index 57f6c12..9014950 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_requ=
est_info *info,
union iwreq_data *wrqu, char *extra)
{
DECLARE_SSID_BUF(ssid);
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
int ret =3D 0;
lbs_deb_enter(LBS_DEB_WEXT);
@@ -1008,7 +1008,7 @@ int lbs_get_scan(struct net_device *dev, struct iw_re=
quest_info *info,
struct iw_point *dwrq, char *extra)
{
#define SCAN_ITEM_SIZE 128
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
int err =3D 0;
char *ev =3D extra;
char *stop =3D ev + dwrq->length;
diff --git a/drivers/net/wireless/libertas/tx.c b/drivers/net/wireless/libe=
rtas/tx.c
index cad477f..bc983ed 100644
--- a/drivers/net/wireless/libertas/tx.c
+++ b/drivers/net/wireless/libertas/tx.c
@@ -60,7 +60,7 @@ static u32 convert_radiotap_rate_to_mv(u8 rate)
int lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
unsigned long flags;
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
struct txpd *txpd;
char *p802x_hdr;
uint16_t pkt_len;
diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/li=
bertas/wext.c
index c6102e0..f16d136 100644
--- a/drivers/net/wireless/libertas/wext.c
+++ b/drivers/net/wireless/libertas/wext.c
@@ -163,7 +163,7 @@ static int lbs_get_name(struct net_device *dev, struct =
iw_request_info *info,
static int lbs_get_freq(struct net_device *dev, struct iw_request_info *in=
fo,
struct iw_freq *fwrq, char *extra)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
struct chan_freq_power *cfp;
lbs_deb_enter(LBS_DEB_WEXT);
@@ -189,7 +189,7 @@ static int lbs_get_freq(struct net_device *dev, struct =
iw_request_info *info,
static int lbs_get_wap(struct net_device *dev, struct iw_request_info *inf=
o,
struct sockaddr *awrq, char *extra)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
lbs_deb_enter(LBS_DEB_WEXT);
@@ -207,7 +207,7 @@ static int lbs_get_wap(struct net_device *dev, struct i=
w_request_info *info,
static int lbs_set_nick(struct net_device *dev, struct iw_request_info *in=
fo,
struct iw_point *dwrq, char *extra)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
lbs_deb_enter(LBS_DEB_WEXT);
@@ -231,7 +231,7 @@ static int lbs_set_nick(struct net_device *dev, struct =
iw_request_info *info,
static int lbs_get_nick(struct net_device *dev, struct iw_request_info *in=
fo,
struct iw_point *dwrq, char *extra)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
lbs_deb_enter(LBS_DEB_WEXT);
@@ -248,7 +248,7 @@ static int lbs_get_nick(struct net_device *dev, struct =
iw_request_info *info,
static int mesh_get_nick(struct net_device *dev, struct iw_request_info *i=
nfo,
struct iw_point *dwrq, char *extra)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
lbs_deb_enter(LBS_DEB_WEXT);
@@ -273,7 +273,7 @@ static int lbs_set_rts(struct net_device *dev, struct i=
w_request_info *info,
struct iw_param *vwrq, char *extra)
{
int ret =3D 0;
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
u32 val =3D vwrq->value;
lbs_deb_enter(LBS_DEB_WEXT);
@@ -293,7 +293,7 @@ static int lbs_set_rts(struct net_device *dev, struct i=
w_request_info *info,
static int lbs_get_rts(struct net_device *dev, struct iw_request_info *inf=
o,
struct iw_param *vwrq, char *extra)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
int ret =3D 0;
u16 val =3D 0;
@@ -315,7 +315,7 @@ out:
static int lbs_set_frag(struct net_device *dev, struct iw_request_info *in=
fo,
struct iw_param *vwrq, char *extra)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
int ret =3D 0;
u32 val =3D vwrq->value;
@@ -336,7 +336,7 @@ static int lbs_set_frag(struct net_device *dev, struct =
iw_request_info *info,
static int lbs_get_frag(struct net_device *dev, struct iw_request_info *in=
fo,
struct iw_param *vwrq, char *extra)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
int ret =3D 0;
u16 val =3D 0;
@@ -359,7 +359,7 @@ out:
static int lbs_get_mode(struct net_device *dev,
struct iw_request_info *info, u32 * uwrq, char *ex=
tra)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
lbs_deb_enter(LBS_DEB_WEXT);
@@ -385,7 +385,7 @@ static int lbs_get_txpow(struct net_device *dev,
struct iw_request_info *info,
struct iw_param *vwrq, char *extra)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
s16 curlevel =3D 0;
int ret =3D 0;
@@ -418,7 +418,7 @@ out:
static int lbs_set_retry(struct net_device *dev, struct iw_request_info *i=
nfo,
struct iw_param *vwrq, char *extra)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
int ret =3D 0;
u16 slimit =3D 0, llimit =3D 0;
@@ -466,7 +466,7 @@ out:
static int lbs_get_retry(struct net_device *dev, struct iw_request_info *i=
nfo,
struct iw_param *vwrq, char *extra)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
int ret =3D 0;
u16 val =3D 0;
@@ -542,7 +542,7 @@ static int lbs_get_range(struct net_device *dev, struct=
iw_request_info *info,
struct iw_point *dwrq, char *extra)
{
int i, j;
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
struct iw_range *range =3D (struct iw_range *)extra;
struct chan_freq_power *cfp;
u8 rates[MAX_RATES + 1];
@@ -708,7 +708,7 @@ out:
static int lbs_set_power(struct net_device *dev, struct iw_request_info *i=
nfo,
struct iw_param *vwrq, char *extra)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
lbs_deb_enter(LBS_DEB_WEXT);
@@ -758,7 +758,7 @@ static int lbs_set_power(struct net_device *dev, struct=
iw_request_info *info,
static int lbs_get_power(struct net_device *dev, struct iw_request_info *i=
nfo,
struct iw_param *vwrq, char *extra)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
lbs_deb_enter(LBS_DEB_WEXT);
@@ -781,7 +781,7 @@ static struct iw_statistics *lbs_get_wireless_stats(str=
uct net_device *dev)
EXCELLENT =3D 95,
PERFECT =3D 100
};
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
u32 rssi_qual;
u32 tx_qual;
u32 quality =3D 0;
@@ -886,7 +886,7 @@ static int lbs_set_freq(struct net_device *dev, struct =
iw_request_info *info,
struct iw_freq *fwrq, char *extra)
{
int ret =3D -EINVAL;
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
struct chan_freq_power *cfp;
struct assoc_request * assoc_req;
@@ -943,7 +943,7 @@ static int lbs_mesh_set_freq(struct net_device *dev,
struct iw_request_info *info,
struct iw_freq *fwrq, char *extra)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
struct chan_freq_power *cfp;
int ret =3D -EINVAL;
@@ -994,7 +994,7 @@ out:
static int lbs_set_rate(struct net_device *dev, struct iw_request_info *in=
fo,
struct iw_param *vwrq, char *extra)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
u8 new_rate =3D 0;
int ret =3D -EINVAL;
u8 rates[MAX_RATES + 1];
@@ -1054,7 +1054,7 @@ out:
static int lbs_get_rate(struct net_device *dev, struct iw_request_info *in=
fo,
struct iw_param *vwrq, char *extra)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
lbs_deb_enter(LBS_DEB_WEXT);
@@ -1079,7 +1079,7 @@ static int lbs_set_mode(struct net_device *dev,
struct iw_request_info *info, u32 * uwrq, char *extra)
{
int ret =3D 0;
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
struct assoc_request * assoc_req;
lbs_deb_enter(LBS_DEB_WEXT);
@@ -1124,7 +1124,7 @@ static int lbs_get_encode(struct net_device *dev,
struct iw_request_info *info,
struct iw_point *dwrq, u8 * extra)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
int index =3D (dwrq->flags & IW_ENCODE_INDEX) - 1;
lbs_deb_enter(LBS_DEB_WEXT);
@@ -1319,7 +1319,7 @@ static int lbs_set_encode(struct net_device *dev,
struct iw_point *dwrq, char *extra)
{
int ret =3D 0;
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
struct assoc_request * assoc_req;
u16 is_default =3D 0, index =3D 0, set_tx_key =3D 0;
@@ -1395,7 +1395,7 @@ static int lbs_get_encodeext(struct net_device *dev,
char *extra)
{
int ret =3D -EINVAL;
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
struct iw_encode_ext *ext =3D (struct iw_encode_ext *)extra;
int index, max_key_len;
@@ -1501,7 +1501,7 @@ static int lbs_set_encodeext(struct net_device *dev,
char *extra)
{
int ret =3D 0;
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
struct iw_encode_ext *ext =3D (struct iw_encode_ext *)extra;
int alg =3D ext->alg;
struct assoc_request * assoc_req;
@@ -1639,7 +1639,7 @@ static int lbs_set_genie(struct net_device *dev,
struct iw_point *dwrq,
char *extra)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
int ret =3D 0;
struct assoc_request * assoc_req;
@@ -1685,7 +1685,7 @@ static int lbs_get_genie(struct net_device *dev,
char *extra)
{
int ret =3D 0;
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
lbs_deb_enter(LBS_DEB_WEXT);
@@ -1713,7 +1713,7 @@ static int lbs_set_auth(struct net_device *dev,
struct iw_param *dwrq,
char *extra)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
struct assoc_request * assoc_req;
int ret =3D 0;
int updated =3D 0;
@@ -1816,7 +1816,7 @@ static int lbs_get_auth(struct net_device *dev,
char *extra)
{
int ret =3D 0;
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
lbs_deb_enter(LBS_DEB_WEXT);
@@ -1857,7 +1857,7 @@ static int lbs_set_txpow(struct net_device *dev, stru=
ct iw_request_info *info,
struct iw_param *vwrq, char *extra)
{
int ret =3D 0;
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
s16 dbm =3D (s16) vwrq->value;
lbs_deb_enter(LBS_DEB_WEXT);
@@ -1936,7 +1936,7 @@ out:
static int lbs_get_essid(struct net_device *dev, struct iw_request_info *i=
nfo,
struct iw_point *dwrq, char *extra)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
lbs_deb_enter(LBS_DEB_WEXT);
@@ -1971,7 +1971,7 @@ static int lbs_get_essid(struct net_device *dev, stru=
ct iw_request_info *info,
static int lbs_set_essid(struct net_device *dev, struct iw_request_info *i=
nfo,
struct iw_point *dwrq, char *extra)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
int ret =3D 0;
u8 ssid[IW_ESSID_MAX_SIZE];
u8 ssid_len =3D 0;
@@ -2040,7 +2040,7 @@ static int lbs_mesh_get_essid(struct net_device *dev,
struct iw_request_info *info,
struct iw_point *dwrq, char *extra)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
lbs_deb_enter(LBS_DEB_WEXT);
@@ -2058,7 +2058,7 @@ static int lbs_mesh_set_essid(struct net_device *dev,
struct iw_request_info *info,
struct iw_point *dwrq, char *extra)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
int ret =3D 0;
lbs_deb_enter(LBS_DEB_WEXT);
@@ -2102,7 +2102,7 @@ static int lbs_mesh_set_essid(struct net_device *dev,
static int lbs_set_wap(struct net_device *dev, struct iw_request_info *inf=
o,
struct sockaddr *awrq, char *extra)
{
- struct lbs_private *priv =3D netdev_priv(dev);
+ struct lbs_private *priv =3D dev->ml_priv;
struct assoc_request * assoc_req;
int ret =3D 0;
--
1.5.3.4
More information about the libertas-dev
mailing list