Skip to content

L
linux
Commit 543b4e66 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by Jeff Garzik
Browse files
Options

[wireless prism54] use netdev_priv() helper

parent 2bb0a0bb
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 63 deletions
drivers/net/wireless/prism54/isl_ioctl.c
View file @ 543b4e66
......@@ -250,7 +250,7 @@ prism54_update_stats(islpci_private *priv)
struct iw_statistics *
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 (down_trylock(&priv->stats_sem) == 0) {
......@@ -277,7 +277,7 @@ static int
prism54_commit(struct net_device *ndev, struct iw_request_info *info,
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 */
......@@ -293,7 +293,7 @@ static int
prism54_get_name(struct net_device *ndev, struct iw_request_info *info,
char *cwrq, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
char *capabilities;
union oid_res_t r;
int rvalue;
......@@ -324,7 +324,7 @@ static int
prism54_set_freq(struct net_device *ndev, struct iw_request_info *info,
struct iw_freq *fwrq, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
int rvalue;
u32 c = 0;
......@@ -363,7 +363,7 @@ static int
prism54_get_freq(struct net_device *ndev, struct iw_request_info *info,
struct iw_freq *fwrq, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
union oid_res_t r;
int rvalue;
......@@ -379,7 +379,7 @@ static int
prism54_set_mode(struct net_device *ndev, struct iw_request_info *info,
__u32 * uwrq, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
u32 mlmeautolevel = CARD_DEFAULT_MLME_MODE;
/* Let's see if the user passed a valid Linux Wireless mode */
......@@ -420,7 +420,7 @@ static int
prism54_get_mode(struct net_device *ndev, struct iw_request_info *info,
__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 >
IW_MODE_MONITOR));
......@@ -438,7 +438,7 @@ static int
prism54_set_sens(struct net_device *ndev, struct iw_request_info *info,
struct iw_param *vwrq, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
u32 sens;
/* by default the card sets this to 20. */
......@@ -452,7 +452,7 @@ static int
prism54_get_sens(struct net_device *ndev, struct iw_request_info *info,
struct iw_param *vwrq, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
union oid_res_t r;
int rvalue;
......@@ -470,7 +470,7 @@ prism54_get_range(struct net_device *ndev, struct iw_request_info *info,
struct iw_point *dwrq, char *extra)
{
struct iw_range *range = (struct iw_range *) extra;
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
char *data;
int i, m, rvalue;
struct obj_frequencies *freq;
......@@ -576,7 +576,7 @@ static int
prism54_set_wap(struct net_device *ndev, struct iw_request_info *info,
struct sockaddr *awrq, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
char bssid[6];
int rvalue;
......@@ -598,7 +598,7 @@ static int
prism54_get_wap(struct net_device *ndev, struct iw_request_info *info,
struct sockaddr *awrq, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
union oid_res_t r;
int rvalue;
......@@ -630,7 +630,7 @@ prism54_translate_bss(struct net_device *ndev, char *current_ev,
{
struct iw_event iwe; /* Temporary buffer */
short cap;
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
/* The first entry must be the MAC address */
memcpy(iwe.u.ap_addr.sa_data, bss->address, 6);
......@@ -721,7 +721,7 @@ int
prism54_get_scan(struct net_device *ndev, struct iw_request_info *info,
struct iw_point *dwrq, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
int i, rvalue;
struct obj_bsslist *bsslist;
u32 noise = 0;
......@@ -762,7 +762,7 @@ static int
prism54_set_essid(struct net_device *ndev, struct iw_request_info *info,
struct iw_point *dwrq, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
struct obj_ssid essid;
memset(essid.octets, 0, 33);
......@@ -789,7 +789,7 @@ static int
prism54_get_essid(struct net_device *ndev, struct iw_request_info *info,
struct iw_point *dwrq, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
struct obj_ssid *essid;
union oid_res_t r;
int rvalue;
......@@ -819,7 +819,7 @@ static int
prism54_set_nick(struct net_device *ndev, struct iw_request_info *info,
struct iw_point *dwrq, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
if (dwrq->length > IW_ESSID_MAX_SIZE)
return -E2BIG;
......@@ -836,7 +836,7 @@ static int
prism54_get_nick(struct net_device *ndev, struct iw_request_info *info,
struct iw_point *dwrq, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
dwrq->length = 0;
......@@ -856,7 +856,7 @@ prism54_set_rate(struct net_device *ndev,
struct iw_param *vwrq, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
u32 rate, profile;
char *data;
int ret, i;
......@@ -924,7 +924,7 @@ prism54_get_rate(struct net_device *ndev,
struct iw_request_info *info,
struct iw_param *vwrq, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
int rvalue;
char *data;
union oid_res_t r;
......@@ -948,7 +948,7 @@ static int
prism54_set_rts(struct net_device *ndev, struct iw_request_info *info,
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);
}
......@@ -957,7 +957,7 @@ static int
prism54_get_rts(struct net_device *ndev, struct iw_request_info *info,
struct iw_param *vwrq, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
union oid_res_t r;
int rvalue;
......@@ -972,7 +972,7 @@ static int
prism54_set_frag(struct net_device *ndev, struct iw_request_info *info,
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);
}
......@@ -981,7 +981,7 @@ static int
prism54_get_frag(struct net_device *ndev, struct iw_request_info *info,
struct iw_param *vwrq, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
union oid_res_t r;
int rvalue;
......@@ -1004,7 +1004,7 @@ static int
prism54_set_retry(struct net_device *ndev, struct iw_request_info *info,
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 lifetime = 0;
int rvalue = 0;
......@@ -1048,7 +1048,7 @@ static int
prism54_get_retry(struct net_device *ndev, struct iw_request_info *info,
struct iw_param *vwrq, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
union oid_res_t r;
int rvalue = 0;
vwrq->disabled = 0; /* It cannot be disabled */
......@@ -1080,7 +1080,7 @@ static int
prism54_set_encode(struct net_device *ndev, struct iw_request_info *info,
struct iw_point *dwrq, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
int rvalue = 0, force = 0;
int authen = DOT11_AUTH_OS, invoke = 0, exunencrypt = 0;
union oid_res_t r;
......@@ -1170,7 +1170,7 @@ static int
prism54_get_encode(struct net_device *ndev, struct iw_request_info *info,
struct iw_point *dwrq, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
struct obj_key *key;
u32 devindex, index = (dwrq->flags & IW_ENCODE_INDEX) - 1;
u32 authen = 0, invoke = 0, exunencrypt = 0;
......@@ -1218,7 +1218,7 @@ static int
prism54_get_txpower(struct net_device *ndev, struct iw_request_info *info,
struct iw_param *vwrq, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
union oid_res_t r;
int rvalue;
......@@ -1238,7 +1238,7 @@ static int
prism54_set_txpower(struct net_device *ndev, struct iw_request_info *info,
struct iw_param *vwrq, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
s32 u = vwrq->value;
/* intersil firmware operates in 0.25 dBm (1/4) */
......@@ -1264,7 +1264,7 @@ static int
prism54_reset(struct net_device *ndev, struct iw_request_info *info,
__u32 * uwrq, char *extra)
{
islpci_reset(ndev->priv, 0);
islpci_reset(netdev_priv(ndev), 0);
return 0;
}
......@@ -1273,7 +1273,7 @@ static int
prism54_set_beacon(struct net_device *ndev, struct iw_request_info *info,
__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);
return (rvalue ? rvalue : -EINPROGRESS);
......@@ -1287,7 +1287,7 @@ prism54_get_beacon(struct net_device *ndev, struct iw_request_info *info,
int rvalue;
rvalue =
mgt_get_request((islpci_private *) ndev->priv,
mgt_get_request((islpci_private *) netdev_priv(ndev),
DOT11_OID_BEACONPERIOD, 0, NULL, &r);
*uwrq = r.u;
......@@ -1337,7 +1337,7 @@ static int
prism54_add_mac(struct net_device *ndev, struct iw_request_info *info,
struct sockaddr *awrq, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
struct islpci_acl *acl = &priv->acl;
struct mac_entry *entry;
struct sockaddr *addr = (struct sockaddr *) extra;
......@@ -1366,7 +1366,7 @@ static int
prism54_del_mac(struct net_device *ndev, struct iw_request_info *info,
struct sockaddr *awrq, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
struct islpci_acl *acl = &priv->acl;
struct mac_entry *entry;
struct list_head *ptr;
......@@ -1396,7 +1396,7 @@ static int
prism54_get_mac(struct net_device *ndev, struct iw_request_info *info,
struct iw_point *dwrq, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
struct islpci_acl *acl = &priv->acl;
struct mac_entry *entry;
struct list_head *ptr;
......@@ -1427,7 +1427,7 @@ static int
prism54_set_policy(struct net_device *ndev, struct iw_request_info *info,
__u32 * uwrq, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
struct islpci_acl *acl = &priv->acl;
u32 mlmeautolevel;
......@@ -1460,7 +1460,7 @@ static int
prism54_get_policy(struct net_device *ndev, struct iw_request_info *info,
__u32 * uwrq, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
struct islpci_acl *acl = &priv->acl;
*uwrq = acl->policy;
......@@ -1511,7 +1511,7 @@ prism54_kick_all(struct net_device *ndev, struct iw_request_info *info,
/* Tell the card to kick every client */
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);
return rvalue;
......@@ -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 */
memcpy(mlme->address, addr->sa_data, ETH_ALEN);
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);
......@@ -1595,7 +1595,7 @@ send_simple_event(islpci_private *priv, const char *str)
static void
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 (priv->iw_mode == IW_MODE_INFRA) {
......@@ -1604,9 +1604,9 @@ link_changed(struct net_device *ndev, u32 bitrate)
NULL);
wireless_send_event(ndev, SIOCGIWAP, &uwrq, NULL);
} else
send_simple_event(ndev->priv, "Link established");
send_simple_event(netdev_priv(ndev), "Link established");
} else
send_simple_event(ndev->priv, "Link lost");
send_simple_event(netdev_priv(ndev), "Link lost");
}
/* Beacon/ProbeResp payload header */
......@@ -1889,16 +1889,17 @@ void
prism54_process_trap(void *data)
{
struct islpci_mgmtframe *frame = data;
struct net_device *ndev = frame->ndev;
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);
}
int
prism54_set_mac_address(struct net_device *ndev, void *addr)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
int ret;
if (ndev->addr_len != 6)
......@@ -1923,7 +1924,7 @@ int
prism54_set_wpa(struct net_device *ndev, struct iw_request_info *info,
__u32 * uwrq, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
down_write(&priv->mib_sem);
......@@ -1964,7 +1965,7 @@ int
prism54_get_oid(struct net_device *ndev, struct iw_request_info *info,
struct iw_point *data, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
struct islpci_mgmtframe *response = NULL;
int ret = -EIO, response_op = PIMFOR_OP_ERROR;
......@@ -1998,7 +1999,7 @@ int
prism54_set_oid(struct net_device *ndev, struct iw_request_info *info,
struct iw_point *data, char *extra)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
struct islpci_mgmtframe *response = NULL;
int ret = 0, response_op = PIMFOR_OP_ERROR;
......
drivers/net/wireless/prism54/islpci_dev.c
View file @ 543b4e66
......@@ -245,7 +245,7 @@ static int
islpci_open(struct net_device *ndev)
{
u32 rc;
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
printk(KERN_DEBUG "%s: islpci_open()\n", ndev->name);
......@@ -265,7 +265,7 @@ islpci_open(struct net_device *ndev)
static int
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);
......@@ -491,7 +491,7 @@ islpci_reset(islpci_private *priv, int reload_firmware)
struct net_device_stats *
islpci_statistics(struct net_device *ndev)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
#if VERBOSE > SHOW_ERROR_MESSAGES
DEBUG(SHOW_FUNCTION_CALLS, "islpci_statistics \n");
......
drivers/net/wireless/prism54/islpci_eth.c
View file @ 543b4e66
......@@ -72,7 +72,7 @@ islpci_eth_cleanup_transmit(islpci_private *priv,
int
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;
u32 index;
dma_addr_t pci_map_address;
......@@ -411,7 +411,7 @@ islpci_eth_receive(islpci_private *priv)
void
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;
/* increment the transmit error counter */
......
drivers/net/wireless/prism54/islpci_hotplug.c
View file @ 543b4e66
......@@ -133,7 +133,7 @@ prism54_get_card_model(struct net_device *ndev)
islpci_private *priv;
char *modelp;
priv = ndev->priv;
priv = netdev_priv(ndev);
switch (priv->pdev->subsystem_device) {
case PCIDEVICE_ISL3877:
modelp = "PRISM Indigo";
......@@ -269,7 +269,7 @@ prism54_probe(struct pci_dev *pdev, const struct pci_device_id *id)
goto do_pci_release_regions;
}
priv = ndev->priv;
priv = netdev_priv(ndev);
islpci_set_state(priv, PRV_STATE_PREBOOT); /* we are attempting to boot */
/* card is in unknown state yet, might have some interrupts pending */
......@@ -314,7 +314,7 @@ void
prism54_remove(struct pci_dev *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);
if (!__in_cleanup_module) {
......@@ -355,7 +355,7 @@ int
prism54_suspend(struct pci_dev *pdev, u32 state)
{
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);
printk(KERN_NOTICE "%s: got suspend request (state %d)\n",
......@@ -380,7 +380,7 @@ int
prism54_resume(struct pci_dev *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);
printk(KERN_NOTICE "%s: got resume request\n", ndev->name);
......
drivers/net/wireless/prism54/islpci_mgt.c
View file @ 543b4e66
......@@ -106,7 +106,7 @@ pimfor_decode_header(void *data, int len)
int
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 *) priv->control_block;
u32 curr = le32_to_cpu(cb->driver_curr_frag[ISL38XX_CB_RX_MGMTQ]);
......@@ -165,7 +165,7 @@ static int
islpci_mgt_transmit(struct net_device *ndev, int operation, unsigned long oid,
void *data, int length)
{
islpci_private *priv = ndev->priv;
islpci_private *priv = netdev_priv(ndev);
isl38xx_control_block *cb =
(isl38xx_control_block *) priv->control_block;
void *p;
......@@ -271,7 +271,7 @@ islpci_mgt_transmit(struct net_device *ndev, int operation, unsigned long oid,
int
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 *) priv->control_block;
u32 curr_frag;
......@@ -414,7 +414,7 @@ n",
void
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 *) priv->control_block;
u32 curr_frag;
......@@ -451,7 +451,7 @@ islpci_mgt_transaction(struct net_device *ndev,
void *senddata, int sendlen,
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;
long timeout_left = ISL38XX_MAX_WAIT_CYCLES * wait_cycle_jiffies;
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7