Commit 543b4e66 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by Jeff Garzik

[wireless prism54] use netdev_priv() helper

parent 2bb0a0bb
...@@ -250,7 +250,7 @@ prism54_update_stats(islpci_private *priv) ...@@ -250,7 +250,7 @@ prism54_update_stats(islpci_private *priv)
struct iw_statistics * struct iw_statistics *
prism54_get_wireless_stats(struct net_device *ndev) prism54_get_wireless_stats(struct net_device *ndev)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
/* If the stats are being updated return old data */ /* If the stats are being updated return old data */
if (down_trylock(&priv->stats_sem) == 0) { if (down_trylock(&priv->stats_sem) == 0) {
...@@ -277,7 +277,7 @@ static int ...@@ -277,7 +277,7 @@ static int
prism54_commit(struct net_device *ndev, struct iw_request_info *info, prism54_commit(struct net_device *ndev, struct iw_request_info *info,
char *cwrq, char *extra) char *cwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
/* simply re-set the last set SSID, this should commit most stuff */ /* simply re-set the last set SSID, this should commit most stuff */
...@@ -293,7 +293,7 @@ static int ...@@ -293,7 +293,7 @@ static int
prism54_get_name(struct net_device *ndev, struct iw_request_info *info, prism54_get_name(struct net_device *ndev, struct iw_request_info *info,
char *cwrq, char *extra) char *cwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
char *capabilities; char *capabilities;
union oid_res_t r; union oid_res_t r;
int rvalue; int rvalue;
...@@ -324,7 +324,7 @@ static int ...@@ -324,7 +324,7 @@ static int
prism54_set_freq(struct net_device *ndev, struct iw_request_info *info, prism54_set_freq(struct net_device *ndev, struct iw_request_info *info,
struct iw_freq *fwrq, char *extra) struct iw_freq *fwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
int rvalue; int rvalue;
u32 c = 0; u32 c = 0;
...@@ -363,7 +363,7 @@ static int ...@@ -363,7 +363,7 @@ static int
prism54_get_freq(struct net_device *ndev, struct iw_request_info *info, prism54_get_freq(struct net_device *ndev, struct iw_request_info *info,
struct iw_freq *fwrq, char *extra) struct iw_freq *fwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
union oid_res_t r; union oid_res_t r;
int rvalue; int rvalue;
...@@ -379,7 +379,7 @@ static int ...@@ -379,7 +379,7 @@ static int
prism54_set_mode(struct net_device *ndev, struct iw_request_info *info, prism54_set_mode(struct net_device *ndev, struct iw_request_info *info,
__u32 * uwrq, char *extra) __u32 * uwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
u32 mlmeautolevel = CARD_DEFAULT_MLME_MODE; u32 mlmeautolevel = CARD_DEFAULT_MLME_MODE;
/* Let's see if the user passed a valid Linux Wireless mode */ /* Let's see if the user passed a valid Linux Wireless mode */
...@@ -420,7 +420,7 @@ static int ...@@ -420,7 +420,7 @@ static int
prism54_get_mode(struct net_device *ndev, struct iw_request_info *info, prism54_get_mode(struct net_device *ndev, struct iw_request_info *info,
__u32 * uwrq, char *extra) __u32 * uwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
BUG_ON((priv->iw_mode < IW_MODE_AUTO) || (priv->iw_mode > BUG_ON((priv->iw_mode < IW_MODE_AUTO) || (priv->iw_mode >
IW_MODE_MONITOR)); IW_MODE_MONITOR));
...@@ -438,7 +438,7 @@ static int ...@@ -438,7 +438,7 @@ static int
prism54_set_sens(struct net_device *ndev, struct iw_request_info *info, prism54_set_sens(struct net_device *ndev, struct iw_request_info *info,
struct iw_param *vwrq, char *extra) struct iw_param *vwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
u32 sens; u32 sens;
/* by default the card sets this to 20. */ /* by default the card sets this to 20. */
...@@ -452,7 +452,7 @@ static int ...@@ -452,7 +452,7 @@ static int
prism54_get_sens(struct net_device *ndev, struct iw_request_info *info, prism54_get_sens(struct net_device *ndev, struct iw_request_info *info,
struct iw_param *vwrq, char *extra) struct iw_param *vwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
union oid_res_t r; union oid_res_t r;
int rvalue; int rvalue;
...@@ -470,7 +470,7 @@ prism54_get_range(struct net_device *ndev, struct iw_request_info *info, ...@@ -470,7 +470,7 @@ prism54_get_range(struct net_device *ndev, struct iw_request_info *info,
struct iw_point *dwrq, char *extra) struct iw_point *dwrq, char *extra)
{ {
struct iw_range *range = (struct iw_range *) extra; struct iw_range *range = (struct iw_range *) extra;
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
char *data; char *data;
int i, m, rvalue; int i, m, rvalue;
struct obj_frequencies *freq; struct obj_frequencies *freq;
...@@ -576,7 +576,7 @@ static int ...@@ -576,7 +576,7 @@ static int
prism54_set_wap(struct net_device *ndev, struct iw_request_info *info, prism54_set_wap(struct net_device *ndev, struct iw_request_info *info,
struct sockaddr *awrq, char *extra) struct sockaddr *awrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
char bssid[6]; char bssid[6];
int rvalue; int rvalue;
...@@ -598,7 +598,7 @@ static int ...@@ -598,7 +598,7 @@ static int
prism54_get_wap(struct net_device *ndev, struct iw_request_info *info, prism54_get_wap(struct net_device *ndev, struct iw_request_info *info,
struct sockaddr *awrq, char *extra) struct sockaddr *awrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
union oid_res_t r; union oid_res_t r;
int rvalue; int rvalue;
...@@ -630,7 +630,7 @@ prism54_translate_bss(struct net_device *ndev, char *current_ev, ...@@ -630,7 +630,7 @@ prism54_translate_bss(struct net_device *ndev, char *current_ev,
{ {
struct iw_event iwe; /* Temporary buffer */ struct iw_event iwe; /* Temporary buffer */
short cap; short cap;
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
/* The first entry must be the MAC address */ /* The first entry must be the MAC address */
memcpy(iwe.u.ap_addr.sa_data, bss->address, 6); memcpy(iwe.u.ap_addr.sa_data, bss->address, 6);
...@@ -721,7 +721,7 @@ int ...@@ -721,7 +721,7 @@ int
prism54_get_scan(struct net_device *ndev, struct iw_request_info *info, prism54_get_scan(struct net_device *ndev, struct iw_request_info *info,
struct iw_point *dwrq, char *extra) struct iw_point *dwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
int i, rvalue; int i, rvalue;
struct obj_bsslist *bsslist; struct obj_bsslist *bsslist;
u32 noise = 0; u32 noise = 0;
...@@ -762,7 +762,7 @@ static int ...@@ -762,7 +762,7 @@ static int
prism54_set_essid(struct net_device *ndev, struct iw_request_info *info, prism54_set_essid(struct net_device *ndev, struct iw_request_info *info,
struct iw_point *dwrq, char *extra) struct iw_point *dwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
struct obj_ssid essid; struct obj_ssid essid;
memset(essid.octets, 0, 33); memset(essid.octets, 0, 33);
...@@ -789,7 +789,7 @@ static int ...@@ -789,7 +789,7 @@ static int
prism54_get_essid(struct net_device *ndev, struct iw_request_info *info, prism54_get_essid(struct net_device *ndev, struct iw_request_info *info,
struct iw_point *dwrq, char *extra) struct iw_point *dwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
struct obj_ssid *essid; struct obj_ssid *essid;
union oid_res_t r; union oid_res_t r;
int rvalue; int rvalue;
...@@ -819,7 +819,7 @@ static int ...@@ -819,7 +819,7 @@ static int
prism54_set_nick(struct net_device *ndev, struct iw_request_info *info, prism54_set_nick(struct net_device *ndev, struct iw_request_info *info,
struct iw_point *dwrq, char *extra) struct iw_point *dwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
if (dwrq->length > IW_ESSID_MAX_SIZE) if (dwrq->length > IW_ESSID_MAX_SIZE)
return -E2BIG; return -E2BIG;
...@@ -836,7 +836,7 @@ static int ...@@ -836,7 +836,7 @@ static int
prism54_get_nick(struct net_device *ndev, struct iw_request_info *info, prism54_get_nick(struct net_device *ndev, struct iw_request_info *info,
struct iw_point *dwrq, char *extra) struct iw_point *dwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
dwrq->length = 0; dwrq->length = 0;
...@@ -856,7 +856,7 @@ prism54_set_rate(struct net_device *ndev, ...@@ -856,7 +856,7 @@ prism54_set_rate(struct net_device *ndev,
struct iw_param *vwrq, char *extra) struct iw_param *vwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
u32 rate, profile; u32 rate, profile;
char *data; char *data;
int ret, i; int ret, i;
...@@ -924,7 +924,7 @@ prism54_get_rate(struct net_device *ndev, ...@@ -924,7 +924,7 @@ prism54_get_rate(struct net_device *ndev,
struct iw_request_info *info, struct iw_request_info *info,
struct iw_param *vwrq, char *extra) struct iw_param *vwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
int rvalue; int rvalue;
char *data; char *data;
union oid_res_t r; union oid_res_t r;
...@@ -948,7 +948,7 @@ static int ...@@ -948,7 +948,7 @@ static int
prism54_set_rts(struct net_device *ndev, struct iw_request_info *info, prism54_set_rts(struct net_device *ndev, struct iw_request_info *info,
struct iw_param *vwrq, char *extra) struct iw_param *vwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
return mgt_set_request(priv, DOT11_OID_RTSTHRESH, 0, &vwrq->value); return mgt_set_request(priv, DOT11_OID_RTSTHRESH, 0, &vwrq->value);
} }
...@@ -957,7 +957,7 @@ static int ...@@ -957,7 +957,7 @@ static int
prism54_get_rts(struct net_device *ndev, struct iw_request_info *info, prism54_get_rts(struct net_device *ndev, struct iw_request_info *info,
struct iw_param *vwrq, char *extra) struct iw_param *vwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
union oid_res_t r; union oid_res_t r;
int rvalue; int rvalue;
...@@ -972,7 +972,7 @@ static int ...@@ -972,7 +972,7 @@ static int
prism54_set_frag(struct net_device *ndev, struct iw_request_info *info, prism54_set_frag(struct net_device *ndev, struct iw_request_info *info,
struct iw_param *vwrq, char *extra) struct iw_param *vwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
return mgt_set_request(priv, DOT11_OID_FRAGTHRESH, 0, &vwrq->value); return mgt_set_request(priv, DOT11_OID_FRAGTHRESH, 0, &vwrq->value);
} }
...@@ -981,7 +981,7 @@ static int ...@@ -981,7 +981,7 @@ static int
prism54_get_frag(struct net_device *ndev, struct iw_request_info *info, prism54_get_frag(struct net_device *ndev, struct iw_request_info *info,
struct iw_param *vwrq, char *extra) struct iw_param *vwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
union oid_res_t r; union oid_res_t r;
int rvalue; int rvalue;
...@@ -1004,7 +1004,7 @@ static int ...@@ -1004,7 +1004,7 @@ static int
prism54_set_retry(struct net_device *ndev, struct iw_request_info *info, prism54_set_retry(struct net_device *ndev, struct iw_request_info *info,
struct iw_param *vwrq, char *extra) struct iw_param *vwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
u32 slimit = 0, llimit = 0; /* short and long limit */ u32 slimit = 0, llimit = 0; /* short and long limit */
u32 lifetime = 0; u32 lifetime = 0;
int rvalue = 0; int rvalue = 0;
...@@ -1048,7 +1048,7 @@ static int ...@@ -1048,7 +1048,7 @@ static int
prism54_get_retry(struct net_device *ndev, struct iw_request_info *info, prism54_get_retry(struct net_device *ndev, struct iw_request_info *info,
struct iw_param *vwrq, char *extra) struct iw_param *vwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
union oid_res_t r; union oid_res_t r;
int rvalue = 0; int rvalue = 0;
vwrq->disabled = 0; /* It cannot be disabled */ vwrq->disabled = 0; /* It cannot be disabled */
...@@ -1080,7 +1080,7 @@ static int ...@@ -1080,7 +1080,7 @@ static int
prism54_set_encode(struct net_device *ndev, struct iw_request_info *info, prism54_set_encode(struct net_device *ndev, struct iw_request_info *info,
struct iw_point *dwrq, char *extra) struct iw_point *dwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
int rvalue = 0, force = 0; int rvalue = 0, force = 0;
int authen = DOT11_AUTH_OS, invoke = 0, exunencrypt = 0; int authen = DOT11_AUTH_OS, invoke = 0, exunencrypt = 0;
union oid_res_t r; union oid_res_t r;
...@@ -1170,7 +1170,7 @@ static int ...@@ -1170,7 +1170,7 @@ static int
prism54_get_encode(struct net_device *ndev, struct iw_request_info *info, prism54_get_encode(struct net_device *ndev, struct iw_request_info *info,
struct iw_point *dwrq, char *extra) struct iw_point *dwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
struct obj_key *key; struct obj_key *key;
u32 devindex, index = (dwrq->flags & IW_ENCODE_INDEX) - 1; u32 devindex, index = (dwrq->flags & IW_ENCODE_INDEX) - 1;
u32 authen = 0, invoke = 0, exunencrypt = 0; u32 authen = 0, invoke = 0, exunencrypt = 0;
...@@ -1218,7 +1218,7 @@ static int ...@@ -1218,7 +1218,7 @@ static int
prism54_get_txpower(struct net_device *ndev, struct iw_request_info *info, prism54_get_txpower(struct net_device *ndev, struct iw_request_info *info,
struct iw_param *vwrq, char *extra) struct iw_param *vwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
union oid_res_t r; union oid_res_t r;
int rvalue; int rvalue;
...@@ -1238,7 +1238,7 @@ static int ...@@ -1238,7 +1238,7 @@ static int
prism54_set_txpower(struct net_device *ndev, struct iw_request_info *info, prism54_set_txpower(struct net_device *ndev, struct iw_request_info *info,
struct iw_param *vwrq, char *extra) struct iw_param *vwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
s32 u = vwrq->value; s32 u = vwrq->value;
/* intersil firmware operates in 0.25 dBm (1/4) */ /* intersil firmware operates in 0.25 dBm (1/4) */
...@@ -1264,7 +1264,7 @@ static int ...@@ -1264,7 +1264,7 @@ static int
prism54_reset(struct net_device *ndev, struct iw_request_info *info, prism54_reset(struct net_device *ndev, struct iw_request_info *info,
__u32 * uwrq, char *extra) __u32 * uwrq, char *extra)
{ {
islpci_reset(ndev->priv, 0); islpci_reset(netdev_priv(ndev), 0);
return 0; return 0;
} }
...@@ -1273,7 +1273,7 @@ static int ...@@ -1273,7 +1273,7 @@ static int
prism54_set_beacon(struct net_device *ndev, struct iw_request_info *info, prism54_set_beacon(struct net_device *ndev, struct iw_request_info *info,
__u32 * uwrq, char *extra) __u32 * uwrq, char *extra)
{ {
int rvalue = mgt_set_request((islpci_private *) ndev->priv, int rvalue = mgt_set_request((islpci_private *) netdev_priv(ndev),
DOT11_OID_BEACONPERIOD, 0, uwrq); DOT11_OID_BEACONPERIOD, 0, uwrq);
return (rvalue ? rvalue : -EINPROGRESS); return (rvalue ? rvalue : -EINPROGRESS);
...@@ -1287,7 +1287,7 @@ prism54_get_beacon(struct net_device *ndev, struct iw_request_info *info, ...@@ -1287,7 +1287,7 @@ prism54_get_beacon(struct net_device *ndev, struct iw_request_info *info,
int rvalue; int rvalue;
rvalue = rvalue =
mgt_get_request((islpci_private *) ndev->priv, mgt_get_request((islpci_private *) netdev_priv(ndev),
DOT11_OID_BEACONPERIOD, 0, NULL, &r); DOT11_OID_BEACONPERIOD, 0, NULL, &r);
*uwrq = r.u; *uwrq = r.u;
...@@ -1337,7 +1337,7 @@ static int ...@@ -1337,7 +1337,7 @@ static int
prism54_add_mac(struct net_device *ndev, struct iw_request_info *info, prism54_add_mac(struct net_device *ndev, struct iw_request_info *info,
struct sockaddr *awrq, char *extra) struct sockaddr *awrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
struct islpci_acl *acl = &priv->acl; struct islpci_acl *acl = &priv->acl;
struct mac_entry *entry; struct mac_entry *entry;
struct sockaddr *addr = (struct sockaddr *) extra; struct sockaddr *addr = (struct sockaddr *) extra;
...@@ -1366,7 +1366,7 @@ static int ...@@ -1366,7 +1366,7 @@ static int
prism54_del_mac(struct net_device *ndev, struct iw_request_info *info, prism54_del_mac(struct net_device *ndev, struct iw_request_info *info,
struct sockaddr *awrq, char *extra) struct sockaddr *awrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
struct islpci_acl *acl = &priv->acl; struct islpci_acl *acl = &priv->acl;
struct mac_entry *entry; struct mac_entry *entry;
struct list_head *ptr; struct list_head *ptr;
...@@ -1396,7 +1396,7 @@ static int ...@@ -1396,7 +1396,7 @@ static int
prism54_get_mac(struct net_device *ndev, struct iw_request_info *info, prism54_get_mac(struct net_device *ndev, struct iw_request_info *info,
struct iw_point *dwrq, char *extra) struct iw_point *dwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
struct islpci_acl *acl = &priv->acl; struct islpci_acl *acl = &priv->acl;
struct mac_entry *entry; struct mac_entry *entry;
struct list_head *ptr; struct list_head *ptr;
...@@ -1427,7 +1427,7 @@ static int ...@@ -1427,7 +1427,7 @@ static int
prism54_set_policy(struct net_device *ndev, struct iw_request_info *info, prism54_set_policy(struct net_device *ndev, struct iw_request_info *info,
__u32 * uwrq, char *extra) __u32 * uwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
struct islpci_acl *acl = &priv->acl; struct islpci_acl *acl = &priv->acl;
u32 mlmeautolevel; u32 mlmeautolevel;
...@@ -1460,7 +1460,7 @@ static int ...@@ -1460,7 +1460,7 @@ static int
prism54_get_policy(struct net_device *ndev, struct iw_request_info *info, prism54_get_policy(struct net_device *ndev, struct iw_request_info *info,
__u32 * uwrq, char *extra) __u32 * uwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
struct islpci_acl *acl = &priv->acl; struct islpci_acl *acl = &priv->acl;
*uwrq = acl->policy; *uwrq = acl->policy;
...@@ -1511,7 +1511,7 @@ prism54_kick_all(struct net_device *ndev, struct iw_request_info *info, ...@@ -1511,7 +1511,7 @@ prism54_kick_all(struct net_device *ndev, struct iw_request_info *info,
/* Tell the card to kick every client */ /* Tell the card to kick every client */
mlme->id = cpu_to_le16(0); mlme->id = cpu_to_le16(0);
rvalue = mgt_set_request(ndev->priv, DOT11_OID_DISASSOCIATE, 0, mlme); rvalue = mgt_set_request(netdev_priv(ndev), DOT11_OID_DISASSOCIATE, 0, mlme);
kfree(mlme); kfree(mlme);
return rvalue; return rvalue;
...@@ -1535,7 +1535,7 @@ prism54_kick_mac(struct net_device *ndev, struct iw_request_info *info, ...@@ -1535,7 +1535,7 @@ prism54_kick_mac(struct net_device *ndev, struct iw_request_info *info,
/* Tell the card to only kick the corresponding bastard */ /* Tell the card to only kick the corresponding bastard */
memcpy(mlme->address, addr->sa_data, ETH_ALEN); memcpy(mlme->address, addr->sa_data, ETH_ALEN);
mlme->id = cpu_to_le16(-1); mlme->id = cpu_to_le16(-1);
rvalue = mgt_set_request(ndev->priv, DOT11_OID_DISASSOCIATE, 0, mlme); rvalue = mgt_set_request(netdev_priv(ndev), DOT11_OID_DISASSOCIATE, 0, mlme);
kfree(mlme); kfree(mlme);
...@@ -1595,7 +1595,7 @@ send_simple_event(islpci_private *priv, const char *str) ...@@ -1595,7 +1595,7 @@ send_simple_event(islpci_private *priv, const char *str)
static void static void
link_changed(struct net_device *ndev, u32 bitrate) link_changed(struct net_device *ndev, u32 bitrate)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
if (le32_to_cpu(bitrate)) { if (le32_to_cpu(bitrate)) {
if (priv->iw_mode == IW_MODE_INFRA) { if (priv->iw_mode == IW_MODE_INFRA) {
...@@ -1604,9 +1604,9 @@ link_changed(struct net_device *ndev, u32 bitrate) ...@@ -1604,9 +1604,9 @@ link_changed(struct net_device *ndev, u32 bitrate)
NULL); NULL);
wireless_send_event(ndev, SIOCGIWAP, &uwrq, NULL); wireless_send_event(ndev, SIOCGIWAP, &uwrq, NULL);
} else } else
send_simple_event(ndev->priv, "Link established"); send_simple_event(netdev_priv(ndev), "Link established");
} else } else
send_simple_event(ndev->priv, "Link lost"); send_simple_event(netdev_priv(ndev), "Link lost");
} }
/* Beacon/ProbeResp payload header */ /* Beacon/ProbeResp payload header */
...@@ -1889,16 +1889,17 @@ void ...@@ -1889,16 +1889,17 @@ void
prism54_process_trap(void *data) prism54_process_trap(void *data)
{ {
struct islpci_mgmtframe *frame = data; struct islpci_mgmtframe *frame = data;
struct net_device *ndev = frame->ndev;
enum oid_num_t n = mgt_oidtonum(frame->header->oid); enum oid_num_t n = mgt_oidtonum(frame->header->oid);
prism54_process_trap_helper(frame->ndev->priv, n, frame->data); prism54_process_trap_helper(netdev_priv(ndev), n, frame->data);
islpci_mgt_release(frame); islpci_mgt_release(frame);
} }
int int
prism54_set_mac_address(struct net_device *ndev, void *addr) prism54_set_mac_address(struct net_device *ndev, void *addr)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
int ret; int ret;
if (ndev->addr_len != 6) if (ndev->addr_len != 6)
...@@ -1923,7 +1924,7 @@ int ...@@ -1923,7 +1924,7 @@ int
prism54_set_wpa(struct net_device *ndev, struct iw_request_info *info, prism54_set_wpa(struct net_device *ndev, struct iw_request_info *info,
__u32 * uwrq, char *extra) __u32 * uwrq, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
down_write(&priv->mib_sem); down_write(&priv->mib_sem);
...@@ -1964,7 +1965,7 @@ int ...@@ -1964,7 +1965,7 @@ int
prism54_get_oid(struct net_device *ndev, struct iw_request_info *info, prism54_get_oid(struct net_device *ndev, struct iw_request_info *info,
struct iw_point *data, char *extra) struct iw_point *data, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
struct islpci_mgmtframe *response = NULL; struct islpci_mgmtframe *response = NULL;
int ret = -EIO, response_op = PIMFOR_OP_ERROR; int ret = -EIO, response_op = PIMFOR_OP_ERROR;
...@@ -1998,7 +1999,7 @@ int ...@@ -1998,7 +1999,7 @@ int
prism54_set_oid(struct net_device *ndev, struct iw_request_info *info, prism54_set_oid(struct net_device *ndev, struct iw_request_info *info,
struct iw_point *data, char *extra) struct iw_point *data, char *extra)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
struct islpci_mgmtframe *response = NULL; struct islpci_mgmtframe *response = NULL;
int ret = 0, response_op = PIMFOR_OP_ERROR; int ret = 0, response_op = PIMFOR_OP_ERROR;
......
...@@ -245,7 +245,7 @@ static int ...@@ -245,7 +245,7 @@ static int
islpci_open(struct net_device *ndev) islpci_open(struct net_device *ndev)
{ {
u32 rc; u32 rc;
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
printk(KERN_DEBUG "%s: islpci_open()\n", ndev->name); printk(KERN_DEBUG "%s: islpci_open()\n", ndev->name);
...@@ -265,7 +265,7 @@ islpci_open(struct net_device *ndev) ...@@ -265,7 +265,7 @@ islpci_open(struct net_device *ndev)
static int static int
islpci_close(struct net_device *ndev) islpci_close(struct net_device *ndev)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
printk(KERN_DEBUG "%s: islpci_close ()\n", ndev->name); printk(KERN_DEBUG "%s: islpci_close ()\n", ndev->name);
...@@ -491,7 +491,7 @@ islpci_reset(islpci_private *priv, int reload_firmware) ...@@ -491,7 +491,7 @@ islpci_reset(islpci_private *priv, int reload_firmware)
struct net_device_stats * struct net_device_stats *
islpci_statistics(struct net_device *ndev) islpci_statistics(struct net_device *ndev)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
#if VERBOSE > SHOW_ERROR_MESSAGES #if VERBOSE > SHOW_ERROR_MESSAGES
DEBUG(SHOW_FUNCTION_CALLS, "islpci_statistics \n"); DEBUG(SHOW_FUNCTION_CALLS, "islpci_statistics \n");
......
...@@ -72,7 +72,7 @@ islpci_eth_cleanup_transmit(islpci_private *priv, ...@@ -72,7 +72,7 @@ islpci_eth_cleanup_transmit(islpci_private *priv,
int int
islpci_eth_transmit(struct sk_buff *skb, struct net_device *ndev) islpci_eth_transmit(struct sk_buff *skb, struct net_device *ndev)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
isl38xx_control_block *cb = priv->control_block; isl38xx_control_block *cb = priv->control_block;
u32 index; u32 index;
dma_addr_t pci_map_address; dma_addr_t pci_map_address;
...@@ -411,7 +411,7 @@ islpci_eth_receive(islpci_private *priv) ...@@ -411,7 +411,7 @@ islpci_eth_receive(islpci_private *priv)
void void
islpci_eth_tx_timeout(struct net_device *ndev) islpci_eth_tx_timeout(struct net_device *ndev)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
struct net_device_stats *statistics = &priv->statistics; struct net_device_stats *statistics = &priv->statistics;
/* increment the transmit error counter */ /* increment the transmit error counter */
......
...@@ -133,7 +133,7 @@ prism54_get_card_model(struct net_device *ndev) ...@@ -133,7 +133,7 @@ prism54_get_card_model(struct net_device *ndev)
islpci_private *priv; islpci_private *priv;
char *modelp; char *modelp;
priv = ndev->priv; priv = netdev_priv(ndev);
switch (priv->pdev->subsystem_device) { switch (priv->pdev->subsystem_device) {
case PCIDEVICE_ISL3877: case PCIDEVICE_ISL3877:
modelp = "PRISM Indigo"; modelp = "PRISM Indigo";
...@@ -269,7 +269,7 @@ prism54_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -269,7 +269,7 @@ prism54_probe(struct pci_dev *pdev, const struct pci_device_id *id)
goto do_pci_release_regions; goto do_pci_release_regions;
} }
priv = ndev->priv; priv = netdev_priv(ndev);
islpci_set_state(priv, PRV_STATE_PREBOOT); /* we are attempting to boot */ islpci_set_state(priv, PRV_STATE_PREBOOT); /* we are attempting to boot */
/* card is in unknown state yet, might have some interrupts pending */ /* card is in unknown state yet, might have some interrupts pending */
...@@ -314,7 +314,7 @@ void ...@@ -314,7 +314,7 @@ void
prism54_remove(struct pci_dev *pdev) prism54_remove(struct pci_dev *pdev)
{ {
struct net_device *ndev = pci_get_drvdata(pdev); struct net_device *ndev = pci_get_drvdata(pdev);
islpci_private *priv = ndev ? ndev->priv : 0; islpci_private *priv = ndev ? netdev_priv(ndev) : 0;
BUG_ON(!priv); BUG_ON(!priv);
if (!__in_cleanup_module) { if (!__in_cleanup_module) {
...@@ -355,7 +355,7 @@ int ...@@ -355,7 +355,7 @@ int
prism54_suspend(struct pci_dev *pdev, u32 state) prism54_suspend(struct pci_dev *pdev, u32 state)
{ {
struct net_device *ndev = pci_get_drvdata(pdev); struct net_device *ndev = pci_get_drvdata(pdev);
islpci_private *priv = ndev ? ndev->priv : 0; islpci_private *priv = ndev ? netdev_priv(ndev) : 0;
BUG_ON(!priv); BUG_ON(!priv);
printk(KERN_NOTICE "%s: got suspend request (state %d)\n", printk(KERN_NOTICE "%s: got suspend request (state %d)\n",
...@@ -380,7 +380,7 @@ int ...@@ -380,7 +380,7 @@ int
prism54_resume(struct pci_dev *pdev) prism54_resume(struct pci_dev *pdev)
{ {
struct net_device *ndev = pci_get_drvdata(pdev); struct net_device *ndev = pci_get_drvdata(pdev);
islpci_private *priv = ndev ? ndev->priv : 0; islpci_private *priv = ndev ? netdev_priv(ndev) : 0;
BUG_ON(!priv); BUG_ON(!priv);
printk(KERN_NOTICE "%s: got resume request\n", ndev->name); printk(KERN_NOTICE "%s: got resume request\n", ndev->name);
......
...@@ -106,7 +106,7 @@ pimfor_decode_header(void *data, int len) ...@@ -106,7 +106,7 @@ pimfor_decode_header(void *data, int len)
int int
islpci_mgmt_rx_fill(struct net_device *ndev) islpci_mgmt_rx_fill(struct net_device *ndev)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
isl38xx_control_block *cb = /* volatile not needed */ isl38xx_control_block *cb = /* volatile not needed */
(isl38xx_control_block *) priv->control_block; (isl38xx_control_block *) priv->control_block;
u32 curr = le32_to_cpu(cb->driver_curr_frag[ISL38XX_CB_RX_MGMTQ]); u32 curr = le32_to_cpu(cb->driver_curr_frag[ISL38XX_CB_RX_MGMTQ]);
...@@ -165,7 +165,7 @@ static int ...@@ -165,7 +165,7 @@ static int
islpci_mgt_transmit(struct net_device *ndev, int operation, unsigned long oid, islpci_mgt_transmit(struct net_device *ndev, int operation, unsigned long oid,
void *data, int length) void *data, int length)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
isl38xx_control_block *cb = isl38xx_control_block *cb =
(isl38xx_control_block *) priv->control_block; (isl38xx_control_block *) priv->control_block;
void *p; void *p;
...@@ -271,7 +271,7 @@ islpci_mgt_transmit(struct net_device *ndev, int operation, unsigned long oid, ...@@ -271,7 +271,7 @@ islpci_mgt_transmit(struct net_device *ndev, int operation, unsigned long oid,
int int
islpci_mgt_receive(struct net_device *ndev) islpci_mgt_receive(struct net_device *ndev)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
isl38xx_control_block *cb = isl38xx_control_block *cb =
(isl38xx_control_block *) priv->control_block; (isl38xx_control_block *) priv->control_block;
u32 curr_frag; u32 curr_frag;
...@@ -414,7 +414,7 @@ n", ...@@ -414,7 +414,7 @@ n",
void void
islpci_mgt_cleanup_transmit(struct net_device *ndev) islpci_mgt_cleanup_transmit(struct net_device *ndev)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
isl38xx_control_block *cb = /* volatile not needed */ isl38xx_control_block *cb = /* volatile not needed */
(isl38xx_control_block *) priv->control_block; (isl38xx_control_block *) priv->control_block;
u32 curr_frag; u32 curr_frag;
...@@ -451,7 +451,7 @@ islpci_mgt_transaction(struct net_device *ndev, ...@@ -451,7 +451,7 @@ islpci_mgt_transaction(struct net_device *ndev,
void *senddata, int sendlen, void *senddata, int sendlen,
struct islpci_mgmtframe **recvframe) struct islpci_mgmtframe **recvframe)
{ {
islpci_private *priv = ndev->priv; islpci_private *priv = netdev_priv(ndev);
const long wait_cycle_jiffies = (ISL38XX_WAIT_CYCLE * 10 * HZ) / 1000; const long wait_cycle_jiffies = (ISL38XX_WAIT_CYCLE * 10 * HZ) / 1000;
long timeout_left = ISL38XX_MAX_WAIT_CYCLES * wait_cycle_jiffies; long timeout_left = ISL38XX_MAX_WAIT_CYCLES * wait_cycle_jiffies;
int err; int err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment