netdevice: Fix directly reference of netdev->priv
Subsystems (13)
cover netdevice: Fix directly reference of netdev->priv
We have some reasons to kill netdev->priv:
1. netdev->priv is equal to netdev_priv().
2. netdev_priv() wraps the calculation of netdev->priv's offset, obviously netdev_priv() is more flexible than netdev->priv.
But we cann't kill netdev->priv now, because so many drivers reference to it directly.
OK, becasue Dave S. Miller said, "every direct netdev->priv usage is a bug", and I want to kill netdev->priv later, I decided to convert all the direct reference of netdev->priv first.
- Patch 1-4 are the safe convert which I believe will not make "after converted " worse than "before converted".
Originally, I put this kind of convert in one mail, but it's too big for vger. So I split it to 4 parts and make every part smaller than 100,000 bytes, which is max size allowed by vger.
- Patches 5-18 need comments. Since the value of netdev->priv is changed in drivers and I use netdev->ml_priv to replace netdev->priv.
Below is diffstat:
--- drivers/net/3c501.c | 2 drivers/net/3c505.c | 45 +++---- drivers/net/3c523.c | 29 ++-- drivers/net/3c59x.c | 4 drivers/net/82596.c | 29 ++-- drivers/net/acenic.c | 2 drivers/net/appletalk/ipddp.c | 6 - drivers/net/appletalk/ltpc.c | 12 +- drivers/net/arcnet/arc-rawmode.c | 4 drivers/net/arcnet/arc-rimi.c | 16 +- drivers/net/arcnet/arcnet.c | 32 ++--- drivers/net/arcnet/capmode.c | 6 - drivers/net/arcnet/com20020-isa.c | 4 drivers/net/arcnet/com20020-pci.c | 2 drivers/net/arcnet/com20020.c | 10 - drivers/net/arcnet/com90io.c | 4 drivers/net/arcnet/com90xx.c | 10 - drivers/net/arcnet/rfc1051.c | 8 - drivers/net/arcnet/rfc1201.c | 12 +- drivers/net/atarilance.c | 34 ++--- drivers/net/atl1e/atl1e_main.c | 6 - drivers/net/atp.c | 3 drivers/net/au1000_eth.c | 48 ++++---- drivers/net/bonding/bond_3ad.c | 7 - drivers/net/bonding/bond_alb.c | 6 - drivers/net/bonding/bond_main.c | 58 ++++----- drivers/net/bonding/bond_sysfs.c | 2 drivers/net/bonding/bonding.h | 4 drivers/net/chelsio/cxgb2.c | 60 +++++----- drivers/net/chelsio/sge.c | 3 drivers/net/declance.c | 2 drivers/net/depca.c | 40 +++--- drivers/net/dm9000.c | 32 ++--- drivers/net/e1000/e1000_main.c | 9 - drivers/net/e1000e/netdev.c | 3 drivers/net/eepro.c | 4 drivers/net/epic100.c | 42 +++---- drivers/net/eth16i.c | 2 drivers/net/fec.c | 2 drivers/net/hamradio/dmascc.c | 12 +- drivers/net/hamradio/scc.c | 13 +- drivers/net/ibmveth.c | 34 ++--- drivers/net/igb/igb_ethtool.c | 4 drivers/net/irda/ali-ircc.c | 16 +- drivers/net/irda/donauboe.c | 8 - drivers/net/irda/irda-usb.c | 14 +- drivers/net/irda/nsc-ircc.c | 16 +- drivers/net/irda/sa1100_ir.c | 26 ++-- drivers/net/irda/sir_dev.c | 12 +- drivers/net/irda/via-ircc.c | 16 +- drivers/net/irda/vlsi_ir.c | 36 +++--- drivers/net/irda/w83977af_ir.c | 14 +- drivers/net/iseries_veth.c | 14 +- drivers/net/ixgbe/ixgbe_ethtool.c | 6 - drivers/net/ixgbe/ixgbe_main.c | 6 - drivers/net/lance.c | 27 ++-- drivers/net/lp486e.c | 28 ++-- drivers/net/mace.c | 29 ++-- drivers/net/mv643xx_eth.c | 2 drivers/net/mvme147.c | 4 drivers/net/myri_sbus.c | 12 +- drivers/net/ne2k-pci.c | 2 drivers/net/netxen/netxen_nic_hw.c | 2 drivers/net/netxen/netxen_nic_main.c | 4 drivers/net/ni5010.c | 2 drivers/net/ni52.c | 36 +++--- drivers/net/ni65.c | 33 ++--- drivers/net/pasemi_mac_ethtool.c | 4 drivers/net/pcmcia/com20020_cs.c | 6 - drivers/net/plip.c | 8 - drivers/net/ppp_generic.c | 7 - drivers/net/rionet.c | 26 ++-- drivers/net/s2io.c | 79 ++++++------- drivers/net/sgiseeq.c | 2 drivers/net/sis900.c | 64 +++++----- drivers/net/smc9194.c | 6 - drivers/net/sonic.h | 20 +-- drivers/net/spider_net_ethtool.c | 8 - drivers/net/sun3_82586.c | 38 +++--- drivers/net/sunbmac.c | 18 +-- drivers/net/sungem.c | 52 ++++---- drivers/net/sunhme.c | 26 ++-- drivers/net/sunqe.c | 14 +- drivers/net/tehuti.c | 38 +++--- drivers/net/tokenring/tms380tr.c | 14 +- drivers/net/tulip/de2104x.c | 44 +++---- drivers/net/tulip/eeprom.c | 2 drivers/net/tulip/uli526x.c | 2 drivers/net/typhoon.c | 2 drivers/net/usb/mcs7830.c | 4 drivers/net/virtio_net.c | 3 drivers/net/wan/cycx_x25.c | 43 +++---- drivers/net/wan/dlci.c | 36 +++--- drivers/net/wan/hdlc_fr.c | 10 - drivers/net/wan/pc300_drv.c | 18 +-- drivers/net/wan/sbni.c | 100 ++++++++-------- drivers/net/wan/sdla.c | 48 ++++---- drivers/net/wan/x25_asy.c | 28 ++-- drivers/net/wireless/airo.c | 172 ++++++++++++++--------------- drivers/net/wireless/libertas/ethtool.c | 12 +- drivers/net/wireless/libertas/main.c | 37 +++--- drivers/net/wireless/libertas/persistcfg.c | 16 +- drivers/net/wireless/libertas/scan.c | 4 drivers/net/wireless/libertas/tx.c | 3 drivers/net/wireless/libertas/wext.c | 72 ++++++------ drivers/net/wireless/rndis_wlan.c | 62 +++++----- drivers/net/wireless/wavelan.c | 88 +++++++------- drivers/net/wireless/zd1201.c | 65 +++++----- drivers/net/znet.c | 22 +-- include/linux/hdlc.h | 3 net/appletalk/ddp.c | 2 net/atm/br2684.c | 2 net/atm/lec.c | 34 +++-- net/atm/mpc.c | 10 - net/bluetooth/bnep/core.c | 2 net/bluetooth/bnep/netdev.c | 6 - net/bridge/br_if.c | 2 net/bridge/br_sysfs_br.c | 2 net/irda/irlan/irlan_common.c | 3 net/wanrouter/wanmain.c | 24 ++-- 120 files changed, 1221 insertions(+), 1224 deletions(-)
PATCH 1/18 netdevice: safe convert to netdev_priv() #part-1
We have some reasons to kill netdev->priv:
1. netdev->priv is equal to netdev_priv().
2. netdev_priv() wraps the calculation of netdev->priv's offset, obviously netdev_priv() is more flexible than netdev->priv.
But we cann't kill netdev->priv, because so many drivers reference to it directly.
OK, becasue Dave S. Miller said, "every direct netdev->priv usage is a bug", and I want to kill netdev->priv later, I decided to convert all the direct reference of netdev->priv first.
This patch is a safe convert for netdev->priv to netdev_priv(netdev). Since all of the netdev->priv is only for read.
But it is too big to be sent in one mail.
I split it to 4 parts and make every part smaller than 100,000 bytes, which is max size allowed by vger.
Signed-off-by Wang Chen <[email protected]>
--- drivers/net/3c501.c | 2 +- drivers/net/3c505.c | 45 ++++++++++++---------------- drivers/net/3c523.c | 29 +++++++++--------- drivers/net/3c59x.c | 4 +- drivers/net/acenic.c | 2 +- drivers/net/appletalk/ipddp.c | 6 ++-- drivers/net/appletalk/ltpc.c | 12 +++++-- drivers/net/arcnet/arc-rawmode.c | 4 +- drivers/net/arcnet/arc-rimi.c | 16 +++++----- drivers/net/arcnet/arcnet.c | 32 ++++++++++---------- drivers/net/arcnet/capmode.c | 6 ++-- drivers/net/arcnet/com20020-isa.c | 4 +- drivers/net/arcnet/com20020-pci.c | 2 +- drivers/net/arcnet/com20020.c | 10 +++--- drivers/net/arcnet/com90io.c | 4 +- drivers/net/arcnet/com90xx.c | 10 +++--- drivers/net/arcnet/rfc1051.c | 8 ++-- drivers/net/arcnet/rfc1201.c | 12 ++++---- drivers/net/atarilance.c | 34 +++++++++++----------- drivers/net/atl1e/atl1e_main.c | 6 ++-- drivers/net/atp.c | 3 +- drivers/net/au1000_eth.c | 48 +++++++++++++++--------------- drivers/net/bonding/bond_3ad.c | 7 ++-- drivers/net/bonding/bond_alb.c | 6 ++-- drivers/net/bonding/bond_main.c | 58 ++++++++++++++++++------------------ drivers/net/bonding/bond_sysfs.c | 2 +- drivers/net/bonding/bonding.h | 4 +- drivers/net/iseries_veth.c | 14 ++++---- drivers/net/ixgbe/ixgbe_ethtool.c | 6 ++-- drivers/net/ixgbe/ixgbe_main.c | 6 ++-- drivers/net/lp486e.c | 28 +++++++++--------- drivers/net/mace.c | 28 +++++++++--------- 32 files changed, 229 insertions(+), 229 deletions(-)
drivers/net/3c501.c +1 -1
@@ -297,8 +297,8 @@ static int __init el1_probe1(struct net_device *dev, int ioaddr)if (el_debug)printk (KERN_DEBUG "%s" , version); -memset (dev->priv,0 ,sizeof (struct net_local )); lp =netdev_priv (dev); +memset (lp,0 ,sizeof (struct net_local ));spin_lock_init (&lp->lock);/*
drivers/net/3c505.c +19 -26
153 lines not on this page · raw message
drivers/net/3c523.c +15 -14
@@ -308,7 +308,7 @@ static int elmc_open(struct net_device *dev)static int __init check586 (struct net_device *dev,unsigned long where,unsigned size) { -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev);char *iscp_addrs[2 ];int i =0 ;
@@ -349,7 +349,7 @@ static int __init check586(struct net_device *dev, unsigned long where, unsignedvoid alloc586 (struct net_device *dev) { -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev);elmc_id_reset586 ();DELAY (2 );
@@ -416,7 +416,7 @@ static int __init do_elmc_probe(struct net_device *dev)int i =0 ;unsigned int size =0 ;int retval; -struct priv *pr = dev->priv; +struct priv *pr =netdev_priv (dev);DECLARE_MAC_BUF (mac);if (MCA_bus ==0 ) {
@@ -580,7 +580,8 @@ err_out:static void cleanup_card (struct net_device *dev) { -mca_set_adapter_procfn (((struct priv *) (dev->priv))->slot,NULL ,NULL ); +mca_set_adapter_procfn (((struct priv *)netdev_priv (dev))->slot, +NULL ,NULL );release_region (dev->base_addr,ELMC_IO_EXTENT ); }
@@ -616,7 +617,7 @@ static int init586(struct net_device *dev)void *ptr;unsigned long s;int i, result =0 ; -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev);volatile struct configure_cmd_struct *cfg_cmd;volatile struct iasetup_cmd_struct *ias_cmd;volatile struct tdr_cmd_struct *tdr_cmd;
@@ -852,7 +853,7 @@ static void *alloc_rfa(struct net_device *dev, void *ptr)volatile struct rfd_struct *rfd = (struct rfd_struct *) ptr;volatile struct rbd_struct *rbd;int i; -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev);memset ((char *) rfd,0 ,sizeof (struct rfd_struct ) * p->num_recv_buffs); p->rfd_first = rfd;
@@ -913,7 +914,7 @@ elmc_interrupt(int irq, void *dev_id) }/* reading ELMC_CTRL also clears the INT bit. */ - p = (struct priv *) dev->priv; + p =netdev_priv (dev);while ((stat = p->scb->status &STAT_MASK )) {
@@ -969,7 +970,7 @@ static void elmc_rcv_int(struct net_device *dev)unsigned short totlen;struct sk_buff *skb;struct rbd_struct *rbd; -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev);for (; (status = p->rfd_top->status) &STAT_COMPL ;) { rbd = (struct rbd_struct *)make32 (p->rfd_top->rbd_offset);
@@ -1013,7 +1014,7 @@ static void elmc_rcv_int(struct net_device *dev)static void elmc_rnr_int (struct net_device *dev) { -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev); dev->stats.rx_errors++;
@@ -1036,7 +1037,7 @@ static void elmc_rnr_int(struct net_device *dev)static void elmc_xmt_int (struct net_device *dev) {int status; -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev); status = p->xmit_cmds[p->xmit_last]->cmd_status;if (!(status &STAT_COMPL )) {
@@ -1079,7 +1080,7 @@ static void elmc_xmt_int(struct net_device *dev)static void startrecv586 (struct net_device *dev) { -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev); p->scb->rfa_offset =make16 (p->rfd_first); p->scb->cmd =RUC_START ;
@@ -1093,7 +1094,7 @@ static void startrecv586(struct net_device *dev)static void elmc_timeout (struct net_device *dev) { -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev);/* COMMAND-UNIT active? */ if (p->scb->status &CU_ACTIVE ) {#ifdef DEBUG
@@ -1129,7 +1130,7 @@ static int elmc_send_packet(struct sk_buff *skb, struct net_device *dev)#ifndef NO_NOPCOMMANDS int next_nop;#endif -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev);netif_stop_queue (dev);
@@ -1200,7 +1201,7 @@ static int elmc_send_packet(struct sk_buff *skb, struct net_device *dev)static struct net_device_stats *elmc_get_stats (struct net_device *dev) { -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev);unsigned short crc, aln, rsc, ovrn; crc = p->scb->crc_errs;/* get error-statistic from the ni82586 */
drivers/net/3c59x.c +2 -2
@@ -803,7 +803,7 @@ static int vortex_suspend(struct pci_dev *pdev, pm_message_t state) {struct net_device *dev =pci_get_drvdata (pdev); -if (dev && dev->priv) { +if (dev &&netdev_priv (dev)) {if (netif_running (dev)) {netif_device_detach (dev);vortex_down (dev,1 );
@@ -3217,7 +3217,7 @@ static void __exit vortex_eisa_cleanup(void)#endif if (compaq_net_device) { - vp = compaq_net_device->priv; + vp =netdev_priv (compaq_net_device); ioaddr =ioport_map (compaq_net_device->base_addr,VORTEX_TOTAL_SIZE );
drivers/net/acenic.c +1 -1
@@ -466,7 +466,7 @@ static int __devinit acenic_probe_one(struct pci_dev *pdev,SET_NETDEV_DEV (dev, &pdev->dev); - ap = dev->priv; + ap =netdev_priv (dev); ap->pdev = pdev; ap->name =pci_name (pdev);
drivers/net/appletalk/ipddp.c +3 -3
@@ -108,7 +108,7 @@ static struct net_device * __init ipddp_init(void)*/ static struct net_device_stats *ipddp_get_stats (struct net_device *dev) { -return dev->priv; +return netdev_priv (dev); }/*
@@ -170,8 +170,8 @@ static int ipddp_xmit(struct sk_buff *skb, struct net_device *dev) skb->protocol =htons (ETH_P_ATALK );/* Protocol has changed */ - ((struct net_device_stats *) dev->priv)->tx_packets++; - ((struct net_device_stats *) dev->priv)->tx_bytes+=skb->len; + ((struct net_device_stats *)netdev_priv (dev))->tx_packets++; + ((struct net_device_stats *)netdev_priv (dev))->tx_bytes += skb->len;if (aarp_send_ddp (rt->dev, skb, &rt->at,NULL ) <0 )dev_kfree_skb (skb);
drivers/net/appletalk/ltpc.c +8 -4
@@ -726,7 +726,8 @@ static int sendup_buffer (struct net_device *dev)int dnode, snode, llaptype, len;int sklen;struct sk_buff *skb; -struct net_device_stats *stats = &((struct ltpc_private *)dev->priv)->stats; +struct ltpc_private *ltpc_priv =netdev_priv (dev); +struct net_device_stats *stats = <pc_priv->stats;struct lt_rcvlap *ltc = (struct lt_rcvlap *) ltdmacbuf;if (ltc->command !=LT_RCVLAP ) {
@@ -823,7 +824,8 @@ static int ltpc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) {struct sockaddr_at *sa = (struct sockaddr_at *) &ifr->ifr_addr;/* we'll keep the localtalk node address in dev->pa_addr */ -struct atalk_addr *aa = &((struct ltpc_private *)dev->priv)->my_addr; +struct ltpc_private *ltpc_priv =netdev_priv (dev); +struct atalk_addr *aa = <pc_priv->my_addr;struct lt_init c;int ltflags;
@@ -904,7 +906,8 @@ static int ltpc_xmit(struct sk_buff *skb, struct net_device *dev)* and skb->len is the length of the ddp data + ddp header */ -struct net_device_stats *stats = &((struct ltpc_private *)dev->priv)->stats; +struct ltpc_private *ltpc_priv =netdev_priv (dev); +struct net_device_stats *stats = <pc_priv->stats;int i;struct lt_sendlap cbuf;
@@ -943,7 +946,8 @@ static int ltpc_xmit(struct sk_buff *skb, struct net_device *dev)static struct net_device_stats *ltpc_get_stats (struct net_device *dev) { -struct net_device_stats *stats = &((struct ltpc_private *) dev->priv)->stats; +struct ltpc_private *ltpc_priv =netdev_priv (dev); +struct net_device_stats *stats = <pc_priv->stats;return stats; }
drivers/net/arcnet/arc-rawmode.c +2 -2
@@ -87,7 +87,7 @@ MODULE_LICENSE("GPL");static void rx (struct net_device *dev,int bufnum,struct archdr *pkthdr,int length) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);struct sk_buff *skb;struct archdr *pkt = pkthdr;int ofs;
@@ -168,7 +168,7 @@ static int build_header(struct sk_buff *skb, struct net_device *dev,static int prepare_tx (struct net_device *dev,struct archdr *pkt,int length,int bufnum) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);struct arc_hardware *hard = &pkt->hard;int ofs;
drivers/net/arcnet/arc-rimi.c +8 -8
@@ -194,7 +194,7 @@ static int __init arcrimi_found(struct net_device *dev)/* initialize the rest of the device structure. */ - lp = dev->priv; + lp =netdev_priv (dev); lp->card_name ="RIM I" ; lp->hw.command = arcrimi_command; lp->hw.status = arcrimi_status;
@@ -260,7 +260,7 @@ err_free_irq:*/ static int arcrimi_reset (struct net_device *dev,int really_reset) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);void __iomem *ioaddr = lp->mem_start +0x800 ;BUGMSG (D_INIT ,"Resetting %s (status=%02Xh)\n" , dev->name,ASTATUS ());
@@ -281,7 +281,7 @@ static int arcrimi_reset(struct net_device *dev, int really_reset)static void arcrimi_setmask (struct net_device *dev,int mask) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);void __iomem *ioaddr = lp->mem_start +0x800 ;AINTMASK (mask);
@@ -289,7 +289,7 @@ static void arcrimi_setmask(struct net_device *dev, int mask)static int arcrimi_status (struct net_device *dev) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);void __iomem *ioaddr = lp->mem_start +0x800 ;return ASTATUS ();
@@ -297,7 +297,7 @@ static int arcrimi_status(struct net_device *dev)static void arcrimi_command (struct net_device *dev,int cmd) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);void __iomem *ioaddr = lp->mem_start +0x800 ;ACOMMAND (cmd);
@@ -306,7 +306,7 @@ static void arcrimi_command(struct net_device *dev, int cmd)static void arcrimi_copy_to_card (struct net_device *dev,int bufnum,int offset,void *buf,int count) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);void __iomem *memaddr = lp->mem_start +0x800 + bufnum *512 + offset;TIME ("memcpy_toio" , count,memcpy_toio (memaddr, buf, count)); }
@@ -315,7 +315,7 @@ static void arcrimi_copy_to_card(struct net_device *dev, int bufnum, int offset,static void arcrimi_copy_from_card (struct net_device *dev,int bufnum,int offset,void *buf,int count) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);void __iomem *memaddr = lp->mem_start +0x800 + bufnum *512 + offset;TIME ("memcpy_fromio" , count,memcpy_fromio (buf, memaddr, count)); }
@@ -361,7 +361,7 @@ static int __init arc_rimi_init(void) static void __exit arc_rimi_exit(void) {struct net_device *dev = my_dev; -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);unregister_netdev (dev);iounmap (lp->mem_start);
drivers/net/arcnet/arcnet.c +16 -16
@@ -181,7 +181,7 @@ EXPORT_SYMBOL(arcnet_dump_skb);static void arcnet_dump_packet (struct net_device *dev,int bufnum,char *desc,int take_arcnet_lock) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);int i, length;unsigned long flags =0 ;static uint8_t buf[512 ];
@@ -247,7 +247,7 @@ void arcnet_unregister_proto(struct ArcProto *proto)*/ static void release_arcbuf (struct net_device *dev,int bufnum) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);int i; lp->buf_queue[lp->first_free_buf++] = bufnum;
@@ -269,7 +269,7 @@ static void release_arcbuf(struct net_device *dev, int bufnum)*/ static int get_arcbuf (struct net_device *dev) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);int buf =-1 , i;if (!atomic_dec_and_test (&lp->buf_lock)) {
@@ -357,7 +357,7 @@ struct net_device *alloc_arcdev(char *name) dev =alloc_netdev (sizeof (struct arcnet_local ), name && *name ? name :"arc%d" , arcdev_setup);if (dev) { -struct arcnet_local *lp = (struct arcnet_local *) dev->priv; +struct arcnet_local *lp =netdev_priv (dev);spin_lock_init (&lp->lock); }
@@ -374,7 +374,7 @@ struct net_device *alloc_arcdev(char *name)*/ static int arcnet_open (struct net_device *dev) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);int count, newmtu, error;BUGMSG (D_INIT ,"opened." );
@@ -474,7 +474,7 @@ static int arcnet_open(struct net_device *dev)/* The inverse routine to arcnet_open - shuts down the card. */ static int arcnet_close (struct net_device *dev) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);netif_stop_queue (dev);
@@ -556,7 +556,7 @@ static int arcnet_header(struct sk_buff *skb, struct net_device *dev,static int arcnet_rebuild_header (struct sk_buff *skb) {struct net_device *dev = skb->dev; -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);int status =0 ;/* default is failure */ unsigned short type;uint8_t daddr=0 ;
@@ -603,7 +603,7 @@ static int arcnet_rebuild_header(struct sk_buff *skb)/* Called by the kernel in order to transmit a packet. */ static int arcnet_send_packet (struct sk_buff *skb,struct net_device *dev) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);struct archdr *pkt;struct arc_rfc1201 *soft;struct ArcProto *proto;
@@ -693,7 +693,7 @@ static int arcnet_send_packet(struct sk_buff *skb, struct net_device *dev)*/ static int go_tx (struct net_device *dev) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);BUGMSG (D_DURING ,"go_tx: status=%Xh, intmask=%Xh, next_tx=%d, cur_tx=%d\n" ,ASTATUS (), lp->intmask, lp->next_tx, lp->cur_tx);
@@ -723,7 +723,7 @@ static int go_tx(struct net_device *dev)static void arcnet_timeout (struct net_device *dev) {unsigned long flags; -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);int status =ASTATUS ();char *msg;
@@ -771,8 +771,8 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)BUGMSG (D_DURING ,"\n" );BUGMSG (D_DURING ,"in arcnet_interrupt\n" ); - - lp = dev->priv; + + lp =netdev_priv (dev);BUG_ON (!lp);spin_lock (&lp->lock);
@@ -1010,7 +1010,7 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)*/ static void arcnet_rx (struct net_device *dev,int bufnum) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);struct archdr pkt;struct arc_rfc1201 *soft;int length, ofs;
@@ -1074,7 +1074,7 @@ static void arcnet_rx(struct net_device *dev, int bufnum)*/ static struct net_device_stats *arcnet_get_stats (struct net_device *dev) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);return &lp->stats; }
@@ -1091,7 +1091,7 @@ static void null_rx(struct net_device *dev, int bufnum,static int null_build_header (struct sk_buff *skb,struct net_device *dev,unsigned short type,uint8_t daddr) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev); BUGMSG(D_PROTO, "tx: can't build header for encap %02Xh; load a protocol driver.\n",
@@ -1106,7 +1106,7 @@ static int null_build_header(struct sk_buff *skb, struct net_device *dev,static int null_prepare_tx (struct net_device *dev,struct archdr *pkt,int length,int bufnum) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);struct arc_hardware newpkt;BUGMSG (D_PROTO ,"tx: no encap for this host; load a protocol driver.\n" );
drivers/net/arcnet/capmode.c +3 -3
@@ -103,7 +103,7 @@ MODULE_LICENSE("GPL");static void rx (struct net_device *dev,int bufnum,struct archdr *pkthdr,int length) { -struct arcnet_local *lp = (struct arcnet_local *) dev->priv; +struct arcnet_local *lp =netdev_priv (dev);struct sk_buff *skb;struct archdr *pkt = pkthdr;char *pktbuf, *pkthdrbuf;
@@ -198,7 +198,7 @@ static int build_header(struct sk_buff *skb,static int prepare_tx (struct net_device *dev,struct archdr *pkt,int length,int bufnum) { -struct arcnet_local *lp = (struct arcnet_local *) dev->priv; +struct arcnet_local *lp =netdev_priv (dev);struct arc_hardware *hard = &pkt->hard;int ofs;
@@ -250,7 +250,7 @@ static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length,static int ack_tx (struct net_device *dev,int acked) { -struct arcnet_local *lp = (struct arcnet_local *) dev->priv; +struct arcnet_local *lp =netdev_priv (dev);struct sk_buff *ackskb;struct archdr *ackpkt;int length=sizeof (struct arc_cap );
drivers/net/arcnet/com20020-isa.c +2 -2
@@ -52,7 +52,7 @@ static int __init com20020isa_probe(struct net_device *dev) {int ioaddr;unsigned long airqmask; -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);int err;BUGLVL (D_NORMAL)printk (VERSION);
@@ -151,7 +151,7 @@ static int __init com20020_init(void)if (node && node !=0xff ) dev->dev_addr[0 ] = node; - lp = dev->priv; + lp =netdev_priv (dev); lp->backplane = backplane; lp->clockp = clockp &7 ; lp->clockm = clockm &3 ;
drivers/net/arcnet/com20020-pci.c +1 -1
@@ -72,7 +72,7 @@ static int __devinit com20020pci_probe(struct pci_dev *pdev, const struct pci_de dev =alloc_arcdev (device);if (!dev)return -ENOMEM ; - lp = dev->priv; + lp =netdev_priv (dev);pci_set_drvdata (pdev, dev);
drivers/net/arcnet/com20020.c +5 -5
@@ -89,7 +89,7 @@ static void com20020_copy_to_card(struct net_device *dev, int bufnum,int com20020_check (struct net_device *dev) {int ioaddr = dev->base_addr, status; -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);ARCRESET0 ;mdelay (RESETtime);
@@ -159,7 +159,7 @@ int com20020_found(struct net_device *dev, int shared)/* Initialize the rest of the device structure. */ - lp = dev->priv; + lp =netdev_priv (dev); lp->hw.owner =THIS_MODULE ; lp->hw.command = com20020_command;
@@ -233,7 +233,7 @@ int com20020_found(struct net_device *dev, int shared)*/ static int com20020_reset (struct net_device *dev,int really_reset) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);u_int ioaddr = dev->base_addr;u_char inbyte;
@@ -300,7 +300,7 @@ static int com20020_status(struct net_device *dev)static void com20020_close (struct net_device *dev) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);int ioaddr = dev->base_addr;/* disable transmitter */
@@ -317,7 +317,7 @@ static void com20020_close(struct net_device *dev)*/ static void com20020_set_mc_list (struct net_device *dev) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);int ioaddr = dev->base_addr;if ((dev->flags &IFF_PROMISC ) && (dev->flags &IFF_UP )) {/* Enable promiscuous mode */
drivers/net/arcnet/com90io.c +2 -2
@@ -248,7 +248,7 @@ static int __init com90io_found(struct net_device *dev)return -EBUSY ; } - lp = dev->priv; + lp =netdev_priv (dev); lp->card_name ="COM90xx I/O" ; lp->hw.command = com90io_command; lp->hw.status = com90io_status;
@@ -290,7 +290,7 @@ static int __init com90io_found(struct net_device *dev)*/ static int com90io_reset (struct net_device *dev,int really_reset) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);short ioaddr = dev->base_addr;BUGMSG (D_INIT ,"Resetting %s (status=%02Xh)\n" , dev->name,ASTATUS ());
drivers/net/arcnet/com90xx.c +5 -5
@@ -468,7 +468,7 @@ static int __init com90xx_found(int ioaddr, int airq, u_long shmem, void __iomemrelease_mem_region (shmem,MIRROR_SIZE );return -ENOMEM ; } - lp = dev->priv; + lp =netdev_priv (dev);/* find the real shared memory start/end points, including mirrors */ /* guess the actual size of one "memory mirror" - the number of
@@ -585,7 +585,7 @@ static void com90xx_setmask(struct net_device *dev, int mask)*/ int com90xx_reset (struct net_device *dev,int really_reset) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);short ioaddr = dev->base_addr;BUGMSG (D_INIT ,"Resetting (status=%02Xh)\n" ,ASTATUS ());
@@ -621,7 +621,7 @@ int com90xx_reset(struct net_device *dev, int really_reset)static void com90xx_copy_to_card (struct net_device *dev,int bufnum,int offset,void *buf,int count) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);void __iomem *memaddr = lp->mem_start + bufnum *512 + offset;TIME ("memcpy_toio" , count,memcpy_toio (memaddr, buf, count)); }
@@ -630,7 +630,7 @@ static void com90xx_copy_to_card(struct net_device *dev, int bufnum, int offset,static void com90xx_copy_from_card (struct net_device *dev,int bufnum,int offset,void *buf,int count) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);void __iomem *memaddr = lp->mem_start + bufnum *512 + offset;TIME ("memcpy_fromio" , count,memcpy_fromio (buf, memaddr, count)); }
@@ -656,7 +656,7 @@ static void __exit com90xx_exit(void)for (count =0 ; count < numcards; count++) { dev = cards[count]; - lp = dev->priv; + lp =netdev_priv (dev);unregister_netdev (dev);free_irq (dev->irq, dev);
drivers/net/arcnet/rfc1051.c +4 -4
@@ -88,7 +88,7 @@ MODULE_LICENSE("GPL");*/ static __be16 type_trans (struct sk_buff *skb,struct net_device *dev) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);struct archdr *pkt = (struct archdr *) skb->data;struct arc_rfc1051 *soft = &pkt->soft.rfc1051;int hdr_size =ARC_HDR_SIZE +RFC1051_HDR_SIZE ;
@@ -125,7 +125,7 @@ static __be16 type_trans(struct sk_buff *skb, struct net_device *dev)static void rx (struct net_device *dev,int bufnum,struct archdr *pkthdr,int length) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);struct sk_buff *skb;struct archdr *pkt = pkthdr;int ofs;
@@ -169,7 +169,7 @@ static void rx(struct net_device *dev, int bufnum,static int build_header (struct sk_buff *skb,struct net_device *dev,unsigned short type,uint8_t daddr) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);int hdr_size =ARC_HDR_SIZE +RFC1051_HDR_SIZE ;struct archdr *pkt = (struct archdr *)skb_push (skb, hdr_size);struct arc_rfc1051 *soft = &pkt->soft.rfc1051;
@@ -220,7 +220,7 @@ static int build_header(struct sk_buff *skb, struct net_device *dev,static int prepare_tx (struct net_device *dev,struct archdr *pkt,int length,int bufnum) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);struct arc_hardware *hard = &pkt->hard;int ofs;
drivers/net/arcnet/rfc1201.c +6 -6
@@ -92,7 +92,7 @@ static __be16 type_trans(struct sk_buff *skb, struct net_device *dev) {struct archdr *pkt = (struct archdr *) skb->data;struct arc_rfc1201 *soft = &pkt->soft.rfc1201; -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);int hdr_size =ARC_HDR_SIZE +RFC1201_HDR_SIZE ;/* Pull off the arcnet header. */
@@ -134,7 +134,7 @@ static __be16 type_trans(struct sk_buff *skb, struct net_device *dev)static void rx (struct net_device *dev,int bufnum,struct archdr *pkthdr,int length) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);struct sk_buff *skb;struct archdr *pkt = pkthdr;struct arc_rfc1201 *soft = &pkthdr->soft.rfc1201;
@@ -376,7 +376,7 @@ static void rx(struct net_device *dev, int bufnum,static int build_header (struct sk_buff *skb,struct net_device *dev,unsigned short type,uint8_t daddr) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);int hdr_size =ARC_HDR_SIZE +RFC1201_HDR_SIZE ;struct archdr *pkt = (struct archdr *)skb_push (skb, hdr_size);struct arc_rfc1201 *soft = &pkt->soft.rfc1201;
@@ -443,7 +443,7 @@ static int build_header(struct sk_buff *skb, struct net_device *dev,static void load_pkt (struct net_device *dev,struct arc_hardware *hard,struct arc_rfc1201 *soft,int softlen,int bufnum) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);int ofs;/* assume length <= XMTU: someone should have handled that by now. */
@@ -476,7 +476,7 @@ static void load_pkt(struct net_device *dev, struct arc_hardware *hard,static int prepare_tx (struct net_device *dev,struct archdr *pkt,int length,int bufnum) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);const int maxsegsize =XMTU -RFC1201_HDR_SIZE ;struct Outgoing *out;
@@ -511,7 +511,7 @@ static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length,static int continue_tx (struct net_device *dev,int bufnum) { -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);struct Outgoing *out = &lp->outgoing;struct arc_hardware *hard = &out->pkt->hard;struct arc_rfc1201 *soft = &out->pkt->soft.rfc1201, *newsoft;
drivers/net/atarilance.c +17 -17
@@ -521,7 +521,7 @@ static unsigned long __init lance_probe1( struct net_device *dev,return (0 ); probe_ok: - lp = (struct lance_private *)dev->priv; + lp =netdev_priv (dev);MEM = (struct lance_memory *)memaddr;IO = lp->iobase = (struct lance_ioreg *)ioaddr; dev->base_addr = (unsigned long )ioaddr;/* informational only */
@@ -640,8 +640,8 @@ static unsigned long __init lance_probe1( struct net_device *dev,static int lance_open (struct net_device *dev ) - -{struct lance_private *lp = (struct lance_private *)dev->priv; +{ +struct lance_private *lp =netdev_priv (dev);struct lance_ioreg *IO = lp->iobase;int i;
@@ -681,8 +681,8 @@ static int lance_open( struct net_device *dev )/* Initialize the LANCE Rx and Tx rings. */ static void lance_init_ring (struct net_device *dev ) - -{struct lance_private *lp = (struct lance_private *)dev->priv; +{ +struct lance_private *lp =netdev_priv (dev);int i;unsigned offset;
@@ -730,7 +730,7 @@ static void lance_init_ring( struct net_device *dev )static void lance_tx_timeout (struct net_device *dev) { -struct lance_private *lp = (struct lance_private *) dev->priv; +struct lance_private *lp =netdev_priv (dev);struct lance_ioreg *IO = lp->iobase;AREG =CSR0 ;
@@ -772,8 +772,8 @@ static void lance_tx_timeout (struct net_device *dev)/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */ static int lance_start_xmit (struct sk_buff *skb,struct net_device *dev ) - -{struct lance_private *lp = (struct lance_private *)dev->priv; +{ +struct lance_private *lp =netdev_priv (dev);struct lance_ioreg *IO = lp->iobase;int entry, len;struct lance_tx_head *head;
@@ -865,7 +865,7 @@ static irqreturn_t lance_interrupt( int irq, void *dev_id )return IRQ_NONE ; } - lp = (struct lance_private *)dev->priv; + lp =netdev_priv (dev);IO = lp->iobase;spin_lock (&lp->devlock);
@@ -965,8 +965,8 @@ static irqreturn_t lance_interrupt( int irq, void *dev_id )static int lance_rx (struct net_device *dev ) - -{struct lance_private *lp = (struct lance_private *)dev->priv; +{ +struct lance_private *lp =netdev_priv (dev);int entry = lp->cur_rx &RX_RING_MOD_MASK ;int i;
@@ -1057,8 +1057,8 @@ static int lance_rx( struct net_device *dev )static int lance_close (struct net_device *dev ) - -{struct lance_private *lp = (struct lance_private *)dev->priv; +{ +struct lance_private *lp =netdev_priv (dev);struct lance_ioreg *IO = lp->iobase;netif_stop_queue (dev);
@@ -1084,8 +1084,8 @@ static int lance_close( struct net_device *dev )*/ static void set_multicast_list (struct net_device *dev ) - -{struct lance_private *lp = (struct lance_private *)dev->priv; +{ +struct lance_private *lp =netdev_priv (dev);struct lance_ioreg *IO = lp->iobase;if (netif_running (dev))
@@ -1126,8 +1126,8 @@ static void set_multicast_list( struct net_device *dev )/* This is needed for old RieblCards and possible for new RieblCards */ static int lance_set_mac_address (struct net_device *dev,void *addr ) - -{struct lance_private *lp = (struct lance_private *)dev->priv; +{ +struct lance_private *lp =netdev_priv (dev);struct sockaddr *saddr = addr;int i;
drivers/net/atl1e/atl1e_main.c +3 -3
@@ -2490,7 +2490,7 @@ static pci_ers_result_t atl1e_io_error_detected(struct pci_dev *pdev, pci_channel_state_t state) {struct net_device *netdev =pci_get_drvdata (pdev); -struct atl1e_adapter *adapter = netdev->priv; +struct atl1e_adapter *adapter =netdev_priv (netdev);netif_device_detach (netdev);
@@ -2513,7 +2513,7 @@ atl1e_io_error_detected(struct pci_dev *pdev, pci_channel_state_t state)static pci_ers_result_t atl1e_io_slot_reset (struct pci_dev *pdev) {struct net_device *netdev =pci_get_drvdata (pdev); -struct atl1e_adapter *adapter = netdev->priv; +struct atl1e_adapter *adapter =netdev_priv (netdev);if (pci_enable_device (pdev)) { dev_err(&pdev->dev,
@@ -2541,7 +2541,7 @@ static pci_ers_result_t atl1e_io_slot_reset(struct pci_dev *pdev)static void atl1e_io_resume (struct pci_dev *pdev) {struct net_device *netdev =pci_get_drvdata (pdev); -struct atl1e_adapter *adapter = netdev->priv; +struct atl1e_adapter *adapter =netdev_priv (netdev);if (netif_running (netdev)) {if (atl1e_up (adapter)) {
drivers/net/atp.c +2 -1
@@ -913,7 +913,8 @@ static void __exit atp_cleanup_module(void) {struct net_device *next_dev;while (root_atp_dev) { - next_dev = ((struct net_local *)root_atp_dev->priv)->next_module; +struct net_local *atp_local =netdev_priv (root_atp_dev); + next_dev = atp_local->next_module;unregister_netdev (root_atp_dev);/* No need to release_region(), since we never snarf it. */ free_netdev (root_atp_dev);
drivers/net/au1000_eth.c +24 -24
192 lines not on this page · raw message
drivers/net/bonding/bond_3ad.c +4 -3
@@ -2346,7 +2346,7 @@ int bond_3ad_get_active_agg_info(struct bonding *bond, struct ad_info *ad_info)int bond_3ad_xmit_xor (struct sk_buff *skb,struct net_device *dev) {struct slave *slave, *start_at; -struct bonding *bond = dev->priv; +struct bonding *bond =netdev_priv (dev);int slave_agg_no;int slaves_in_agg;int agg_id;
@@ -2426,7 +2426,7 @@ out:int bond_3ad_lacpdu_recv (struct sk_buff *skb,struct net_device *dev,struct packet_type * ptype,struct net_device *orig_dev) { -struct bonding *bond = dev->priv; +struct bonding *bond =netdev_priv (dev);struct slave *slave =NULL ;int ret =NET_RX_DROP ;
@@ -2437,7 +2437,8 @@ int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct pac goto out;read_lock (&bond->lock); - slave =bond_get_slave_by_dev ((struct bonding *)dev->priv, orig_dev); + slave =bond_get_slave_by_dev ((struct bonding *)netdev_priv (dev), + orig_dev);if (!slave) goto out_unlock;
drivers/net/bonding/bond_alb.c +3 -3
@@ -341,7 +341,7 @@ static void rlb_update_entry_from_arp(struct bonding *bond, struct arp_pkt *arp)static int rlb_arp_recv (struct sk_buff *skb,struct net_device *bond_dev,struct packet_type *ptype,struct net_device *orig_dev) { -struct bonding *bond = bond_dev->priv; +struct bonding *bond =netdev_priv (bond_dev);struct arp_pkt *arp = (struct arp_pkt *)skb->data;int res =NET_RX_DROP ;
@@ -1280,7 +1280,7 @@ void bond_alb_deinitialize(struct bonding *bond)int bond_alb_xmit (struct sk_buff *skb,struct net_device *bond_dev) { -struct bonding *bond = bond_dev->priv; +struct bonding *bond =netdev_priv (bond_dev);struct ethhdr *eth_data;struct alb_bond_info *bond_info = &(BOND_ALB_INFO (bond));struct slave *tx_slave =NULL ;
@@ -1679,7 +1679,7 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave*/ int bond_alb_set_mac_address (struct net_device *bond_dev,void *addr) { -struct bonding *bond = bond_dev->priv; +struct bonding *bond =netdev_priv (bond_dev);struct sockaddr *sa = addr;struct slave *slave, *swap_slave;int res;
drivers/net/bonding/bond_main.c +29 -29
232 lines not on this page · raw message
drivers/net/bonding/bond_sysfs.c +1 -1
@@ -39,7 +39,7 @@/* #define BONDING_DEBUG 1 */ #include "bonding.h" #define to_dev (obj) container_of(obj,struct device,kobj) -#define to_bond (cd) ((struct bonding *)(to_net_dev(cd)->priv)) +#define to_bond (cd) ((struct bonding *)(netdev_priv(to_net_dev(cd))))/*---------------------------- Declarations -------------------------------*/
drivers/net/bonding/bonding.h +2 -2
@@ -245,7 +245,7 @@ static inline struct bonding *bond_get_bond_by_slave(struct slave *slave)return NULL ; } -return (struct bonding *)slave->dev->master->priv; +return (struct bonding *)netdev_priv (slave->dev->master); }#define BOND_FOM_NONE 0
@@ -275,7 +275,7 @@ static inline unsigned long slave_last_rx(struct bonding *bond,static inline void bond_set_slave_inactive_flags (struct slave *slave) { -struct bonding *bond = slave->dev->master->priv; +struct bonding *bond =netdev_priv (slave->dev->master);if (bond->params.mode !=BOND_MODE_TLB && bond->params.mode !=BOND_MODE_ALB ) slave->state =BOND_STATE_BACKUP ;
drivers/net/iseries_veth.c +7 -7
@@ -952,7 +952,7 @@ static int veth_change_mtu(struct net_device *dev, int new_mtu)static void veth_set_multicast_list (struct net_device *dev) { -struct veth_port *port = (struct veth_port *) dev->priv; +struct veth_port *port =netdev_priv (dev);unsigned long flags;write_lock_irqsave (&port->mcast_gate, flags);
@@ -1044,7 +1044,7 @@ static struct net_device *veth_probe_one(int vlan,return NULL ; } - port = (struct veth_port *) dev->priv; + port =netdev_priv (dev);spin_lock_init (&port->queue_lock);rwlock_init (&port->mcast_gate);
@@ -1102,7 +1102,7 @@ static int veth_transmit_to_one(struct sk_buff *skb, HvLpIndex rlp, struct net_device *dev) {struct veth_lpar_connection *cnx = veth_cnx[rlp]; -struct veth_port *port = (struct veth_port *) dev->priv; +struct veth_port *port =netdev_priv (dev);HvLpEvent_Rc rc;struct veth_msg *msg =NULL ;unsigned long flags;
@@ -1191,7 +1191,7 @@ static void veth_transmit_to_many(struct sk_buff *skb,static int veth_start_xmit (struct sk_buff *skb,struct net_device *dev) {unsigned char *frame = skb->data; -struct veth_port *port = (struct veth_port *) dev->priv; +struct veth_port *port =netdev_priv (dev);HvLpIndexMap lpmask;if (! (frame[0 ] &0x01 )) {
@@ -1255,7 +1255,7 @@ static void veth_wake_queues(struct veth_lpar_connection *cnx)if (! dev)continue ; - port = (struct veth_port *)dev->priv; + port =netdev_priv (dev);if (! (port->lpar_map & (1 <<cnx->remote_lp)))continue ;
@@ -1284,7 +1284,7 @@ static void veth_stop_queues(struct veth_lpar_connection *cnx)if (! dev)continue ; - port = (struct veth_port *)dev->priv; + port =netdev_priv (dev);/* If this cnx is not on the vlan for this port, continue */ if (! (port->lpar_map & (1 << cnx->remote_lp)))
@@ -1506,7 +1506,7 @@ static void veth_receive(struct veth_lpar_connection *cnx,continue ; } - port = (struct veth_port *)dev->priv; + port =netdev_priv (dev); dest = *((u64 *) skb->data) &0xFFFFFFFFFFFF0000 ;if ((vlan >HVMAXARCHITECTEDVIRTUALLANS ) || !port) {
drivers/net/ixgbe/ixgbe_ethtool.c +3 -3
@@ -95,9 +95,9 @@ static struct ixgbe_stats ixgbe_gstrings_stats[] = { };#define IXGBE_QUEUE_STATS_LEN \ - ((((struct ixgbe_adapter *)netdev->priv)->num_tx_queues + \ - ((struct ixgbe_adapter *)netdev->priv)->num_rx_queues) * \ - (sizeof(struct ixgbe_queue_stats) / sizeof(u64))) + ((((struct ixgbe_adapter *)netdev_priv(netdev))->num_tx_queues + \ + ((struct ixgbe_adapter *)netdev_priv(netdev))->num_rx_queues) * \ + (sizeof(struct ixgbe_queue_stats) / sizeof(u64)))#define IXGBE_GLOBAL_STATS_LEN ARRAY_SIZE(ixgbe_gstrings_stats)#define IXGBE_STATS_LEN (IXGBE_GLOBAL_STATS_LEN + IXGBE_QUEUE_STATS_LEN)
drivers/net/ixgbe/ixgbe_main.c +3 -3
@@ -3729,7 +3729,7 @@ static pci_ers_result_t ixgbe_io_error_detected(struct pci_dev *pdev, pci_channel_state_t state) {struct net_device *netdev =pci_get_drvdata (pdev); -struct ixgbe_adapter *adapter = netdev->priv; +struct ixgbe_adapter *adapter =netdev_priv (netdev);netif_device_detach (netdev);
@@ -3750,7 +3750,7 @@ static pci_ers_result_t ixgbe_io_error_detected(struct pci_dev *pdev,static pci_ers_result_t ixgbe_io_slot_reset (struct pci_dev *pdev) {struct net_device *netdev =pci_get_drvdata (pdev); -struct ixgbe_adapter *adapter = netdev->priv; +struct ixgbe_adapter *adapter =netdev_priv (netdev);if (pci_enable_device (pdev)) { DPRINTK(PROBE, ERR,
@@ -3778,7 +3778,7 @@ static pci_ers_result_t ixgbe_io_slot_reset(struct pci_dev *pdev)static void ixgbe_io_resume (struct pci_dev *pdev) {struct net_device *netdev =pci_get_drvdata (pdev); -struct ixgbe_adapter *adapter = netdev->priv; +struct ixgbe_adapter *adapter =netdev_priv (netdev);if (netif_running (netdev)) {if (ixgbe_up (adapter)) {
drivers/net/lp486e.c +14 -14
@@ -390,7 +390,7 @@ i596_timeout(struct net_device *dev, char *msg, int ct) {struct i596_private *lp;int boguscnt = ct; - lp = (struct i596_private *) dev->priv; + lp =netdev_priv (dev);while (lp->scb.command) {if (--boguscnt ==0 ) { printk("%s: %s timed out - stat %4.4x, cmd %4.4x\n",
@@ -411,7 +411,7 @@ init_rx_bufs(struct net_device *dev, int num) {int i;// struct i596_rbd *rbd; - lp = (struct i596_private *) dev->priv; + lp =netdev_priv (dev); lp->scb.pa_rfd =I596_NULL ;for (i =0 ; i < num; i++) {
@@ -468,7 +468,7 @@ remove_rx_bufs(struct net_device *dev) {struct i596_private *lp;struct i596_rfd *rfd; - lp = (struct i596_private *) dev->priv; + lp =netdev_priv (dev); lp->rx_tail->pa_next =I596_NULL ; do {
@@ -517,7 +517,7 @@ CLEAR_INT(void) {/* selftest or dump */ static void i596_port_do (struct net_device *dev,int portcmd,char *cmdname) { -struct i596_private *lp = dev->priv; +struct i596_private *lp =netdev_priv (dev);u16 *outp;int i, m;
@@ -541,7 +541,7 @@ i596_port_do(struct net_device *dev, int portcmd, char *cmdname) {static int i596_scp_setup (struct net_device *dev) { -struct i596_private *lp = dev->priv; +struct i596_private *lp =netdev_priv (dev);int boguscnt;/* Setup SCP, ISCP, SCB */
@@ -622,7 +622,7 @@ init_i596(struct net_device *dev) {if (i596_scp_setup (dev))return 1 ; - lp = (struct i596_private *) dev->priv; + lp =netdev_priv (dev); lp->scb.command =0 ;memcpy ((void *)lp->i596_config, init_setup,14 );
@@ -705,7 +705,7 @@ i596_rx_one(struct net_device *dev, struct i596_private *lp,static int i596_rx (struct net_device *dev) { -struct i596_private *lp = (struct i596_private *) dev->priv; +struct i596_private *lp =netdev_priv (dev);struct i596_rfd *rfd;int frames =0 ;
@@ -738,7 +738,7 @@ i596_cleanup_cmd(struct net_device *dev) {struct i596_private *lp;struct i596_cmd *cmd; - lp = (struct i596_private *) dev->priv; + lp =netdev_priv (dev);while (lp->cmd_head) { cmd = (struct i596_cmd *)lp->cmd_head;
@@ -806,7 +806,7 @@ static void i596_reset(struct net_device *dev, struct i596_private *lp, int ioad }static void i596_add_cmd (struct net_device *dev,struct i596_cmd *cmd) { -struct i596_private *lp = dev->priv; +struct i596_private *lp =netdev_priv (dev);int ioaddr = dev->base_addr;unsigned long flags;
@@ -912,7 +912,7 @@ static int i596_start_xmit (struct sk_buff *skb, struct net_device *dev) {static void i596_tx_timeout (struct net_device *dev) { -struct i596_private *lp = dev->priv; +struct i596_private *lp =netdev_priv (dev);int ioaddr = dev->base_addr;/* Transmitter timeout, serious problems. */
@@ -970,7 +970,7 @@ static int __init lp486e_probe(struct net_device *dev) {return -EBUSY ; } - lp = (struct i596_private *) dev->priv; + lp =netdev_priv (dev);spin_lock_init (&lp->cmd_lock);/*
@@ -1147,7 +1147,7 @@ static irqreturn_t i596_interrupt(int irq, void *dev_instance) { struct net_device *dev = dev_instance; -struct i596_private *lp = dev->priv; +struct i596_private *lp =netdev_priv (dev);unsigned short status, ack_cmd =0 ;int frames_in =0 ;
@@ -1215,7 +1215,7 @@ i596_interrupt(int irq, void *dev_instance) }static int i596_close (struct net_device *dev) { -struct i596_private *lp = dev->priv; +struct i596_private *lp =netdev_priv (dev);netif_stop_queue (dev);
@@ -1242,7 +1242,7 @@ static int i596_close(struct net_device *dev) {*/ static void set_multicast_list (struct net_device *dev) { -struct i596_private *lp = dev->priv; +struct i596_private *lp =netdev_priv (dev);struct i596_cmd *cmd;if (i596_debug >1 )
drivers/net/mace.c +14 -14
@@ -144,7 +144,7 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i }SET_NETDEV_DEV (dev, &mdev->ofdev.dev); - mp = dev->priv; + mp =netdev_priv (dev); mp->mdev = mdev;macio_set_drvdata (mdev, dev);
@@ -165,7 +165,7 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_iin_8 (&mp->mace->chipid_lo); - mp = (struct mace_data *) dev->priv; + mp =netdev_priv (dev); mp->maccc =ENXMT |ENRCV ; mp->tx_dma =ioremap (macio_resource_start (mdev,1 ),0x1000 );
@@ -276,7 +276,7 @@ static int __devexit mace_remove(struct macio_dev *mdev)macio_set_drvdata (mdev,NULL ); - mp = dev->priv; + mp =netdev_priv (dev);unregister_netdev (dev);
@@ -312,7 +312,7 @@ static void dbdma_reset(volatile struct dbdma_regs __iomem *dma)static void mace_reset (struct net_device *dev) { -struct mace_data *mp = (struct mace_data *) dev->priv; +struct mace_data *mp =netdev_priv (dev);volatile struct mace __iomem *mb = mp->mace;int i;
@@ -367,7 +367,7 @@ static void mace_reset(struct net_device *dev)static void __mace_set_address (struct net_device *dev,void *addr) { -struct mace_data *mp = (struct mace_data *) dev->priv; +struct mace_data *mp =netdev_priv (dev);volatile struct mace __iomem *mb = mp->mace;unsigned char *p = addr;int i;
@@ -388,7 +388,7 @@ static void __mace_set_address(struct net_device *dev, void *addr)static int mace_set_address (struct net_device *dev,void *addr) { -struct mace_data *mp = (struct mace_data *) dev->priv; +struct mace_data *mp =netdev_priv (dev);volatile struct mace __iomem *mb = mp->mace;unsigned long flags;
@@ -423,7 +423,7 @@ static inline void mace_clean_rings(struct mace_data *mp)static int mace_open (struct net_device *dev) { -struct mace_data *mp = (struct mace_data *) dev->priv; +struct mace_data *mp =netdev_priv (dev);volatile struct mace __iomem *mb = mp->mace;volatile struct dbdma_regs __iomem *rd = mp->rx_dma;volatile struct dbdma_regs __iomem *td = mp->tx_dma;
@@ -493,7 +493,7 @@ static int mace_open(struct net_device *dev)static int mace_close (struct net_device *dev) { -struct mace_data *mp = (struct mace_data *) dev->priv; +struct mace_data *mp =netdev_priv (dev);volatile struct mace __iomem *mb = mp->mace;volatile struct dbdma_regs __iomem *rd = mp->rx_dma;volatile struct dbdma_regs __iomem *td = mp->tx_dma;
@@ -513,7 +513,7 @@ static int mace_close(struct net_device *dev)static inline void mace_set_timeout (struct net_device *dev) { -struct mace_data *mp = (struct mace_data *) dev->priv; +struct mace_data *mp =netdev_priv (dev);if (mp->timeout_active)del_timer (&mp->tx_timeout);
@@ -526,7 +526,7 @@ static inline void mace_set_timeout(struct net_device *dev)static int mace_xmit_start (struct sk_buff *skb,struct net_device *dev) { -struct mace_data *mp = (struct mace_data *) dev->priv; +struct mace_data *mp =netdev_priv (dev);volatile struct dbdma_regs __iomem *td = mp->tx_dma;volatile struct dbdma_cmd *cp, *np;unsigned long flags;
@@ -581,7 +581,7 @@ static int mace_xmit_start(struct sk_buff *skb, struct net_device *dev)static void mace_set_multicast (struct net_device *dev) { -struct mace_data *mp = (struct mace_data *) dev->priv; +struct mace_data *mp =netdev_priv (dev);volatile struct mace __iomem *mb = mp->mace;int i, j;u32 crc;
@@ -656,7 +656,7 @@ static void mace_handle_misc_intrs(struct mace_data *mp, int intr, struct net_destatic irqreturn_t mace_interrupt (int irq,void *dev_id) {struct net_device *dev = (struct net_device *) dev_id; -struct mace_data *mp = (struct mace_data *) dev->priv; +struct mace_data *mp =netdev_priv (dev);volatile struct mace __iomem *mb = mp->mace;volatile struct dbdma_regs __iomem *td = mp->tx_dma;volatile struct dbdma_cmd *cp;
@@ -802,7 +802,7 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id)static void mace_tx_timeout (unsigned long data) {struct net_device *dev = (struct net_device *) data; -struct mace_data *mp = (struct mace_data *) dev->priv; +struct mace_data *mp =netdev_priv (dev);volatile struct mace __iomem *mb = mp->mace;volatile struct dbdma_regs __iomem *td = mp->tx_dma;volatile struct dbdma_regs __iomem *rd = mp->rx_dma;
@@ -873,7 +873,7 @@ static irqreturn_t mace_txdma_intr(int irq, void *dev_id)static irqreturn_t mace_rxdma_intr (int irq,void *dev_id) {struct net_device *dev = (struct net_device *) dev_id; -struct mace_data *mp = (struct mace_data *) dev->priv; +struct mace_data *mp =netdev_priv (dev);volatile struct dbdma_regs __iomem *rd = mp->rx_dma;volatile struct dbdma_cmd *cp, *np;int i, nb, stat, next;
Signature · 1 line
1.5.3.4
PATCH 2/18 netdevice: safe convert to netdev_priv() #part-2
In reply to Wang ChenSigned-off-by Wang Chen <[email protected]>
--- drivers/net/declance.c | 2 +- drivers/net/depca.c | 40 +++++++++--------- drivers/net/dm9000.c | 32 +++++++------- drivers/net/e1000/e1000_main.c | 9 ++-- drivers/net/e1000e/netdev.c | 3 +- drivers/net/eepro.c | 4 +- drivers/net/epic100.c | 42 +++++++++--------- drivers/net/eth16i.c | 2 +- drivers/net/fec.c | 2 +- drivers/net/ibmveth.c | 34 +++++++------- drivers/net/igb/igb_ethtool.c | 4 +- drivers/net/irda/ali-ircc.c | 16 ++++---- drivers/net/irda/donauboe.c | 8 ++-- drivers/net/irda/irda-usb.c | 14 +++--- drivers/net/irda/nsc-ircc.c | 16 ++++---- drivers/net/irda/sa1100_ir.c | 26 ++++++------ drivers/net/irda/sir_dev.c | 12 +++--- drivers/net/irda/via-ircc.c | 16 ++++---- drivers/net/irda/vlsi_ir.c | 36 ++++++++-------- drivers/net/irda/w83977af_ir.c | 14 +++--- drivers/net/mv643xx_eth.c | 2 +- drivers/net/mvme147.c | 4 +- drivers/net/myri_sbus.c | 12 +++--- drivers/net/ne2k-pci.c | 2 +- drivers/net/netxen/netxen_nic_hw.c | 2 +- drivers/net/netxen/netxen_nic_main.c | 4 +- drivers/net/ni5010.c | 2 +- drivers/net/ni52.c | 36 ++++++++-------- drivers/net/pasemi_mac_ethtool.c | 4 +- drivers/net/pcmcia/com20020_cs.c | 6 +- drivers/net/plip.c | 8 ++-- drivers/net/rionet.c | 26 ++++++------ drivers/net/s2io.c | 78 +++++++++++++++++----------------- 33 files changed, 258 insertions(+), 260 deletions(-)
drivers/net/declance.c +1 -1
@@ -1035,7 +1035,7 @@ static int __init dec_lance_probe(struct device *bdev, const int type) dev = root_lance_dev;while (dev) { i++; - lp = (struct lance_private *)dev->priv; + lp =netdev_priv (dev); dev = lp->next; }snprintf (name,sizeof (name), fmt, i);
drivers/net/depca.c +20 -20
@@ -601,7 +601,7 @@ static int __init depca_hw_init (struct net_device *dev, struct device *device)return -ENXIO ; } - lp = (struct depca_private *) dev->priv; + lp =netdev_priv (dev); mem_start = lp->mem_start;if (!mem_start || lp->adapter <DEPCA || lp->adapter >=unknown)
@@ -821,7 +821,7 @@ out_priv:static int depca_open (struct net_device *dev) { -struct depca_private *lp = (struct depca_private *) dev->priv; +struct depca_private *lp =netdev_priv (dev);u_long ioaddr = dev->base_addr;s16 nicsr;int status =0 ;
@@ -866,7 +866,7 @@ static int depca_open(struct net_device *dev)/* Initialize the lance Rx and Tx descriptor rings. */ static void depca_init_ring (struct net_device *dev) { -struct depca_private *lp = (struct depca_private *) dev->priv; +struct depca_private *lp =netdev_priv (dev);u_int i;u_long offset;
@@ -924,7 +924,7 @@ static void depca_tx_timeout(struct net_device *dev)*/ static int depca_start_xmit (struct sk_buff *skb,struct net_device *dev) { -struct depca_private *lp = (struct depca_private *) dev->priv; +struct depca_private *lp =netdev_priv (dev);u_long ioaddr = dev->base_addr;int status =0 ;
@@ -972,7 +972,7 @@ static irqreturn_t depca_interrupt(int irq, void *dev_id)return IRQ_NONE ; } - lp = (struct depca_private *) dev->priv; + lp =netdev_priv (dev); ioaddr = dev->base_addr;spin_lock (&lp->lock);
@@ -1010,7 +1010,7 @@ static irqreturn_t depca_interrupt(int irq, void *dev_id)/* Called with lp->lock held */ static int depca_rx (struct net_device *dev) { -struct depca_private *lp = (struct depca_private *) dev->priv; +struct depca_private *lp =netdev_priv (dev);int i, entry;s32 status;
@@ -1108,7 +1108,7 @@ static int depca_rx(struct net_device *dev)*/ static int depca_tx (struct net_device *dev) { -struct depca_private *lp = (struct depca_private *) dev->priv; +struct depca_private *lp =netdev_priv (dev);int entry;s32 status;u_long ioaddr = dev->base_addr;
@@ -1149,7 +1149,7 @@ static int depca_tx(struct net_device *dev)static int depca_close (struct net_device *dev) { -struct depca_private *lp = (struct depca_private *) dev->priv; +struct depca_private *lp =netdev_priv (dev);s16 nicsr;u_long ioaddr = dev->base_addr;
@@ -1185,7 +1185,7 @@ static int depca_close(struct net_device *dev)static void LoadCSRs (struct net_device *dev) { -struct depca_private *lp = (struct depca_private *) dev->priv; +struct depca_private *lp =netdev_priv (dev);u_long ioaddr = dev->base_addr;outw (CSR1 ,DEPCA_ADDR );/* initialisation block address LSW */
@@ -1202,7 +1202,7 @@ static void LoadCSRs(struct net_device *dev)static int InitRestartDepca (struct net_device *dev) { -struct depca_private *lp = (struct depca_private *) dev->priv; +struct depca_private *lp =netdev_priv (dev);u_long ioaddr = dev->base_addr;int i, status =0 ;
@@ -1234,7 +1234,7 @@ static int InitRestartDepca(struct net_device *dev)*/ static void set_multicast_list (struct net_device *dev) { -struct depca_private *lp = (struct depca_private *) dev->priv; +struct depca_private *lp =netdev_priv (dev);u_long ioaddr = dev->base_addr;netif_stop_queue (dev);
@@ -1263,7 +1263,7 @@ static void set_multicast_list(struct net_device *dev)*/ static void SetMulticastFilter (struct net_device *dev) { -struct depca_private *lp = (struct depca_private *) dev->priv; +struct depca_private *lp =netdev_priv (dev);struct dev_mc_list *dmi = dev->mc_list;char *addrs;int i, j, bit, byte;
@@ -1431,7 +1431,7 @@ static int __init depca_mca_probe(struct device *device) dev->irq = irq; dev->base_addr = iobase; - lp = dev->priv; + lp =netdev_priv (dev); lp->depca_bus =DEPCA_BUS_MCA ; lp->adapter = depca_mca_adapter_type[mdev->index]; lp->mem_start = mem_start;
@@ -1534,7 +1534,7 @@ static int __init depca_isa_probe (struct platform_device *device) dev->base_addr = ioaddr; dev->irq = irq;/* Use whatever value the user gave * us, and 0 if he didn't. */ - lp = dev->priv; + lp =netdev_priv (dev); lp->depca_bus =DEPCA_BUS_ISA ; lp->adapter = adapter; lp->mem_start = mem_start;
@@ -1580,7 +1580,7 @@ static int __init depca_eisa_probe (struct device *device) dev->base_addr = ioaddr; dev->irq = irq; - lp = dev->priv; + lp =netdev_priv (dev); lp->depca_bus =DEPCA_BUS_EISA ; lp->adapter = edev->id.driver_data; lp->mem_start = mem_start;
@@ -1605,7 +1605,7 @@ static int __devexit depca_device_remove (struct device *device)int bus; dev = device->driver_data; - lp = dev->priv; + lp =netdev_priv (dev);unregister_netdev (dev);iounmap (lp->sh_mem);
@@ -1747,7 +1747,7 @@ static int __init DevicePresent(u_long ioaddr)static int __init get_hw_addr (struct net_device *dev) {u_long ioaddr = dev->base_addr; -struct depca_private *lp = dev->priv; +struct depca_private *lp =netdev_priv (dev);int i, k, tmp, status =0 ;u_short j, x, chksum;
@@ -1782,7 +1782,7 @@ static int __init get_hw_addr(struct net_device *dev)*/ static int load_packet (struct net_device *dev,struct sk_buff *skb) { -struct depca_private *lp = (struct depca_private *) dev->priv; +struct depca_private *lp =netdev_priv (dev);int i, entry, end, len, status =0 ; entry = lp->tx_new;/* Ring around buffer number. */
@@ -1837,7 +1837,7 @@ static int load_packet(struct net_device *dev, struct sk_buff *skb)static void depca_dbg_open (struct net_device *dev) { -struct depca_private *lp = (struct depca_private *) dev->priv; +struct depca_private *lp =netdev_priv (dev);u_long ioaddr = dev->base_addr;struct depca_init *p = &lp->init_block;int i;
@@ -1909,7 +1909,7 @@ static void depca_dbg_open(struct net_device *dev)*/ static int depca_ioctl (struct net_device *dev,struct ifreq *rq,int cmd) { -struct depca_private *lp = (struct depca_private *) dev->priv; +struct depca_private *lp =netdev_priv (dev);struct depca_ioctl *ioc = (struct depca_ioctl *) &rq->ifr_ifru;int i, status =0 ;u_long ioaddr = dev->base_addr;
drivers/net/dm9000.c +16 -16
@@ -146,7 +146,7 @@ typedef struct board_info {static inline board_info_t *to_dm9000_board (struct net_device *dev) { -return dev->priv; +return netdev_priv (dev); }/* DM9000 network board routine ---------------------------- */
@@ -635,7 +635,7 @@ static unsigned char dm9000_type_to_char(enum dm9000_type type)static void dm9000_hash_table (struct net_device *dev) { -board_info_t *db = (board_info_t *) dev->priv; +board_info_t *db =netdev_priv (dev);struct dev_mc_list *mcptr = dev->mc_list;int mc_cnt = dev->mc_count;int i, oft;
@@ -686,7 +686,7 @@ dm9000_hash_table(struct net_device *dev)static void dm9000_init_dm9000 (struct net_device *dev) { -board_info_t *db = dev->priv; +board_info_t *db =netdev_priv (dev);unsigned int imr;dm9000_dbg (db,1 ,"entering %s\n" , __func__);
@@ -732,7 +732,7 @@ dm9000_init_dm9000(struct net_device *dev)/* Our watchdog timed out. Called by the networking layer */ static void dm9000_timeout (struct net_device *dev) { -board_info_t *db = (board_info_t *) dev->priv; +board_info_t *db =netdev_priv (dev);u8 reg_save;unsigned long flags;
@@ -760,7 +760,7 @@ static int dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev) { unsigned long flags; -board_info_t *db = dev->priv; +board_info_t *db =netdev_priv (dev);dm9000_dbg (db,3 ,"%s:\n" , __func__);
@@ -840,7 +840,7 @@ struct dm9000_rxhdr {static void dm9000_rx (struct net_device *dev) { -board_info_t *db = (board_info_t *) dev->priv; +board_info_t *db =netdev_priv (dev);struct dm9000_rxhdr rxhdr;struct sk_buff *skb;u8 rxbyte, *rdptr;
@@ -937,7 +937,7 @@ dm9000_rx(struct net_device *dev)static irqreturn_t dm9000_interrupt (int irq,void *dev_id) {struct net_device *dev = dev_id; -board_info_t *db = dev->priv; +board_info_t *db =netdev_priv (dev);int int_status;u8 reg_save;
@@ -1005,7 +1005,7 @@ static void dm9000_poll_controller(struct net_device *dev)static int dm9000_open (struct net_device *dev) { -board_info_t *db = dev->priv; +board_info_t *db =netdev_priv (dev);unsigned long irqflags = db->irq_res->flags &IRQF_TRIGGER_MASK ;if (netif_msg_ifup (db))
@@ -1055,7 +1055,7 @@ static void dm9000_msleep(board_info_t *db, unsigned int ms)static int dm9000_phy_read (struct net_device *dev,int phy_reg_unused,int reg) { -board_info_t *db = (board_info_t *) dev->priv; +board_info_t *db =netdev_priv (dev);unsigned long flags;unsigned int reg_save;int ret;
@@ -1102,7 +1102,7 @@ static void dm9000_phy_write(struct net_device *dev, int phyaddr_unused, int reg, int value) { - board_info_t *db = (board_info_t *) dev->priv; + board_info_t *db = netdev_priv(dev);unsigned long flags;unsigned long reg_save;
@@ -1143,7 +1143,7 @@ dm9000_phy_write(struct net_device *dev,static void dm9000_shutdown (struct net_device *dev) { -board_info_t *db = dev->priv; +board_info_t *db =netdev_priv (dev);/* RESET device */ dm9000_phy_write (dev,0 ,MII_BMCR ,BMCR_RESET );/* PHY RESET */
@@ -1159,7 +1159,7 @@ dm9000_shutdown(struct net_device *dev)static int dm9000_stop (struct net_device *ndev) { -board_info_t *db = ndev->priv; +board_info_t *db =netdev_priv (ndev);if (netif_msg_ifdown (db))dev_dbg (db->dev,"shutting down %s\n" , ndev->name);
@@ -1206,7 +1206,7 @@ dm9000_probe(struct platform_device *pdev)dev_dbg (&pdev->dev,"dm9000_probe()\n" );/* setup board info structure */ - db = ndev->priv; + db =netdev_priv (ndev);memset (db,0 ,sizeof (*db)); db->dev = &pdev->dev;
@@ -1419,7 +1419,7 @@ dm9000_drv_suspend(struct platform_device *dev, pm_message_t state)board_info_t *db;if (ndev) { - db = (board_info_t *) ndev->priv; + db =netdev_priv (ndev); db->in_suspend =1 ;if (netif_running (ndev)) {
@@ -1434,7 +1434,7 @@ static int dm9000_drv_resume(struct platform_device *dev) {struct net_device *ndev =platform_get_drvdata (dev); -board_info_t *db = (board_info_t *) ndev->priv; +board_info_t *db =netdev_priv (ndev);if (ndev) {
@@ -1458,7 +1458,7 @@ dm9000_drv_remove(struct platform_device *pdev)platform_set_drvdata (pdev,NULL );unregister_netdev (ndev); -dm9000_release_board (pdev, (board_info_t *) ndev->priv); + dm9000_release_board(pdev, (board_info_t *) netdev_priv(ndev);free_netdev (ndev);/* free device structure */ dev_dbg (&pdev->dev,"released and freed device\n" );
drivers/net/e1000/e1000_main.c +4 -5
@@ -3893,8 +3893,7 @@ static int e1000_clean(struct napi_struct *napi, int budget)struct net_device *poll_dev = adapter->netdev;int tx_cleaned =0 , work_done =0 ; -/* Must NOT use netdev_priv macro here. */ - adapter = poll_dev->priv; + adapter =netdev_priv (poll_dev);/* e1000_clean is called per-cpu. This lock protects * tx_ring[0] from being cleaned by multiple cpus
@@ -5164,7 +5163,7 @@ static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev, pci_channel_state_t state) {struct net_device *netdev =pci_get_drvdata (pdev); -struct e1000_adapter *adapter = netdev->priv; +struct e1000_adapter *adapter =netdev_priv (netdev);netif_device_detach (netdev);
@@ -5186,7 +5185,7 @@ static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev,static pci_ers_result_t e1000_io_slot_reset (struct pci_dev *pdev) {struct net_device *netdev =pci_get_drvdata (pdev); -struct e1000_adapter *adapter = netdev->priv; +struct e1000_adapter *adapter =netdev_priv (netdev);struct e1000_hw *hw = &adapter->hw;int err;
@@ -5220,7 +5219,7 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)static void e1000_io_resume (struct pci_dev *pdev) {struct net_device *netdev =pci_get_drvdata (pdev); -struct e1000_adapter *adapter = netdev->priv; +struct e1000_adapter *adapter =netdev_priv (netdev);struct e1000_hw *hw = &adapter->hw;e1000_init_manageability (adapter);
drivers/net/e1000e/netdev.c +1 -2
@@ -1676,8 +1676,7 @@ static int e1000_clean(struct napi_struct *napi, int budget)struct net_device *poll_dev = adapter->netdev;int tx_cleaned =0 , work_done =0 ; -/* Must NOT use netdev_priv macro here. */ - adapter = poll_dev->priv; + adapter =netdev_priv (poll_dev);/* * e1000_clean is called per-cpu. This lock protects
drivers/net/eepro.c +2 -2
@@ -605,7 +605,7 @@ out:static void __init printEEPROMInfo (struct net_device *dev) { -struct eepro_local *lp = (struct eepro_local *)dev->priv; +struct eepro_local *lp =netdev_priv (dev);int ioaddr = dev->base_addr;unsigned short Word;int i,j;
@@ -1676,7 +1676,7 @@ eepro_transmit_interrupt(struct net_device *dev)static int eepro_ethtool_get_settings (struct net_device *dev,struct ethtool_cmd *cmd) { -struct eepro_local *lp = (struct eepro_local *)dev->priv; +struct eepro_local *lp =netdev_priv (dev); cmd->supported = SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full |
drivers/net/epic100.c +21 -21
167 lines not on this page · raw message
drivers/net/eth16i.c +1 -1
@@ -1466,7 +1466,7 @@ void __exit cleanup_module(void)for (this_dev =0 ; this_dev <MAX_ETH16I_CARDS ; this_dev++) {struct net_device *dev = dev_eth16i[this_dev]; -if (dev->priv) { +if (netdev_priv (dev)) {unregister_netdev (dev);free_irq (dev->irq, dev);release_region (dev->base_addr,ETH16I_IO_EXTENT );
drivers/net/fec.c +1 -1
@@ -1155,7 +1155,7 @@ static phy_info_t const phy_info_ks8721bl = {static void mii_parse_dp8384x_sr2 (uint mii_reg,struct net_device *dev) { -struct fec_enet_private *fep = dev->priv; +struct fec_enet_private *fep =netdev_priv (dev);volatile uint *s = &(fep->phy_status); *s &= ~(PHY_STAT_SPMASK |PHY_STAT_LINK |PHY_STAT_ANC );
drivers/net/ibmveth.c +17 -17
@@ -527,7 +527,7 @@ retry:static int ibmveth_open (struct net_device *netdev) { -struct ibmveth_adapter *adapter = netdev->priv; +struct ibmveth_adapter *adapter =netdev_priv (netdev);u64 mac_address =0 ;int rxq_entries =1 ;unsigned long lpar_rc;
@@ -666,7 +666,7 @@ static int ibmveth_open(struct net_device *netdev)static int ibmveth_close (struct net_device *netdev) { -struct ibmveth_adapter *adapter = netdev->priv; +struct ibmveth_adapter *adapter =netdev_priv (netdev);long lpar_rc;ibmveth_debug_printk ("close starting\n" );
@@ -722,7 +722,7 @@ static u32 netdev_get_link(struct net_device *dev) {static void ibmveth_set_rx_csum_flags (struct net_device *dev,u32 data) { -struct ibmveth_adapter *adapter = dev->priv; +struct ibmveth_adapter *adapter =netdev_priv (dev);if (data) adapter->rx_csum =1 ;
@@ -741,7 +741,7 @@ static void ibmveth_set_rx_csum_flags(struct net_device *dev, u32 data)static void ibmveth_set_tx_csum_flags (struct net_device *dev,u32 data) { -struct ibmveth_adapter *adapter = dev->priv; +struct ibmveth_adapter *adapter =netdev_priv (dev);if (data) { dev->features |=NETIF_F_IP_CSUM ;
@@ -753,7 +753,7 @@ static void ibmveth_set_tx_csum_flags(struct net_device *dev, u32 data)static int ibmveth_set_csum_offload (struct net_device *dev,u32 data,void (*done) (struct net_device *,u32 )) { -struct ibmveth_adapter *adapter = dev->priv; +struct ibmveth_adapter *adapter =netdev_priv (dev);u64 set_attr, clr_attr, ret_attr;long ret;int rc1 =0 , rc2 =0 ;
@@ -805,7 +805,7 @@ static int ibmveth_set_csum_offload(struct net_device *dev, u32 data,static int ibmveth_set_rx_csum (struct net_device *dev,u32 data) { -struct ibmveth_adapter *adapter = dev->priv; +struct ibmveth_adapter *adapter =netdev_priv (dev);if ((data && adapter->rx_csum) || (!data && !adapter->rx_csum))return 0 ;
@@ -815,7 +815,7 @@ static int ibmveth_set_rx_csum(struct net_device *dev, u32 data)static int ibmveth_set_tx_csum (struct net_device *dev,u32 data) { -struct ibmveth_adapter *adapter = dev->priv; +struct ibmveth_adapter *adapter =netdev_priv (dev);int rc =0 ;if (data && (dev->features &NETIF_F_IP_CSUM ))
@@ -833,7 +833,7 @@ static int ibmveth_set_tx_csum(struct net_device *dev, u32 data)static u32 ibmveth_get_rx_csum (struct net_device *dev) { -struct ibmveth_adapter *adapter = dev->priv; +struct ibmveth_adapter *adapter =netdev_priv (dev);return adapter->rx_csum; }
@@ -862,7 +862,7 @@ static void ibmveth_get_ethtool_stats(struct net_device *dev, struct ethtool_stats *stats, u64 *data) { int i; -struct ibmveth_adapter *adapter = dev->priv; +struct ibmveth_adapter *adapter =netdev_priv (dev);for (i =0 ; i <ARRAY_SIZE (ibmveth_stats); i++) data[i] =IBMVETH_GET_STAT (adapter, ibmveth_stats[i].offset);
@@ -889,7 +889,7 @@ static int ibmveth_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)static int ibmveth_start_xmit (struct sk_buff *skb,struct net_device *netdev) { -struct ibmveth_adapter *adapter = netdev->priv; +struct ibmveth_adapter *adapter =netdev_priv (netdev);union ibmveth_buf_desc desc;unsigned long lpar_rc;unsigned long correlator;
@@ -1045,7 +1045,7 @@ static int ibmveth_poll(struct napi_struct *napi, int budget)static irqreturn_t ibmveth_interrupt (int irq,void *dev_instance) {struct net_device *netdev = dev_instance; -struct ibmveth_adapter *adapter = netdev->priv; +struct ibmveth_adapter *adapter =netdev_priv (netdev);unsigned long lpar_rc;if (netif_rx_schedule_prep (netdev, &adapter->napi)) {
@@ -1059,7 +1059,7 @@ static irqreturn_t ibmveth_interrupt(int irq, void *dev_instance)static void ibmveth_set_multicast_list (struct net_device *netdev) { -struct ibmveth_adapter *adapter = netdev->priv; +struct ibmveth_adapter *adapter =netdev_priv (netdev);unsigned long lpar_rc;if ((netdev->flags &IFF_PROMISC ) || (netdev->mc_count > adapter->mcastFilterSize)) {
@@ -1107,7 +1107,7 @@ static void ibmveth_set_multicast_list(struct net_device *netdev)static int ibmveth_change_mtu (struct net_device *dev,int new_mtu) { -struct ibmveth_adapter *adapter = dev->priv; +struct ibmveth_adapter *adapter =netdev_priv (dev);struct vio_dev *viodev = adapter->vdev;int new_mtu_oh = new_mtu +IBMVETH_BUFF_OH ;int i;
@@ -1159,7 +1159,7 @@ static int ibmveth_change_mtu(struct net_device *dev, int new_mtu)#ifdef CONFIG_NET_POLL_CONTROLLER static void ibmveth_poll_controller (struct net_device *dev) { -ibmveth_replenish_task (dev->priv); +ibmveth_replenish_task (netdev_priv (dev));ibmveth_interrupt (dev->irq, dev); }#endif
@@ -1241,7 +1241,7 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_if (!netdev)return -ENOMEM ; - adapter = netdev->priv; + adapter =netdev_priv (netdev); dev->dev.driver_data = netdev; adapter->vdev = dev;
@@ -1337,7 +1337,7 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_ static int __devexit ibmveth_remove(struct vio_dev *dev) {struct net_device *netdev = dev->dev.driver_data; -struct ibmveth_adapter *adapter = netdev->priv; +struct ibmveth_adapter *adapter =netdev_priv (netdev);int i;for (i =0 ; i<IbmVethNumBufferPools; i++)
@@ -1472,7 +1472,7 @@ const char * buf, size_t count) kobj);struct net_device *netdev = container_of(kobj->parent, struct device, kobj)->driver_data; -struct ibmveth_adapter *adapter = netdev->priv; +struct ibmveth_adapter *adapter =netdev_priv (netdev);long value =simple_strtol (buf,NULL ,10 );long rc;
drivers/net/igb/igb_ethtool.c +2 -2
@@ -101,8 +101,8 @@ static const struct igb_stats igb_gstrings_stats[] = { };#define IGB_QUEUE_STATS_LEN \ - ((((struct igb_adapter *)netdev->priv)->num_rx_queues + \ - ((struct igb_adapter *)netdev->priv)->num_tx_queues) * \ + ((((struct igb_adapter *)netdev_priv(netdev))->num_rx_queues + \ + ((struct igb_adapter *)netdev_priv(netdev))->num_tx_queues) * \ (sizeof(struct igb_queue_stats) / sizeof(u64)))#define IGB_GLOBAL_STATS_LEN \ sizeof(igb_gstrings_stats) / sizeof(struct igb_stats)
drivers/net/irda/ali-ircc.c +8 -8
@@ -292,7 +292,7 @@ static int ali_ircc_open(int i, chipio_t *info)return -ENOMEM ; } - self = dev->priv; + self =netdev_priv (dev); self->netdev = dev;spin_lock_init (&self->lock);
@@ -665,7 +665,7 @@ static irqreturn_t ali_ircc_interrupt(int irq, void *dev_id)IRDA_DEBUG (2 ,"%s(), ---------------- Start ----------------\n" , __func__); - self = dev->priv; + self =netdev_priv (dev);spin_lock (&self->lock);
@@ -1333,7 +1333,7 @@ static int ali_ircc_net_open(struct net_device *dev) IRDA_ASSERT(dev != NULL, return -1;); - self = (struct ali_ircc_cb *) dev->priv; + self =netdev_priv (dev); IRDA_ASSERT(self != NULL, return 0;);
@@ -1396,7 +1396,7 @@ static int ali_ircc_net_close(struct net_device *dev) IRDA_ASSERT(dev != NULL, return -1;); - self = (struct ali_ircc_cb *) dev->priv; + self =netdev_priv (dev); IRDA_ASSERT(self != NULL, return 0;);/* Stop device */
@@ -1436,7 +1436,7 @@ static int ali_ircc_fir_hard_xmit(struct sk_buff *skb, struct net_device *dev)IRDA_DEBUG (1 ,"%s(), ---------------- Start -----------------\n" , __func__ ); - self = (struct ali_ircc_cb *) dev->priv; + self =netdev_priv (dev); iobase = self->io.fir_base;netif_stop_queue (dev);
@@ -1960,7 +1960,7 @@ static int ali_ircc_sir_hard_xmit(struct sk_buff *skb, struct net_device *dev) IRDA_ASSERT(dev != NULL, return 0;); - self = (struct ali_ircc_cb *) dev->priv; + self =netdev_priv (dev); IRDA_ASSERT(self != NULL, return 0;); iobase = self->io.sir_base;
@@ -2028,7 +2028,7 @@ static int ali_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) IRDA_ASSERT(dev != NULL, return -1;); - self = dev->priv; + self =netdev_priv (dev); IRDA_ASSERT(self != NULL, return -1;);
@@ -2114,7 +2114,7 @@ static int ali_ircc_is_receiving(struct ali_ircc_cb *self)static struct net_device_stats *ali_ircc_net_get_stats (struct net_device *dev) { -struct ali_ircc_cb *self = (struct ali_ircc_cb *) dev->priv; +struct ali_ircc_cb *self =netdev_priv (dev);IRDA_DEBUG (2 ,"%s(), ---------------- Start ----------------\n" , __func__ );
drivers/net/irda/donauboe.c +4 -4
@@ -979,7 +979,7 @@ toshoboe_hard_xmit (struct sk_buff *skb, struct net_device *dev)unsigned long flags;struct irda_skb_cb *cb = (struct irda_skb_cb *) skb->cb; - self = (struct toshoboe_cb *) dev->priv; + self =netdev_priv (dev); IRDA_ASSERT (self != NULL, return 0; );
@@ -1384,7 +1384,7 @@ toshoboe_net_close (struct net_device *dev)IRDA_DEBUG (4 ,"%s()\n" , __func__); IRDA_ASSERT (dev != NULL, return -1; ); - self = (struct toshoboe_cb *) dev->priv; + self =netdev_priv (dev);/* Stop device */ netif_stop_queue (dev);
@@ -1422,7 +1422,7 @@ toshoboe_net_ioctl (struct net_device *dev, struct ifreq *rq, int cmd) IRDA_ASSERT (dev != NULL, return -1; ); - self = dev->priv; + self =netdev_priv (dev); IRDA_ASSERT (self != NULL, return -1; );
@@ -1546,7 +1546,7 @@ toshoboe_open (struct pci_dev *pci_dev, const struct pci_device_id *pdid)return -ENOMEM ; } - self = dev->priv; + self =netdev_priv (dev); self->netdev = dev; self->pdev = pci_dev; self->base =pci_resource_start (pci_dev,0 );
drivers/net/irda/irda-usb.c +7 -7
@@ -384,7 +384,7 @@ static void speed_bulk_callback(struct urb *urb)*/ static int irda_usb_hard_xmit (struct sk_buff *skb,struct net_device *netdev) { -struct irda_usb_cb *self = netdev->priv; +struct irda_usb_cb *self =netdev_priv (netdev);struct urb *urb = self->tx_urb;unsigned long flags;s32 speed;
@@ -628,7 +628,7 @@ static void write_bulk_callback(struct urb *urb)static void irda_usb_net_timeout (struct net_device *netdev) {unsigned long flags; -struct irda_usb_cb *self = netdev->priv; +struct irda_usb_cb *self =netdev_priv (netdev);struct urb *urb;int done =0 ;/* If we have made any progress */
@@ -1175,7 +1175,7 @@ static int irda_usb_net_open(struct net_device *netdev)IRDA_DEBUG (1 ,"%s()\n" , __func__); IRDA_ASSERT(netdev != NULL, return -1;); - self = (struct irda_usb_cb *) netdev->priv; + self =netdev_priv (netdev); IRDA_ASSERT(self != NULL, return -1;);spin_lock_irqsave (&self->lock, flags);
@@ -1257,7 +1257,7 @@ static int irda_usb_net_close(struct net_device *netdev)IRDA_DEBUG (1 ,"%s()\n" , __func__); IRDA_ASSERT(netdev != NULL, return -1;); - self = (struct irda_usb_cb *) netdev->priv; + self =netdev_priv (netdev); IRDA_ASSERT(self != NULL, return -1;);/* Clear this flag *before* unlinking the urbs and *before*
@@ -1306,7 +1306,7 @@ static int irda_usb_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)int ret =0 ; IRDA_ASSERT(dev != NULL, return -1;); - self = dev->priv; + self =netdev_priv (dev); IRDA_ASSERT(self != NULL, return -1;);IRDA_DEBUG (2 ,"%s(), %s, (cmd=0x%X)\n" , __func__, dev->name, cmd);
@@ -1348,7 +1348,7 @@ static int irda_usb_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)*/ static struct net_device_stats *irda_usb_net_get_stats (struct net_device *dev) { -struct irda_usb_cb *self = dev->priv; +struct irda_usb_cb *self =netdev_priv (dev);return &self->stats; }
@@ -1641,7 +1641,7 @@ static int irda_usb_probe(struct usb_interface *intf, goto err_out;SET_NETDEV_DEV (net, &intf->dev); - self = net->priv; + self =netdev_priv (net); self->netdev = net;spin_lock_init (&self->lock);init_timer (&self->rx_defer_timer);
drivers/net/irda/nsc-ircc.c +8 -8
@@ -373,7 +373,7 @@ static int __init nsc_ircc_open(chipio_t *info)return -ENOMEM ; } - self = dev->priv; + self =netdev_priv (dev); self->netdev = dev;spin_lock_init (&self->lock);
@@ -1354,7 +1354,7 @@ static int nsc_ircc_hard_xmit_sir(struct sk_buff *skb, struct net_device *dev)__s32 speed;__u8 bank; - self = (struct nsc_ircc_cb *) dev->priv; + self =netdev_priv (dev); IRDA_ASSERT(self != NULL, return 0;);
@@ -1427,7 +1427,7 @@ static int nsc_ircc_hard_xmit_fir(struct sk_buff *skb, struct net_device *dev)__u8 bank;int mtt, diff; - self = (struct nsc_ircc_cb *) dev->priv; + self =netdev_priv (dev); iobase = self->io.fir_base;netif_stop_queue (dev);
@@ -2085,7 +2085,7 @@ static irqreturn_t nsc_ircc_interrupt(int irq, void *dev_id)__u8 bsr, eir;int iobase; - self = dev->priv; + self =netdev_priv (dev);spin_lock (&self->lock);
@@ -2166,7 +2166,7 @@ static int nsc_ircc_net_open(struct net_device *dev)IRDA_DEBUG (4 ,"%s()\n" , __func__); IRDA_ASSERT(dev != NULL, return -1;); - self = (struct nsc_ircc_cb *) dev->priv; + self =netdev_priv (dev); IRDA_ASSERT(self != NULL, return 0;);
@@ -2229,7 +2229,7 @@ static int nsc_ircc_net_close(struct net_device *dev) IRDA_ASSERT(dev != NULL, return -1;); - self = (struct nsc_ircc_cb *) dev->priv; + self =netdev_priv (dev); IRDA_ASSERT(self != NULL, return 0;);/* Stop device */
@@ -2275,7 +2275,7 @@ static int nsc_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) IRDA_ASSERT(dev != NULL, return -1;); - self = dev->priv; + self =netdev_priv (dev); IRDA_ASSERT(self != NULL, return -1;);
@@ -2310,7 +2310,7 @@ static int nsc_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)static struct net_device_stats *nsc_ircc_net_get_stats (struct net_device *dev) { -struct nsc_ircc_cb *self = (struct nsc_ircc_cb *) dev->priv; +struct nsc_ircc_cb *self =netdev_priv (dev);return &self->stats; }
drivers/net/irda/sa1100_ir.c +13 -13
@@ -298,7 +298,7 @@ static int sa1100_irda_suspend(struct platform_device *pdev, pm_message_t state)if (!dev)return 0 ; - si = dev->priv; + si =netdev_priv (dev);if (si->open) {/* * Stop the transmit queue
@@ -323,7 +323,7 @@ static int sa1100_irda_resume(struct platform_device *pdev)if (!dev)return 0 ; - si = dev->priv; + si =netdev_priv (dev);if (si->open) {/* * If we missed a speed change, initialise at the new speed
@@ -359,7 +359,7 @@ static int sa1100_irda_resume(struct platform_device *pdev)*/ static void sa1100_irda_hpsir_irq (struct net_device *dev) { -struct sa1100_irda *si = dev->priv; +struct sa1100_irda *si =netdev_priv (dev);int status; status = Ser2UTSR0;
@@ -534,7 +534,7 @@ static void sa1100_irda_fir_error(struct sa1100_irda *si, struct net_device *dev*/ static void sa1100_irda_fir_irq (struct net_device *dev) { -struct sa1100_irda *si = dev->priv; +struct sa1100_irda *si =netdev_priv (dev);/* * Stop RX DMA
@@ -582,7 +582,7 @@ static void sa1100_irda_fir_irq(struct net_device *dev)static irqreturn_t sa1100_irda_irq (int irq,void *dev_id) {struct net_device *dev = dev_id; -if (IS_FIR (((struct sa1100_irda *)dev->priv))) +if (IS_FIR (((struct sa1100_irda *)netdev_priv (dev))))sa1100_irda_fir_irq (dev);else sa1100_irda_hpsir_irq (dev);
@@ -595,7 +595,7 @@ static irqreturn_t sa1100_irda_irq(int irq, void *dev_id)static void sa1100_irda_txdma_irq (void *id) {struct net_device *dev = id; -struct sa1100_irda *si = dev->priv; +struct sa1100_irda *si =netdev_priv (dev);struct sk_buff *skb = si->txskb; si->txskb =NULL ;
@@ -649,7 +649,7 @@ static void sa1100_irda_txdma_irq(void *id)static int sa1100_irda_hard_xmit (struct sk_buff *skb,struct net_device *dev) { -struct sa1100_irda *si = dev->priv; +struct sa1100_irda *si =netdev_priv (dev);int speed =irda_get_next_speed (skb);/*
@@ -724,7 +724,7 @@ static int sa1100_irda_ioctl(struct net_device *dev, struct ifreq *ifreq, int cmd) { struct if_irda_req *rq = (struct if_irda_req *)ifreq; -struct sa1100_irda *si = dev->priv; +struct sa1100_irda *si =netdev_priv (dev);int ret = -EOPNOTSUPP ;switch (cmd) {
@@ -766,13 +766,13 @@ sa1100_irda_ioctl(struct net_device *dev, struct ifreq *ifreq, int cmd)static struct net_device_stats *sa1100_irda_stats (struct net_device *dev) { -struct sa1100_irda *si = dev->priv; +struct sa1100_irda *si =netdev_priv (dev);return &si->stats; }static int sa1100_irda_start (struct net_device *dev) { -struct sa1100_irda *si = dev->priv; +struct sa1100_irda *si =netdev_priv (dev);int err; si->speed =9600 ;
@@ -835,7 +835,7 @@ err_irq:static int sa1100_irda_stop (struct net_device *dev) { -struct sa1100_irda *si = dev->priv; +struct sa1100_irda *si =netdev_priv (dev);disable_irq (dev->irq);sa1100_irda_shutdown (si);
@@ -908,7 +908,7 @@ static int sa1100_irda_probe(struct platform_device *pdev)if (!dev) goto err_mem_4; - si = dev->priv; + si =netdev_priv (dev); si->dev = &pdev->dev; si->pdata = pdev->dev.platform_data;
@@ -987,7 +987,7 @@ static int sa1100_irda_remove(struct platform_device *pdev)struct net_device *dev =platform_get_drvdata (pdev);if (dev) { -struct sa1100_irda *si = dev->priv; +struct sa1100_irda *si =netdev_priv (dev);unregister_netdev (dev);kfree (si->tx_buff.head);kfree (si->rx_buff.head);
drivers/net/irda/sir_dev.c +6 -6
@@ -584,14 +584,14 @@ EXPORT_SYMBOL(sirdev_receive);static struct net_device_stats *sirdev_get_stats (struct net_device *ndev) { -struct sir_dev *dev = ndev->priv; +struct sir_dev *dev =netdev_priv (ndev);return (dev) ? &dev->stats :NULL ; }static int sirdev_hard_xmit (struct sk_buff *skb,struct net_device *ndev) { -struct sir_dev *dev = ndev->priv; +struct sir_dev *dev =netdev_priv (ndev);unsigned long flags;int actual =0 ;int err;
@@ -683,7 +683,7 @@ static int sirdev_hard_xmit(struct sk_buff *skb, struct net_device *ndev)static int sirdev_ioctl (struct net_device *ndev,struct ifreq *rq,int cmd) {struct if_irda_req *irq = (struct if_irda_req *) rq; -struct sir_dev *dev = ndev->priv; +struct sir_dev *dev =netdev_priv (ndev);int ret =0 ; IRDA_ASSERT(dev != NULL, return -1;);
@@ -795,7 +795,7 @@ static void sirdev_free_buffers(struct sir_dev *dev)static int sirdev_open (struct net_device *ndev) { -struct sir_dev *dev = ndev->priv; +struct sir_dev *dev =netdev_priv (ndev);const struct sir_driver *drv = dev->drv;if (!drv)
@@ -840,7 +840,7 @@ errout_dec:static int sirdev_close (struct net_device *ndev) { -struct sir_dev *dev = ndev->priv; +struct sir_dev *dev =netdev_priv (ndev);const struct sir_driver *drv;// IRDA_DEBUG(0, "%s\n", __func__);
@@ -896,7 +896,7 @@ struct sir_dev * sirdev_get_instance(const struct sir_driver *drv, const char *nIRDA_ERROR ("%s - Can't allocate memory for IrDA control block!\n" , __func__); goto out; } - dev = ndev->priv; + dev =netdev_priv (ndev);irda_init_max_qos_capabilies (&dev->qos); dev->qos.baud_rate.bits =IR_9600 |IR_19200 |IR_38400 |IR_57600 |IR_115200 ;
drivers/net/irda/via-ircc.c +8 -8
@@ -334,7 +334,7 @@ static __devinit int via_ircc_open(int i, chipio_t * info, unsigned int id)if (dev ==NULL )return -ENOMEM ; - self = dev->priv; + self =netdev_priv (dev); self->netdev = dev;spin_lock_init (&self->lock);
@@ -824,7 +824,7 @@ static int via_ircc_hard_xmit_sir(struct sk_buff *skb,u16 iobase;__u32 speed; - self = (struct via_ircc_cb *) dev->priv; + self =netdev_priv (dev); IRDA_ASSERT(self != NULL, return 0;); iobase = self->io.fir_base;
@@ -896,7 +896,7 @@ static int via_ircc_hard_xmit_fir(struct sk_buff *skb,__u32 speed;unsigned long flags; - self = (struct via_ircc_cb *) dev->priv; + self =netdev_priv (dev); iobase = self->io.fir_base;if (self->st_fifo.len)
@@ -1349,7 +1349,7 @@ static int RxTimerHandler(struct via_ircc_cb *self, int iobase)static irqreturn_t via_ircc_interrupt (int dummy,void *dev_id) {struct net_device *dev = dev_id; -struct via_ircc_cb *self = dev->priv; +struct via_ircc_cb *self =netdev_priv (dev);int iobase;u8 iHostIntType, iRxIntType, iTxIntType;
@@ -1522,7 +1522,7 @@ static int via_ircc_net_open(struct net_device *dev)IRDA_DEBUG (3 ,"%s()\n" , __func__); IRDA_ASSERT(dev != NULL, return -1;); - self = (struct via_ircc_cb *) dev->priv; + self =netdev_priv (dev); self->stats.rx_packets =0 ; IRDA_ASSERT(self != NULL, return 0;); iobase = self->io.fir_base;
@@ -1589,7 +1589,7 @@ static int via_ircc_net_close(struct net_device *dev)IRDA_DEBUG (3 ,"%s()\n" , __func__); IRDA_ASSERT(dev != NULL, return -1;); - self = (struct via_ircc_cb *) dev->priv; + self =netdev_priv (dev); IRDA_ASSERT(self != NULL, return 0;);/* Stop device */
@@ -1628,7 +1628,7 @@ static int via_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq,int ret =0 ; IRDA_ASSERT(dev != NULL, return -1;); - self = dev->priv; + self =netdev_priv (dev); IRDA_ASSERT(self != NULL, return -1;);IRDA_DEBUG (1 ,"%s(), %s, (cmd=0x%X)\n" , __func__, dev->name, cmd);
@@ -1663,7 +1663,7 @@ static int via_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq,static struct net_device_stats *via_ircc_net_get_stats (struct net_device *dev) { -struct via_ircc_cb *self = (struct via_ircc_cb *) dev->priv; +struct via_ircc_cb *self =netdev_priv (dev);return &self->stats; }
drivers/net/irda/vlsi_ir.c +18 -18
@@ -178,7 +178,7 @@ static void vlsi_proc_pdev(struct seq_file *seq, struct pci_dev *pdev)static void vlsi_proc_ndev (struct seq_file *seq,struct net_device *ndev) { -vlsi_irda_dev_t *idev = ndev->priv; +vlsi_irda_dev_t *idev =netdev_priv (ndev);u8 byte;u16 word;unsigned delta1, delta2;
@@ -346,7 +346,7 @@ static void vlsi_proc_ring(struct seq_file *seq, struct vlsi_ring *r)static int vlsi_seq_show (struct seq_file *seq,void *v) {struct net_device *ndev = seq->private; -vlsi_irda_dev_t *idev = ndev->priv; +vlsi_irda_dev_t *idev =netdev_priv (ndev);unsigned long flags;seq_printf (seq,"\n%s %s\n\n" ,DRIVER_NAME ,DRIVER_VERSION );
@@ -543,7 +543,7 @@ static int vlsi_process_rx(struct vlsi_ring *r, struct ring_descr *rd)struct sk_buff *skb;int ret =0 ;struct net_device *ndev = (struct net_device *)pci_get_drvdata (r->pdev); -vlsi_irda_dev_t *idev = ndev->priv; +vlsi_irda_dev_t *idev =netdev_priv (ndev);pci_dma_sync_single_for_cpu (r->pdev,rd_get_addr (rd), r->len, r->dir);/* dma buffer now owned by the CPU */
@@ -638,7 +638,7 @@ static void vlsi_fill_rx(struct vlsi_ring *r)static void vlsi_rx_interrupt (struct net_device *ndev) { -vlsi_irda_dev_t *idev = ndev->priv; +vlsi_irda_dev_t *idev =netdev_priv (ndev);struct vlsi_ring *r = idev->rx_ring;struct ring_descr *rd;int ret;
@@ -856,7 +856,7 @@ static int vlsi_set_baud(vlsi_irda_dev_t *idev, unsigned iobase)static int vlsi_hard_start_xmit (struct sk_buff *skb,struct net_device *ndev) { -vlsi_irda_dev_t *idev = ndev->priv; +vlsi_irda_dev_t *idev =netdev_priv (ndev);struct vlsi_ring *r = idev->tx_ring;struct ring_descr *rd;unsigned long flags;
@@ -1063,7 +1063,7 @@ drop:static void vlsi_tx_interrupt (struct net_device *ndev) { -vlsi_irda_dev_t *idev = ndev->priv; +vlsi_irda_dev_t *idev =netdev_priv (ndev);struct vlsi_ring *r = idev->tx_ring;struct ring_descr *rd;unsigned iobase;
@@ -1262,7 +1262,7 @@ static inline void vlsi_clear_regs(unsigned iobase)static int vlsi_init_chip (struct pci_dev *pdev) {struct net_device *ndev =pci_get_drvdata (pdev); -vlsi_irda_dev_t *idev = ndev->priv; +vlsi_irda_dev_t *idev =netdev_priv (ndev);unsigned iobase;u16 ptr;
@@ -1376,14 +1376,14 @@ static int vlsi_stop_hw(vlsi_irda_dev_t *idev)static struct net_device_stats *vlsi_get_stats (struct net_device *ndev) { -vlsi_irda_dev_t *idev = ndev->priv; +vlsi_irda_dev_t *idev =netdev_priv (ndev);return &idev->stats; }static void vlsi_tx_timeout (struct net_device *ndev) { -vlsi_irda_dev_t *idev = ndev->priv; +vlsi_irda_dev_t *idev =netdev_priv (ndev);vlsi_reg_debug (ndev->base_addr, __func__);
@@ -1408,7 +1408,7 @@ static void vlsi_tx_timeout(struct net_device *ndev)static int vlsi_ioctl (struct net_device *ndev,struct ifreq *rq,int cmd) { -vlsi_irda_dev_t *idev = ndev->priv; +vlsi_irda_dev_t *idev =netdev_priv (ndev);struct if_irda_req *irq = (struct if_irda_req *) rq;unsigned long flags;u16 fifocnt;
@@ -1458,7 +1458,7 @@ static int vlsi_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)static irqreturn_t vlsi_interrupt (int irq,void *dev_instance) {struct net_device *ndev = dev_instance; -vlsi_irda_dev_t *idev = ndev->priv; +vlsi_irda_dev_t *idev =netdev_priv (ndev);unsigned iobase;u8 irintr;int boguscount =5 ;
@@ -1499,7 +1499,7 @@ static irqreturn_t vlsi_interrupt(int irq, void *dev_instance)static int vlsi_open (struct net_device *ndev) { -vlsi_irda_dev_t *idev = ndev->priv; +vlsi_irda_dev_t *idev =netdev_priv (ndev);int err = -EAGAIN ;char hwname[32 ];
@@ -1558,7 +1558,7 @@ errout:static int vlsi_close (struct net_device *ndev) { -vlsi_irda_dev_t *idev = ndev->priv; +vlsi_irda_dev_t *idev =netdev_priv (ndev);netif_stop_queue (ndev);
@@ -1581,7 +1581,7 @@ static int vlsi_close(struct net_device *ndev)static int vlsi_irda_init (struct net_device *ndev) { -vlsi_irda_dev_t *idev = ndev->priv; +vlsi_irda_dev_t *idev =netdev_priv (ndev);struct pci_dev *pdev = idev->pdev; ndev->irq = pdev->irq;
@@ -1656,7 +1656,7 @@ vlsi_irda_probe(struct pci_dev *pdev, const struct pci_device_id *id) goto out_disable; } - idev = ndev->priv; + idev =netdev_priv (ndev);spin_lock_init (&idev->lock);mutex_init (&idev->mtx);
@@ -1713,7 +1713,7 @@ static void __devexit vlsi_irda_remove(struct pci_dev *pdev)unregister_netdev (ndev); - idev = ndev->priv; + idev =netdev_priv (ndev);mutex_lock (&idev->mtx);if (idev->proc_entry) {remove_proc_entry (ndev->name, vlsi_proc_root);
@@ -1748,7 +1748,7 @@ static int vlsi_irda_suspend(struct pci_dev *pdev, pm_message_t state) __func__, pci_name(pdev));return 0 ; } - idev = ndev->priv; + idev =netdev_priv (ndev);mutex_lock (&idev->mtx);if (pdev->current_state !=0 ) {/* already suspended */ if (state.event > pdev->current_state) {/* simply go deeper */
@@ -1787,7 +1787,7 @@ static int vlsi_irda_resume(struct pci_dev *pdev) __func__, pci_name(pdev));return 0 ; } - idev = ndev->priv; + idev =netdev_priv (ndev);mutex_lock (&idev->mtx);if (pdev->current_state ==0 ) {mutex_unlock (&idev->mtx);
drivers/net/irda/w83977af_ir.c +7 -7
@@ -178,7 +178,7 @@ int w83977af_open(int i, unsigned int iobase, unsigned int irq, goto err_out; } - self = dev->priv; + self =netdev_priv (dev);spin_lock_init (&self->lock);
@@ -497,7 +497,7 @@ int w83977af_hard_xmit(struct sk_buff *skb, struct net_device *dev)__u8 set;int mtt; - self = (struct w83977af_ir *) dev->priv; + self =netdev_priv (dev); iobase = self->io.fir_base;
@@ -1119,7 +1119,7 @@ static irqreturn_t w83977af_interrupt(int irq, void *dev_id)__u8 set, icr, isr;int iobase; - self = dev->priv; + self =netdev_priv (dev); iobase = self->io.fir_base;
@@ -1192,7 +1192,7 @@ static int w83977af_net_open(struct net_device *dev)IRDA_DEBUG (0 ,"%s()\n" , __func__ ); IRDA_ASSERT(dev != NULL, return -1;); - self = (struct w83977af_ir *) dev->priv; + self =netdev_priv (dev); IRDA_ASSERT(self != NULL, return 0;);
@@ -1256,7 +1256,7 @@ static int w83977af_net_close(struct net_device *dev) IRDA_ASSERT(dev != NULL, return -1;); - self = (struct w83977af_ir *) dev->priv; + self =netdev_priv (dev); IRDA_ASSERT(self != NULL, return 0;);
@@ -1303,7 +1303,7 @@ static int w83977af_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) IRDA_ASSERT(dev != NULL, return -1;); - self = dev->priv; + self =netdev_priv (dev); IRDA_ASSERT(self != NULL, return -1;);
@@ -1339,7 +1339,7 @@ out:static struct net_device_stats *w83977af_net_get_stats (struct net_device *dev) { -struct w83977af_ir *self = (struct w83977af_ir *) dev->priv; +struct w83977af_ir *self =netdev_priv (dev);return &self->stats; }
drivers/net/mv643xx_eth.c +1 -1
@@ -1277,7 +1277,7 @@ static void mv643xx_eth_get_ethtool_stats(struct net_device *dev,struct ethtool_stats *stats, uint64_t *data) { - struct mv643xx_eth_private *mp = dev->priv; + struct mv643xx_eth_private *mp = netdev_priv(dev);int i;mib_counters_update (mp);
drivers/net/mvme147.c +2 -2
@@ -106,7 +106,7 @@ struct net_device * __init mvme147lance_probe(int unit) dev->name, dev->base_addr,MVME147_LANCE_IRQ , print_mac(mac, dev->dev_addr)); - lp = (struct m147lance_private *)dev->priv; + lp =netdev_priv (dev); lp->ram =__get_dma_pages (GFP_ATOMIC ,3 );/* 16K */ if (!lp->ram) {
@@ -190,7 +190,7 @@ int __init init_module(void) void __exit cleanup_module(void) { -struct m147lance_private *lp = dev_mvme147_lance->priv; +struct m147lance_private *lp =netdev_priv (dev_mvme147_lance);unregister_netdev (dev_mvme147_lance);free_pages (lp->ram,3 );free_netdev (dev_mvme147_lance);
drivers/net/myri_sbus.c +6 -6
@@ -532,7 +532,7 @@ static void myri_rx(struct myri_eth *mp, struct net_device *dev)static irqreturn_t myri_interrupt (int irq,void *dev_id) {struct net_device *dev = (struct net_device *) dev_id; -struct myri_eth *mp = (struct myri_eth *) dev->priv; +struct myri_eth *mp =netdev_priv (dev);void __iomem *lregs = mp->lregs;struct myri_channel __iomem *chan = &mp->shmem->channel;unsigned long flags;
@@ -571,14 +571,14 @@ static irqreturn_t myri_interrupt(int irq, void *dev_id)static int myri_open (struct net_device *dev) { -struct myri_eth *mp = (struct myri_eth *) dev->priv; +struct myri_eth *mp =netdev_priv (dev);return myri_init (mp,in_interrupt ()); }static int myri_close (struct net_device *dev) { -struct myri_eth *mp = (struct myri_eth *) dev->priv; +struct myri_eth *mp =netdev_priv (dev);myri_clean_rings (mp);return 0 ;
@@ -586,7 +586,7 @@ static int myri_close(struct net_device *dev)static void myri_tx_timeout (struct net_device *dev) { -struct myri_eth *mp = (struct myri_eth *) dev->priv; +struct myri_eth *mp =netdev_priv (dev);printk (KERN_ERR "%s: transmit timed out, resetting\n" , dev->name);
@@ -597,7 +597,7 @@ static void myri_tx_timeout(struct net_device *dev)static int myri_start_xmit (struct sk_buff *skb,struct net_device *dev) { -struct myri_eth *mp = (struct myri_eth *) dev->priv; +struct myri_eth *mp =netdev_priv (dev);struct sendq __iomem *sq = mp->sq;struct myri_txd __iomem *txd;unsigned long flags;
@@ -912,7 +912,7 @@ static int __devinit myri_ether_init(struct sbus_dev *sdev)SET_NETDEV_DEV (dev, &sdev->ofdev.dev); - mp = (struct myri_eth *) dev->priv; + mp =netdev_priv (dev);spin_lock_init (&mp->irq_lock); mp->myri_sdev = sdev;
drivers/net/ne2k-pci.c +1 -1
@@ -626,7 +626,7 @@ static void ne2k_pci_block_output(struct net_device *dev, int count,static void ne2k_pci_get_drvinfo (struct net_device *dev,struct ethtool_drvinfo *info) { -struct ei_device *ei = dev->priv; +struct ei_device *ei =netdev_priv (dev);struct pci_dev *pci_dev = (struct pci_dev *) ei->priv;strcpy (info->driver,DRV_NAME );
drivers/net/netxen/netxen_nic_hw.c +1 -1
@@ -537,7 +537,7 @@ netxen_send_cmd_descs(struct netxen_adapter *adapter,static int nx_p3_sre_macaddr_change (struct net_device *dev,u8 *addr,unsigned op) { -struct netxen_adapter *adapter = (struct netxen_adapter *)dev->priv; +struct netxen_adapter *adapter =netdev_priv (dev);nx_nic_req_t req;nx_mac_req_t mac_req;int rv;
drivers/net/netxen/netxen_nic_main.c +2 -2
@@ -553,7 +553,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)SET_NETDEV_DEV (netdev, &pdev->dev); - adapter = netdev->priv; + adapter =netdev_priv (netdev); adapter->netdev = netdev; adapter->pdev = pdev; adapter->ahw.pci_func = pci_func_id;
@@ -998,7 +998,7 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)*/ static int netxen_nic_open (struct net_device *netdev) { -struct netxen_adapter *adapter = (struct netxen_adapter *)netdev->priv; +struct netxen_adapter *adapter =netdev_priv (netdev);int err =0 ;int ctx, ring;irq_handler_t handler;
drivers/net/ni5010.c +1 -1
@@ -329,7 +329,7 @@ static int __init ni5010_probe1(struct net_device *dev, int ioaddr)outb (0 ,IE_RBUF );/* set buffer byte 0 to 0 again */ }printk ("-> bufsize rcv/xmt=%d/%d\n" , bufsize_rcv,NI5010_BUFSIZE ); -memset (dev->priv,0 ,sizeof (struct ni5010_local )); +memset (netdev_priv (dev),0 ,sizeof (struct ni5010_local )); dev->open = ni5010_open; dev->stop = ni5010_close;
drivers/net/ni52.c +18 -18
@@ -214,7 +214,7 @@ struct priv {/* wait for command with timeout: */ static void wait_for_scb_cmd (struct net_device *dev) { -struct priv *p = dev->priv; +struct priv *p =netdev_priv (dev);int i;for (i =0 ; i <16384 ; i++) {if (readb (&p->scb->cmd_cuc) ==0 )
@@ -233,7 +233,7 @@ static void wait_for_scb_cmd(struct net_device *dev)static void wait_for_scb_cmd_ruc (struct net_device *dev) { -struct priv *p = dev->priv; +struct priv *p =netdev_priv (dev);int i;for (i =0 ; i <16384 ; i++) {if (readb (&p->scb->cmd_ruc) ==0 )
@@ -298,7 +298,7 @@ static int ni52_open(struct net_device *dev)static int check_iscp (struct net_device *dev,void __iomem *addr) {struct iscp_struct __iomem *iscp = addr; -struct priv *p = dev->priv; +struct priv *p =netdev_priv (dev);memset_io (iscp,0 ,sizeof (struct iscp_struct ));writel (make24 (iscp), &p->scp->iscp);
@@ -318,7 +318,7 @@ static int check_iscp(struct net_device *dev, void __iomem *addr)*/ static int check586 (struct net_device *dev,unsigned size) { -struct priv *p = dev->priv; +struct priv *p =netdev_priv (dev);int i; p->mapped =ioremap (dev->mem_start, size);
@@ -354,7 +354,7 @@ Enodev:*/ static void alloc586 (struct net_device *dev) { -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev);ni_reset586 ();mdelay (32 );
@@ -400,7 +400,7 @@ struct net_device * __init ni52_probe(int unit)if (!dev)return ERR_PTR (-ENOMEM ); - p = dev->priv; + p =netdev_priv (dev);if (unit >=0 ) {sprintf (dev->name,"eth%d" , unit);
@@ -446,7 +446,7 @@ out:static int __init ni52_probe1 (struct net_device *dev,int ioaddr) {int i, size, retval; -struct priv *priv = dev->priv; +struct priv *priv =netdev_priv (dev); dev->base_addr = ioaddr; dev->irq = irq;
@@ -588,7 +588,7 @@ static int init586(struct net_device *dev) {void __iomem *ptr;int i, result =0 ; -struct priv *p = (struct priv *)dev->priv; +struct priv *p =netdev_priv (dev);struct configure_cmd_struct __iomem *cfg_cmd;struct iasetup_cmd_struct __iomem *ias_cmd;struct tdr_cmd_struct __iomem *tdr_cmd;
@@ -829,7 +829,7 @@ static void __iomem *alloc_rfa(struct net_device *dev, void __iomem *ptr)struct rfd_struct __iomem *rfd = ptr;struct rbd_struct __iomem *rbd;int i; -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev);memset_io (rfd,0 ,sizeof (struct rfd_struct ) * (p->num_recv_buffs + rfdadd));
@@ -878,7 +878,7 @@ static irqreturn_t ni52_interrupt(int irq, void *dev_id)int cnt =0 ;struct priv *p; - p = (struct priv *) dev->priv; + p =netdev_priv (dev);if (debuglevel >1 )printk ("I" );
@@ -950,7 +950,7 @@ static void ni52_rcv_int(struct net_device *dev)unsigned short totlen;struct sk_buff *skb;struct rbd_struct __iomem *rbd; -struct priv *p = (struct priv *)dev->priv; +struct priv *p =netdev_priv (dev);if (debuglevel >0 )printk ("R" );
@@ -1040,7 +1040,7 @@ static void ni52_rcv_int(struct net_device *dev)static void ni52_rnr_int (struct net_device *dev) { -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev); p->stats.rx_errors++;
@@ -1065,7 +1065,7 @@ static void ni52_rnr_int(struct net_device *dev)static void ni52_xmt_int (struct net_device *dev) {int status; -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev);if (debuglevel >0 )printk ("X" );
@@ -1113,7 +1113,7 @@ static void ni52_xmt_int(struct net_device *dev)static void startrecv586 (struct net_device *dev) { -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev);wait_for_scb_cmd (dev);wait_for_scb_cmd_ruc (dev);
@@ -1126,7 +1126,7 @@ static void startrecv586(struct net_device *dev)static void ni52_timeout (struct net_device *dev) { -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev);#ifndef NO_NOPCOMMANDS if (readb (&p->scb->cus) &CU_ACTIVE ) {/* COMMAND-UNIT active? */ netif_wake_queue (dev);
@@ -1177,7 +1177,7 @@ static int ni52_send_packet(struct sk_buff *skb, struct net_device *dev)#ifndef NO_NOPCOMMANDS int next_nop;#endif -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev);if (skb->len >XMIT_BUFF_SIZE ) {printk (KERN_ERR "%s: Sorry, max. framelength is %d bytes. The length of your frame is %d bytes.\n" , dev->name,XMIT_BUFF_SIZE , skb->len);
@@ -1274,7 +1274,7 @@ static int ni52_send_packet(struct sk_buff *skb, struct net_device *dev)static struct net_device_stats *ni52_get_stats (struct net_device *dev) { -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev);unsigned short crc, aln, rsc, ovrn;/* Get error-statistics from the ni82586 */
@@ -1337,7 +1337,7 @@ int __init init_module(void) void __exit cleanup_module(void) { -struct priv *p = dev_ni52->priv; +struct priv *p =netdev_priv (dev_ni52);unregister_netdev (dev_ni52);iounmap (p->mapped);release_region (dev_ni52->base_addr,NI52_TOTAL_SIZE );
drivers/net/pasemi_mac_ethtool.c +2 -2
@@ -109,7 +109,7 @@ static void pasemi_mac_ethtool_get_ringparam(struct net_device *netdev, struct ethtool_ringparam *ering) { - struct pasemi_mac *mac = netdev->priv; + struct pasemi_mac *mac = netdev_priv(netdev); ering->tx_max_pending =TX_RING_SIZE /2 ; ering->tx_pending =RING_USED (mac->tx)/2 ;
@@ -130,7 +130,7 @@ static int pasemi_mac_get_sset_count(struct net_device *netdev, int sset)static void pasemi_mac_get_ethtool_stats (struct net_device *netdev,struct ethtool_stats *stats,u64 *data) { -struct pasemi_mac *mac = netdev->priv; +struct pasemi_mac *mac =netdev_priv (netdev);int i; data[0 ] =pasemi_read_dma_reg (PAS_DMA_RXINT_RCMDSTA (mac->dma_if))
drivers/net/pcmcia/com20020_cs.c +3 -3
@@ -155,7 +155,7 @@ static int com20020_probe(struct pcmcia_device *p_dev)if (!dev) goto fail_alloc_dev; - lp = dev->priv; + lp =netdev_priv (dev); lp->timeout = timeout; lp->backplane = backplane; lp->clockp = clockp;
@@ -303,7 +303,7 @@ static int com20020_config(struct pcmcia_device *link) goto failed; } - lp = dev->priv; + lp =netdev_priv (dev); lp->card_name ="PCMCIA COM20020" ; lp->card_flags =ARC_CAN_10MBIT ;/* pretend all of them can 10Mbit */
@@ -364,7 +364,7 @@ static int com20020_resume(struct pcmcia_device *link)if (link->open) {int ioaddr = dev->base_addr; -struct arcnet_local *lp = dev->priv; +struct arcnet_local *lp =netdev_priv (dev);ARCRESET ; }
drivers/net/plip.c +4 -4
@@ -229,7 +229,7 @@ static inline void enable_parport_interrupts (struct net_device *dev)if (dev->irq !=-1 ) {struct parport *port = - ((struct net_local *)dev->priv)->pardev->port; + ((struct net_local *)netdev_priv (dev))->pardev->port; port->ops->enable_irq (port); } }
@@ -239,7 +239,7 @@ static inline void disable_parport_interrupts (struct net_device *dev)if (dev->irq !=-1 ) {struct parport *port = - ((struct net_local *)dev->priv)->pardev->port; + ((struct net_local *)netdev_priv (dev))->pardev->port; port->ops->disable_irq (port); } }
@@ -247,7 +247,7 @@ static inline void disable_parport_interrupts (struct net_device *dev)static inline void write_data (struct net_device *dev,unsigned char data) {struct parport *port = - ((struct net_local *)dev->priv)->pardev->port; + ((struct net_local *)netdev_priv (dev))->pardev->port; port->ops->write_data (port, data); }
@@ -255,7 +255,7 @@ static inline void write_data (struct net_device *dev, unsigned char data)static inline unsigned char read_status (struct net_device *dev) {struct parport *port = - ((struct net_local *)dev->priv)->pardev->port; + ((struct net_local *)netdev_priv (dev))->pardev->port;return port->ops->read_status (port); }
drivers/net/rionet.c +13 -13
@@ -94,7 +94,7 @@ static int rionet_rx_clean(struct net_device *ndev) {int i;int error =0 ; -struct rionet_private *rnet = ndev->priv; +struct rionet_private *rnet =netdev_priv (ndev);void *data; i = rnet->rx_slot;
@@ -132,7 +132,7 @@ static int rionet_rx_clean(struct net_device *ndev)static void rionet_rx_fill (struct net_device *ndev,int end) {int i; -struct rionet_private *rnet = ndev->priv; +struct rionet_private *rnet =netdev_priv (ndev); i = rnet->rx_slot; do {
@@ -151,7 +151,7 @@ static void rionet_rx_fill(struct net_device *ndev, int end)static int rionet_queue_tx_msg (struct sk_buff *skb,struct net_device *ndev,struct rio_dev *rdev) { -struct rionet_private *rnet = ndev->priv; +struct rionet_private *rnet =netdev_priv (ndev);rio_add_outb_message (rnet->mport, rdev,0 , skb->data, skb->len); rnet->tx_skb[rnet->tx_slot] = skb;
@@ -175,7 +175,7 @@ static int rionet_queue_tx_msg(struct sk_buff *skb, struct net_device *ndev,static int rionet_start_xmit (struct sk_buff *skb,struct net_device *ndev) {int i; -struct rionet_private *rnet = ndev->priv; +struct rionet_private *rnet =netdev_priv (ndev);struct ethhdr *eth = (struct ethhdr *)skb->data;u16 destid;unsigned long flags;
@@ -215,7 +215,7 @@ static void rionet_dbell_event(struct rio_mport *mport, void *dev_id, u16 sid, u u16 info) {struct net_device *ndev = dev_id; -struct rionet_private *rnet = ndev->priv; +struct rionet_private *rnet =netdev_priv (ndev);struct rionet_peer *peer;if (netif_msg_intr (rnet))
@@ -243,7 +243,7 @@ static void rionet_inb_msg_event(struct rio_mport *mport, void *dev_id, int mbox {int n;struct net_device *ndev = dev_id; -struct rionet_private *rnet = (struct rionet_private *)ndev->priv; +struct rionet_private *rnet =netdev_priv (ndev);if (netif_msg_intr (rnet)) printk(KERN_INFO "%s: inbound message event, mbox %d slot %d\n",
@@ -258,7 +258,7 @@ static void rionet_inb_msg_event(struct rio_mport *mport, void *dev_id, int mboxstatic void rionet_outb_msg_event (struct rio_mport *mport,void *dev_id,int mbox,int slot) {struct net_device *ndev = dev_id; -struct rionet_private *rnet = ndev->priv; +struct rionet_private *rnet =netdev_priv (ndev);spin_lock (&rnet->lock);
@@ -287,7 +287,7 @@ static int rionet_open(struct net_device *ndev)int i, rc =0 ;struct rionet_peer *peer, *tmp;u32 pwdcsr; -struct rionet_private *rnet = ndev->priv; +struct rionet_private *rnet =netdev_priv (ndev);if (netif_msg_ifup (rnet))printk (KERN_INFO "%s: open\n" ,DRV_NAME );
@@ -351,7 +351,7 @@ static int rionet_open(struct net_device *ndev)static int rionet_close (struct net_device *ndev) { -struct rionet_private *rnet = (struct rionet_private *)ndev->priv; +struct rionet_private *rnet =netdev_priv (ndev);struct rionet_peer *peer, *tmp;int i;
@@ -400,7 +400,7 @@ static void rionet_remove(struct rio_dev *rdev)static void rionet_get_drvinfo (struct net_device *ndev,struct ethtool_drvinfo *info) { -struct rionet_private *rnet = ndev->priv; +struct rionet_private *rnet =netdev_priv (ndev);strcpy (info->driver,DRV_NAME );strcpy (info->version,DRV_VERSION );
@@ -410,14 +410,14 @@ static void rionet_get_drvinfo(struct net_device *ndev,static u32 rionet_get_msglevel (struct net_device *ndev) { -struct rionet_private *rnet = ndev->priv; +struct rionet_private *rnet =netdev_priv (ndev);return rnet->msg_enable; }static void rionet_set_msglevel (struct net_device *ndev,u32 value) { -struct rionet_private *rnet = ndev->priv; +struct rionet_private *rnet =netdev_priv (ndev); rnet->msg_enable = value; }
@@ -456,7 +456,7 @@ static int rionet_setup_netdev(struct rio_mport *mport) RIO_MAX_ROUTE_ENTRIES(mport->sys_size));/* Set up private area */ - rnet = (struct rionet_private *)ndev->priv; + rnet =netdev_priv (ndev); rnet->mport = mport;/* Set the default MAC address */
drivers/net/s2io.c +39 -39
312 lines not on this page · raw message
Signature · 1 line
1.5.3.4
PATCH 3/18 netdevice: safe convert to netdev_priv() #part-3
In reply to Wang ChenSigned-off-by Wang Chen <[email protected]>
--- drivers/net/sgiseeq.c | 2 +- drivers/net/sis900.c | 64 ++++++++++++++-------------- drivers/net/smc9194.c | 6 +- drivers/net/sonic.h | 20 ++++---- drivers/net/spider_net_ethtool.c | 8 ++-- drivers/net/sun3_82586.c | 38 +++++++++------- drivers/net/sunbmac.c | 18 ++++---- drivers/net/sungem.c | 52 +++++++++++----------- drivers/net/sunhme.c | 26 ++++++------ drivers/net/sunqe.c | 14 +++--- drivers/net/tehuti.c | 38 ++++++++-------- drivers/net/tokenring/tms380tr.c | 14 ++++-- drivers/net/tulip/de2104x.c | 44 ++++++++++---------- drivers/net/tulip/eeprom.c | 2 +- drivers/net/tulip/uli526x.c | 2 +- drivers/net/typhoon.c | 2 +- drivers/net/usb/mcs7830.c | 4 +- drivers/net/virtio_net.c | 3 +- drivers/net/wan/dlci.c | 36 ++++++++-------- drivers/net/wan/sdla.c | 48 ++++++++++---------- drivers/net/wan/x25_asy.c | 28 ++++++------ drivers/net/wireless/libertas/ethtool.c | 12 +++--- drivers/net/wireless/libertas/persistcfg.c | 16 ++++---- drivers/net/wireless/libertas/scan.c | 4 +- drivers/net/wireless/libertas/tx.c | 2 +- 25 files changed, 256 insertions(+), 247 deletions(-)
drivers/net/sgiseeq.c +1 -1
@@ -657,7 +657,7 @@ static void timeout(struct net_device *dev)static void sgiseeq_set_multicast (struct net_device *dev) { -struct sgiseeq_private *sp = (struct sgiseeq_private *) dev->priv; +struct sgiseeq_private *sp =netdev_priv (dev);unsigned char oldmode = sp->mode;if (dev->flags &IFF_PROMISC )
drivers/net/sis900.c +32 -32
254 lines not on this page · raw message
drivers/net/smc9194.c +3 -3
@@ -1036,7 +1036,7 @@ static int __init smc_probe(struct net_device *dev, int ioaddr)printk ("ADDR: %s\n" ,print_mac (mac, dev->dev_addr));/* set the private data to zero by default */ -memset (dev->priv,0 ,sizeof (struct smc_local )); +memset (netdev_priv (dev),0 ,sizeof (struct smc_local ));/* Grab the IRQ */ retval =request_irq (dev->irq, &smc_interrupt,0 ,DRV_NAME , dev);
@@ -1110,7 +1110,7 @@ static int smc_open(struct net_device *dev)int i;/* used to set hw ethernet address */ /* clear out all the junk that was put here before... */ -memset (dev->priv,0 ,sizeof (struct smc_local )); +memset (netdev_priv (dev),0 ,sizeof (struct smc_local ));/* reset the hardware */
@@ -1166,7 +1166,7 @@ static void smc_timeout(struct net_device *dev)smc_enable ( dev->base_addr ); dev->trans_start = jiffies;/* clear anything saved */ - ((struct smc_local *)dev->priv)->saved_skb =NULL ; + ((struct smc_local *)netdev_priv (dev))->saved_skb =NULL ;netif_wake_queue (dev); }
drivers/net/sonic.h +10 -10
@@ -371,7 +371,7 @@ static inline __u16 sonic_buf_get(void* base, int bitmode,static inline void sonic_cda_put (struct net_device * dev,int entry,int offset,__u16 val) { -struct sonic_local * lp = (struct sonic_local *) dev->priv; +struct sonic_local *lp =netdev_priv (dev);sonic_buf_put (lp->cda, lp->dma_bitmode, (entry *SIZEOF_SONIC_CD ) + offset, val); }
@@ -379,27 +379,27 @@ static inline void sonic_cda_put(struct net_device* dev, int entry,static inline __u16 sonic_cda_get (struct net_device * dev,int entry,int offset) { -struct sonic_local * lp = (struct sonic_local *) dev->priv; +struct sonic_local *lp =netdev_priv (dev);return sonic_buf_get (lp->cda, lp->dma_bitmode, (entry *SIZEOF_SONIC_CD ) + offset); }static inline void sonic_set_cam_enable (struct net_device * dev,__u16 val) { -struct sonic_local * lp = (struct sonic_local *) dev->priv; +struct sonic_local *lp =netdev_priv (dev);sonic_buf_put (lp->cda, lp->dma_bitmode,SONIC_CDA_CAM_ENABLE , val); }static inline __u16 sonic_get_cam_enable (struct net_device * dev) { -struct sonic_local * lp = (struct sonic_local *) dev->priv; +struct sonic_local *lp =netdev_priv (dev);return sonic_buf_get (lp->cda, lp->dma_bitmode,SONIC_CDA_CAM_ENABLE ); }static inline void sonic_tda_put (struct net_device * dev,int entry,int offset,__u16 val) { -struct sonic_local * lp = (struct sonic_local *) dev->priv; +struct sonic_local *lp =netdev_priv (dev);sonic_buf_put (lp->tda, lp->dma_bitmode, (entry *SIZEOF_SONIC_TD ) + offset, val); }
@@ -407,7 +407,7 @@ static inline void sonic_tda_put(struct net_device* dev, int entry,static inline __u16 sonic_tda_get (struct net_device * dev,int entry,int offset) { -struct sonic_local * lp = (struct sonic_local *) dev->priv; +struct sonic_local *lp =netdev_priv (dev);return sonic_buf_get (lp->tda, lp->dma_bitmode, (entry *SIZEOF_SONIC_TD ) + offset); }
@@ -415,7 +415,7 @@ static inline __u16 sonic_tda_get(struct net_device* dev, int entry,static inline void sonic_rda_put (struct net_device * dev,int entry,int offset,__u16 val) { -struct sonic_local * lp = (struct sonic_local *) dev->priv; +struct sonic_local *lp =netdev_priv (dev);sonic_buf_put (lp->rda, lp->dma_bitmode, (entry *SIZEOF_SONIC_RD ) + offset, val); }
@@ -423,7 +423,7 @@ static inline void sonic_rda_put(struct net_device* dev, int entry,static inline __u16 sonic_rda_get (struct net_device * dev,int entry,int offset) { -struct sonic_local * lp = (struct sonic_local *) dev->priv; +struct sonic_local *lp =netdev_priv (dev);return sonic_buf_get (lp->rda, lp->dma_bitmode, (entry *SIZEOF_SONIC_RD ) + offset); }
@@ -431,7 +431,7 @@ static inline __u16 sonic_rda_get(struct net_device* dev, int entry,static inline void sonic_rra_put (struct net_device * dev,int entry,int offset,__u16 val) { -struct sonic_local * lp = (struct sonic_local *) dev->priv; +struct sonic_local *lp =netdev_priv (dev);sonic_buf_put (lp->rra, lp->dma_bitmode, (entry *SIZEOF_SONIC_RR ) + offset, val); }
@@ -439,7 +439,7 @@ static inline void sonic_rra_put(struct net_device* dev, int entry,static inline __u16 sonic_rra_get (struct net_device * dev,int entry,int offset) { -struct sonic_local * lp = (struct sonic_local *) dev->priv; +struct sonic_local *lp =netdev_priv (dev);return sonic_buf_get (lp->rra, lp->dma_bitmode, (entry *SIZEOF_SONIC_RR ) + offset); }
drivers/net/spider_net_ethtool.c +4 -4
@@ -118,7 +118,7 @@ spider_net_ethtool_nway_reset(struct net_device *netdev)static u32 spider_net_ethtool_get_rx_csum (struct net_device *netdev) { -struct spider_net_card *card = netdev->priv; +struct spider_net_card *card =netdev_priv (netdev);return card->options.rx_csum; }
@@ -126,7 +126,7 @@ spider_net_ethtool_get_rx_csum(struct net_device *netdev)static int spider_net_ethtool_set_rx_csum (struct net_device *netdev,u32 n) { -struct spider_net_card *card = netdev->priv; +struct spider_net_card *card =netdev_priv (netdev); card->options.rx_csum = n;return 0 ;
@@ -137,7 +137,7 @@ static void spider_net_ethtool_get_ringparam(struct net_device *netdev, struct ethtool_ringparam *ering) { - struct spider_net_card *card = netdev->priv; + struct spider_net_card *card = netdev_priv(netdev); ering->tx_max_pending =SPIDER_NET_TX_DESCRIPTORS_MAX ; ering->tx_pending = card->tx_chain.num_desc;
@@ -158,7 +158,7 @@ static int spider_net_get_sset_count(struct net_device *netdev, int sset)static void spider_net_get_ethtool_stats (struct net_device *netdev,struct ethtool_stats *stats,u64 *data) { -struct spider_net_card *card = netdev->priv; +struct spider_net_card *card =netdev_priv (netdev); data[0 ] = netdev->stats.tx_packets; data[1 ] = netdev->stats.tx_bytes;
drivers/net/sun3_82586.c +21 -17
@@ -247,7 +247,7 @@ static int check586(struct net_device *dev,char *where,unsigned size)*/ static void alloc586 (struct net_device *dev) { -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev);sun3_reset586 ();DELAY (1 );
@@ -363,17 +363,21 @@ static int __init sun3_82586_probe1(struct net_device *dev,int ioaddr) goto out; } - ((struct priv *) (dev->priv))->memtop = (char *)dvma_btov (dev->mem_start); - ((struct priv *) (dev->priv))->base = (unsigned long )dvma_btov (0 ); + ((struct priv *)netdev_priv (dev))->memtop = + (char *)dvma_btov (dev->mem_start); + ((struct priv *)netdev_priv (dev))->base = (unsigned long )dvma_btov (0 );alloc586 (dev);/* set number of receive-buffs according to memsize */ if (size ==0x2000 ) - ((struct priv *) dev->priv)->num_recv_buffs =NUM_RECV_BUFFS_8 ; + ((struct priv *)netdev_priv (dev))->num_recv_buffs = +NUM_RECV_BUFFS_8 ;else if (size ==0x4000 ) - ((struct priv *) dev->priv)->num_recv_buffs =NUM_RECV_BUFFS_16 ; + ((struct priv *)netdev_priv (dev))->num_recv_buffs = +NUM_RECV_BUFFS_16 ;else - ((struct priv *) dev->priv)->num_recv_buffs =NUM_RECV_BUFFS_32 ; + ((struct priv *)netdev_priv (dev))->num_recv_buffs = +NUM_RECV_BUFFS_32 ;printk ("Memaddr: 0x%lx, Memsize: %d, IRQ %d\n" ,dev->mem_start,size, dev->irq);
@@ -397,7 +401,7 @@ static int init586(struct net_device *dev) {void *ptr;int i,result=0 ; -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev);volatile struct configure_cmd_struct *cfg_cmd;volatile struct iasetup_cmd_struct *ias_cmd;volatile struct tdr_cmd_struct *tdr_cmd;
@@ -631,7 +635,7 @@ static void *alloc_rfa(struct net_device *dev,void *ptr)volatile struct rfd_struct *rfd = (struct rfd_struct *)ptr;volatile struct rbd_struct *rbd;int i; -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev);memset ((char *) rfd,0 ,sizeof (struct rfd_struct )*(p->num_recv_buffs+rfdadd)); p->rfd_first = rfd;
@@ -683,7 +687,7 @@ static irqreturn_t sun3_82586_interrupt(int irq,void *dev_id)printk ("sun3_82586-interrupt: irq %d for unknown device.\n" ,irq);return IRQ_NONE ; } - p = (struct priv *) dev->priv; + p =netdev_priv (dev);if (debuglevel >1 )printk ("I" );
@@ -753,7 +757,7 @@ static void sun3_82586_rcv_int(struct net_device *dev)unsigned short totlen;struct sk_buff *skb;struct rbd_struct *rbd; -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev);if (debuglevel >0 )printk ("R" );
@@ -871,7 +875,7 @@ static void sun3_82586_rcv_int(struct net_device *dev)static void sun3_82586_rnr_int (struct net_device *dev) { -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev); p->stats.rx_errors++;
@@ -895,7 +899,7 @@ static void sun3_82586_rnr_int(struct net_device *dev)static void sun3_82586_xmt_int (struct net_device *dev) {int status; -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev);if (debuglevel >0 )printk ("X" );
@@ -945,7 +949,7 @@ static void sun3_82586_xmt_int(struct net_device *dev)static void startrecv586 (struct net_device *dev) { -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev);WAIT_4_SCB_CMD ();WAIT_4_SCB_CMD_RUC ();
@@ -957,7 +961,7 @@ static void startrecv586(struct net_device *dev)static void sun3_82586_timeout (struct net_device *dev) { -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev);#ifndef NO_NOPCOMMANDS if (p->scb->cus &CU_ACTIVE )/* COMMAND-UNIT active? */ {
@@ -999,7 +1003,7 @@ static int sun3_82586_send_packet(struct sk_buff *skb, struct net_device *dev)#ifndef NO_NOPCOMMANDS int next_nop;#endif -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev);if (skb->len >XMIT_BUFF_SIZE ) {
@@ -1108,7 +1112,7 @@ static int sun3_82586_send_packet(struct sk_buff *skb, struct net_device *dev)static struct net_device_stats *sun3_82586_get_stats (struct net_device *dev) { -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev);unsigned short crc,aln,rsc,ovrn; crc =swab16 (p->scb->crc_errs);/* get error-statistic from the ni82586 */
@@ -1171,7 +1175,7 @@ void cleanup_module(void)*/ void sun3_82586_dump (struct net_device *dev,void *ptr) { -struct priv *p = (struct priv *) dev->priv; +struct priv *p =netdev_priv (dev);struct dump_cmd_struct *dump_cmd = (struct dump_cmd_struct *) ptr;int i;
drivers/net/sunbmac.c +9 -9
@@ -914,7 +914,7 @@ static irqreturn_t bigmac_interrupt(int irq, void *dev_id)static int bigmac_open (struct net_device *dev) { -struct bigmac *bp = (struct bigmac *) dev->priv; +struct bigmac *bp =netdev_priv (dev);int ret; ret =request_irq (dev->irq, &bigmac_interrupt,IRQF_SHARED , dev->name, bp);
@@ -931,7 +931,7 @@ static int bigmac_open(struct net_device *dev)static int bigmac_close (struct net_device *dev) { -struct bigmac *bp = (struct bigmac *) dev->priv; +struct bigmac *bp =netdev_priv (dev);del_timer (&bp->bigmac_timer); bp->timer_state = asleep;
@@ -945,7 +945,7 @@ static int bigmac_close(struct net_device *dev)static void bigmac_tx_timeout (struct net_device *dev) { -struct bigmac *bp = (struct bigmac *) dev->priv; +struct bigmac *bp =netdev_priv (dev);bigmac_init_hw (bp,0 );netif_wake_queue (dev);
@@ -954,7 +954,7 @@ static void bigmac_tx_timeout(struct net_device *dev)/* Put a packet on the wire. */ static int bigmac_start_xmit (struct sk_buff *skb,struct net_device *dev) { -struct bigmac *bp = (struct bigmac *) dev->priv; +struct bigmac *bp =netdev_priv (dev);int len, entry;u32 mapping;
@@ -986,7 +986,7 @@ static int bigmac_start_xmit(struct sk_buff *skb, struct net_device *dev)static struct net_device_stats *bigmac_get_stats (struct net_device *dev) { -struct bigmac *bp = (struct bigmac *) dev->priv; +struct bigmac *bp =netdev_priv (dev);bigmac_get_counters (bp, bp->bregs);return &bp->enet_stats;
@@ -994,7 +994,7 @@ static struct net_device_stats *bigmac_get_stats(struct net_device *dev)static void bigmac_set_multicast (struct net_device *dev) { -struct bigmac *bp = (struct bigmac *) dev->priv; +struct bigmac *bp =netdev_priv (dev);void __iomem *bregs = bp->bregs;struct dev_mc_list *dmi = dev->mc_list;char *addrs;
@@ -1051,7 +1051,7 @@ static void bigmac_set_multicast(struct net_device *dev)/* Ethtool support... */ static void bigmac_get_drvinfo (struct net_device *dev,struct ethtool_drvinfo *info) { -struct bigmac *bp = dev->priv; +struct bigmac *bp =netdev_priv (dev);strcpy (info->driver,"sunbmac" );strcpy (info->version,"2.0" );
@@ -1061,7 +1061,7 @@ static void bigmac_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *istatic u32 bigmac_get_link (struct net_device *dev) { -struct bigmac *bp = dev->priv; +struct bigmac *bp =netdev_priv (dev);spin_lock_irq (&bp->lock); bp->sw_bmsr =bigmac_tcvr_read (bp, bp->tregs,BIGMAC_BMSR );
@@ -1097,7 +1097,7 @@ static int __devinit bigmac_ether_init(struct sbus_dev *qec_sdev) dev->dev_addr[i] = idprom->id_ethaddr[i];/* Setup softc, with backpointers to QEC and BigMAC SBUS device structs. */ - bp = dev->priv; + bp =netdev_priv (dev); bp->qec_sdev = qec_sdev; bp->bigmac_sdev = qec_sdev->child;
drivers/net/sungem.c +26 -26
207 lines not on this page · raw message
drivers/net/sunhme.c +13 -13
@@ -2144,7 +2144,7 @@ static irqreturn_t quattro_sbus_interrupt(int irq, void *cookie)for (i =0 ; i <4 ; i++) {struct net_device *dev = qp->happy_meals[i]; -struct happy_meal *hp = dev->priv; +struct happy_meal *hp =netdev_priv (dev);u32 happy_status =hme_read32 (hp, hp->gregs +GREG_STAT );HMD (("quattro_interrupt: status=%08x " , happy_status));
@@ -2189,7 +2189,7 @@ static irqreturn_t quattro_sbus_interrupt(int irq, void *cookie)static int happy_meal_open (struct net_device *dev) { -struct happy_meal *hp = dev->priv; +struct happy_meal *hp =netdev_priv (dev);int res;HMD (("happy_meal_open: " ));
@@ -2221,7 +2221,7 @@ static int happy_meal_open(struct net_device *dev)static int happy_meal_close (struct net_device *dev) { -struct happy_meal *hp = dev->priv; +struct happy_meal *hp =netdev_priv (dev);spin_lock_irq (&hp->happy_lock);happy_meal_stop (hp, hp->gregs);
@@ -2250,7 +2250,7 @@ static int happy_meal_close(struct net_device *dev)static void happy_meal_tx_timeout (struct net_device *dev) { -struct happy_meal *hp = dev->priv; +struct happy_meal *hp =netdev_priv (dev);printk (KERN_ERR "%s: transmit timed out, resetting\n" , dev->name);tx_dump_log ();
@@ -2268,7 +2268,7 @@ static void happy_meal_tx_timeout(struct net_device *dev)static int happy_meal_start_xmit (struct sk_buff *skb,struct net_device *dev) { -struct happy_meal *hp = dev->priv; +struct happy_meal *hp =netdev_priv (dev);int entry;u32 tx_flags;
@@ -2357,7 +2357,7 @@ static int happy_meal_start_xmit(struct sk_buff *skb, struct net_device *dev)static struct net_device_stats *happy_meal_get_stats (struct net_device *dev) { -struct happy_meal *hp = dev->priv; +struct happy_meal *hp =netdev_priv (dev);spin_lock_irq (&hp->happy_lock);happy_meal_get_counters (hp, hp->bigmacregs);
@@ -2368,7 +2368,7 @@ static struct net_device_stats *happy_meal_get_stats(struct net_device *dev)static void happy_meal_set_multicast (struct net_device *dev) { -struct happy_meal *hp = dev->priv; +struct happy_meal *hp =netdev_priv (dev);void __iomem *bregs = hp->bigmacregs;struct dev_mc_list *dmi = dev->mc_list;char *addrs;
@@ -2414,7 +2414,7 @@ static void happy_meal_set_multicast(struct net_device *dev)/* Ethtool support... */ static int hme_get_settings (struct net_device *dev,struct ethtool_cmd *cmd) { -struct happy_meal *hp = dev->priv; +struct happy_meal *hp =netdev_priv (dev); cmd->supported = (SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full |
@@ -2459,7 +2459,7 @@ static int hme_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)static int hme_set_settings (struct net_device *dev,struct ethtool_cmd *cmd) { -struct happy_meal *hp = dev->priv; +struct happy_meal *hp =netdev_priv (dev);/* Verify the settings we care about. */ if (cmd->autoneg != AUTONEG_ENABLE &&
@@ -2483,7 +2483,7 @@ static int hme_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)static void hme_get_drvinfo (struct net_device *dev,struct ethtool_drvinfo *info) { -struct happy_meal *hp = dev->priv; +struct happy_meal *hp =netdev_priv (dev);strcpy (info->driver,"sunhme" );strcpy (info->version,"2.02" );
@@ -2502,7 +2502,7 @@ static void hme_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *infostatic u32 hme_get_link (struct net_device *dev) { -struct happy_meal *hp = dev->priv; +struct happy_meal *hp =netdev_priv (dev);spin_lock_irq (&hp->happy_lock); hp->sw_bmcr =happy_meal_tcvr_read (hp, hp->tcvregs,MII_BMCR );
@@ -2713,7 +2713,7 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfememcpy (dev->dev_addr, idprom->id_ethaddr,6 ); } - hp = dev->priv; + hp =netdev_priv (dev); hp->happy_dev = sdev;
@@ -3031,7 +3031,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev, dev->base_addr = (long ) pdev; - hp = (struct happy_meal *)dev->priv; + hp =netdev_priv (dev);memset (hp,0 ,sizeof (*hp)); hp->happy_dev = pdev;
drivers/net/sunqe.c +7 -7
@@ -511,7 +511,7 @@ static irqreturn_t qec_interrupt(int irq, void *dev_id)static int qe_open (struct net_device *dev) { -struct sunqe *qep = (struct sunqe *) dev->priv; +struct sunqe *qep =netdev_priv (dev); qep->mconfig = (MREGS_MCONFIG_TXENAB | MREGS_MCONFIG_RXENAB |
@@ -521,7 +521,7 @@ static int qe_open(struct net_device *dev)static int qe_close (struct net_device *dev) { -struct sunqe *qep = (struct sunqe *) dev->priv; +struct sunqe *qep =netdev_priv (dev);qe_stop (qep);return 0 ;
@@ -547,7 +547,7 @@ static void qe_tx_reclaim(struct sunqe *qep)static void qe_tx_timeout (struct net_device *dev) { -struct sunqe *qep = (struct sunqe *) dev->priv; +struct sunqe *qep =netdev_priv (dev);int tx_full;spin_lock_irq (&qep->lock);
@@ -573,7 +573,7 @@ out:/* Get a packet queued to go onto the wire. */ static int qe_start_xmit (struct sk_buff *skb,struct net_device *dev) { -struct sunqe *qep = (struct sunqe *) dev->priv; +struct sunqe *qep =netdev_priv (dev);struct sunqe_buffers *qbufs = qep->buffers;__u32 txbuf_dvma, qbufs_dvma = qep->buffers_dvma;unsigned char *txbuf;
@@ -625,7 +625,7 @@ static int qe_start_xmit(struct sk_buff *skb, struct net_device *dev)static void qe_set_multicast (struct net_device *dev) { -struct sunqe *qep = (struct sunqe *) dev->priv; +struct sunqe *qep =netdev_priv (dev);struct dev_mc_list *dmi = dev->mc_list;u8 new_mconfig = qep->mconfig;char *addrs;
@@ -690,7 +690,7 @@ static void qe_set_multicast(struct net_device *dev)/* Ethtool support... */ static void qe_get_drvinfo (struct net_device *dev,struct ethtool_drvinfo *info) { -struct sunqe *qep = dev->priv; +struct sunqe *qep =netdev_priv (dev);strcpy (info->driver,"sunqe" );strcpy (info->version,"3.0" );
@@ -700,7 +700,7 @@ static void qe_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)static u32 qe_get_link (struct net_device *dev) { -struct sunqe *qep = dev->priv; +struct sunqe *qep =netdev_priv (dev);void __iomem *mregs = qep->mregs;u8 phyconfig;
drivers/net/tehuti.c +19 -19
@@ -251,7 +251,7 @@ static void bdx_isr_extra(struct bdx_priv *priv, u32 isr)static irqreturn_t bdx_isr_napi (int irq,void *dev) {struct net_device *ndev = dev; -struct bdx_priv *priv = ndev->priv; +struct bdx_priv *priv =netdev_priv (ndev);u32 isr;ENTER ;
@@ -559,7 +559,7 @@ static int bdx_close(struct net_device *ndev)struct bdx_priv *priv =NULL ;ENTER ; - priv = ndev->priv; + priv =netdev_priv (ndev);napi_disable (&priv->napi);
@@ -588,7 +588,7 @@ static int bdx_open(struct net_device *ndev)int rc;ENTER ; - priv = ndev->priv; + priv =netdev_priv (ndev);bdx_reset (priv);if (netif_running (ndev))netif_stop_queue (priv->ndev);
@@ -633,7 +633,7 @@ static int bdx_range_check(struct bdx_priv *priv, u32 offset)static int bdx_ioctl_priv (struct net_device *ndev,struct ifreq *ifr,int cmd) { -struct bdx_priv *priv = ndev->priv; +struct bdx_priv *priv =netdev_priv (ndev);u32 data[3 ];int error;
@@ -698,7 +698,7 @@ static int bdx_ioctl(struct net_device *ndev, struct ifreq *ifr, int cmd)*/ static void __bdx_vlan_rx_vid (struct net_device *ndev,uint16_t vid,int enable) { -struct bdx_priv *priv = ndev->priv; +struct bdx_priv *priv =netdev_priv (ndev);u32 reg, bit, val;ENTER ;
@@ -748,7 +748,7 @@ static void bdx_vlan_rx_kill_vid(struct net_device *ndev, unsigned short vid)static void bdx_vlan_rx_register (struct net_device *ndev,struct vlan_group *grp) { -struct bdx_priv *priv = ndev->priv; +struct bdx_priv *priv =netdev_priv (ndev);ENTER ;DBG ("device='%s', group='%p'\n" , ndev->name, grp);
@@ -787,7 +787,7 @@ static int bdx_change_mtu(struct net_device *ndev, int new_mtu)static void bdx_setmulti (struct net_device *ndev) { -struct bdx_priv *priv = ndev->priv; +struct bdx_priv *priv =netdev_priv (ndev);u32 rxf_val =GMAC_RX_FILTER_AM |GMAC_RX_FILTER_AB |GMAC_RX_FILTER_OSEN ;
@@ -847,7 +847,7 @@ static void bdx_setmulti(struct net_device *ndev)static int bdx_set_mac (struct net_device *ndev,void *p) { -struct bdx_priv *priv = ndev->priv; +struct bdx_priv *priv =netdev_priv (ndev);struct sockaddr *addr = p;ENTER ;
@@ -929,7 +929,7 @@ static void bdx_update_stats(struct bdx_priv *priv)static struct net_device_stats *bdx_get_stats (struct net_device *ndev) { -struct bdx_priv *priv = ndev->priv; +struct bdx_priv *priv =netdev_priv (ndev);struct net_device_stats *net_stat = &priv->net_stats;return net_stat; }
@@ -1624,7 +1624,7 @@ static inline int bdx_tx_space(struct bdx_priv *priv)*/ static int bdx_tx_transmit (struct sk_buff *skb,struct net_device *ndev) { -struct bdx_priv *priv = ndev->priv; +struct bdx_priv *priv =netdev_priv (ndev);struct txd_fifo *f = &priv->txd_fifo0;int txd_checksum =7 ;/* full checksum */ int txd_lgsnd =0 ;
@@ -2027,7 +2027,7 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ndev->features |=NETIF_F_HIGHDMA ;/************** priv ****************/ - priv = nic->priv[port] = ndev->priv; + priv = nic->priv[port] =netdev_priv (ndev);memset (priv,0 ,sizeof (struct bdx_priv )); priv->pBdxRegs = nic->regs + port *0x8000 ;
@@ -2150,7 +2150,7 @@ static int bdx_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd) {u32 rdintcm;u32 tdintcm; -struct bdx_priv *priv = netdev->priv; +struct bdx_priv *priv =netdev_priv (netdev); rdintcm = priv->rdintcm; tdintcm = priv->tdintcm;
@@ -2181,7 +2181,7 @@ static int bdx_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)static void bdx_get_drvinfo (struct net_device *netdev,struct ethtool_drvinfo *drvinfo) { -struct bdx_priv *priv = netdev->priv; +struct bdx_priv *priv =netdev_priv (netdev);strlcat (drvinfo->driver,BDX_DRV_NAME ,sizeof (drvinfo->driver));strlcat (drvinfo->version,BDX_DRV_VERSION ,sizeof (drvinfo->version));
@@ -2223,7 +2223,7 @@ bdx_get_coalesce(struct net_device *netdev, struct ethtool_coalesce *ecoal) {u32 rdintcm;u32 tdintcm; -struct bdx_priv *priv = netdev->priv; +struct bdx_priv *priv =netdev_priv (netdev); rdintcm = priv->rdintcm; tdintcm = priv->tdintcm;
@@ -2252,7 +2252,7 @@ bdx_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *ecoal) {u32 rdintcm;u32 tdintcm; -struct bdx_priv *priv = netdev->priv; +struct bdx_priv *priv =netdev_priv (netdev);int rx_coal;int tx_coal;int rx_max_coal;
@@ -2310,7 +2310,7 @@ static inline int bdx_tx_fifo_size_to_packets(int tx_size)static void bdx_get_ringparam (struct net_device *netdev,struct ethtool_ringparam *ring) { -struct bdx_priv *priv = netdev->priv; +struct bdx_priv *priv =netdev_priv (netdev);/*max_pending - the maximum-sized FIFO we allow */ ring->rx_max_pending =bdx_rx_fifo_size_to_packets (3 );
@@ -2327,7 +2327,7 @@ bdx_get_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring)static int bdx_set_ringparam (struct net_device *netdev,struct ethtool_ringparam *ring) { -struct bdx_priv *priv = netdev->priv; +struct bdx_priv *priv =netdev_priv (netdev);int rx_size =0 ;int tx_size =0 ;
@@ -2388,7 +2388,7 @@ static void bdx_get_strings(struct net_device *netdev, u32 stringset, u8 *data)*/ static int bdx_get_stats_count (struct net_device *netdev) { -struct bdx_priv *priv = netdev->priv; +struct bdx_priv *priv =netdev_priv (netdev);BDX_ASSERT (ARRAY_SIZE (bdx_stat_names) !=sizeof (struct bdx_stats ) /sizeof (u64));return ((priv->stats_flag) ?ARRAY_SIZE (bdx_stat_names) :0 );
@@ -2403,7 +2403,7 @@ static int bdx_get_stats_count(struct net_device *netdev)static void bdx_get_ethtool_stats (struct net_device *netdev,struct ethtool_stats *stats,u64 *data) { -struct bdx_priv *priv = netdev->priv; +struct bdx_priv *priv =netdev_priv (netdev);if (priv->stats_flag) {
drivers/net/tokenring/tms380tr.c +9 -5
@@ -180,10 +180,14 @@ void tms380tr_wait(unsigned long time);static void tms380tr_write_rpl_status (RPL *rpl,unsigned int Status);static void tms380tr_write_tpl_status (TPL *tpl,unsigned int Status); -#define SIFREADB (reg) (((struct net_local *)dev->priv)->sifreadb(dev, reg)) -#define SIFWRITEB (val, reg) (((struct net_local *)dev->priv)->sifwriteb(dev, val, reg)) -#define SIFREADW (reg) (((struct net_local *)dev->priv)->sifreadw(dev, reg)) -#define SIFWRITEW (val, reg) (((struct net_local *)dev->priv)->sifwritew(dev, val, reg)) +#define SIFREADB (reg) \ + (((struct net_local *)netdev_priv(dev))->sifreadb(dev, reg)) +#define SIFWRITEB (val, reg) \ + (((struct net_local *)netdev_priv(dev))->sifwriteb(dev, val, reg)) +#define SIFREADW (reg) \ + (((struct net_local *)netdev_priv(dev))->sifreadw(dev, reg)) +#define SIFWRITEW (val, reg) \ + (((struct net_local *)netdev_priv(dev))->sifwritew(dev, val, reg))
@@ -2331,7 +2335,7 @@ int tmsdev_init(struct net_device *dev, struct device *pdev) {struct net_local *tms_local; -memset (dev->priv,0 ,sizeof (struct net_local )); +memset (netdev_priv (dev),0 ,sizeof (struct net_local )); tms_local =netdev_priv (dev);init_waitqueue_head (&tms_local->wait_for_tok_int);if (pdev->dma_mask)
drivers/net/tulip/de2104x.c +22 -22
176 lines not on this page · raw message
drivers/net/tulip/eeprom.c +1 -1
@@ -337,7 +337,7 @@ int __devinit tulip_read_eeprom(struct net_device *dev, int location, int addr_l {int i;unsigned retval =0 ; -struct tulip_private *tp = dev->priv; +struct tulip_private *tp =netdev_priv (dev);void __iomem *ee_addr = tp->base_addr +CSR9 ;int read_cmd = location | (EE_READ_CMD << addr_len);
drivers/net/tulip/uli526x.c +1 -1
@@ -892,7 +892,7 @@ static struct net_device_stats * uli526x_get_stats(struct net_device *dev)static void uli526x_set_filter_mode (struct net_device * dev) { -struct uli526x_board_info *db = dev->priv; +struct uli526x_board_info *db =netdev_priv (dev);unsigned long flags;ULI526X_DBUG (0 ,"uli526x_set_filter_mode()" ,0 );
drivers/net/typhoon.c +1 -1
@@ -1798,7 +1798,7 @@ static irqreturn_t typhoon_interrupt(int irq, void *dev_instance) { struct net_device *dev = dev_instance; -struct typhoon *tp = dev->priv; +struct typhoon *tp =netdev_priv (dev);void __iomem *ioaddr = tp->ioaddr;u32 intr_status;
drivers/net/usb/mcs7830.c +2 -2
@@ -344,14 +344,14 @@ out:static int mcs7830_mdio_read (struct net_device *netdev,int phy_id,int location) { -struct usbnet *dev = netdev->priv; +struct usbnet *dev =netdev_priv (netdev);return mcs7830_read_phy (dev, location); }static void mcs7830_mdio_write (struct net_device *netdev,int phy_id,int location,int val) { -struct usbnet *dev = netdev->priv; +struct usbnet *dev =netdev_priv (netdev);mcs7830_write_phy (dev, location, val); }
drivers/net/virtio_net.c +2 -1
@@ -125,7 +125,8 @@ static void receive_skb(struct net_device *dev, struct sk_buff *skb,unsigned int i;for (i =0 ; i <skb_shinfo (skb)->nr_frags; i++) -give_a_page (dev->priv,skb_shinfo (skb)->frags[i].page); +give_a_page (netdev_priv (dev), +skb_shinfo (skb)->frags[i].page); skb->data_len =0 ;skb_shinfo (skb)->nr_frags =0 ; }
drivers/net/wan/dlci.c +18 -18
@@ -74,7 +74,7 @@ static int dlci_header(struct sk_buff *skb, struct net_device *dev,unsigned int hlen;char *dest; - dlp = dev->priv; + dlp =netdev_priv (dev); hdr.control =FRAD_I_UI ; switch(type)
@@ -110,7 +110,7 @@ static void dlci_receive(struct sk_buff *skb, struct net_device *dev)struct frhdr *hdr;int process, header; - dlp = dev->priv; + dlp =netdev_priv (dev);if (!pskb_may_pull (skb,sizeof (*hdr))) {printk (KERN_NOTICE "%s: invalid data no header\n" , dev->name);
@@ -197,7 +197,7 @@ static int dlci_transmit(struct sk_buff *skb, struct net_device *dev)if (!skb || !dev)return (0 ); - dlp = dev->priv; + dlp =netdev_priv (dev);netif_stop_queue (dev);
@@ -235,9 +235,9 @@ static int dlci_config(struct net_device *dev, struct dlci_conf __user *conf, instruct frad_local *flp;int err; - dlp = dev->priv; + dlp =netdev_priv (dev); - flp = dlp->slave->priv; + flp =netdev_priv (dlp->slave);if (!get) {
@@ -269,7 +269,7 @@ static int dlci_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)if (!capable (CAP_NET_ADMIN ))return (-EPERM ); - dlp = dev->priv; + dlp =netdev_priv (dev);switch (cmd) {
@@ -298,7 +298,7 @@ static int dlci_change_mtu(struct net_device *dev, int new_mtu) {struct dlci_local *dlp; - dlp = dev->priv; + dlp =netdev_priv (dev);return ((*dlp->slave->change_mtu)(dlp->slave, new_mtu)); }
@@ -309,7 +309,7 @@ static int dlci_open(struct net_device *dev)struct frad_local *flp;int err; - dlp = dev->priv; + dlp =netdev_priv (dev);if (!*(short *)(dev->dev_addr))return (-EINVAL );
@@ -317,7 +317,7 @@ static int dlci_open(struct net_device *dev)if (!netif_running (dlp->slave))return (-ENOTCONN ); - flp = dlp->slave->priv; + flp =netdev_priv (dlp->slave); err = (*flp->activate)(dlp->slave, dev);if (err)return (err);
@@ -335,9 +335,9 @@ static int dlci_close(struct net_device *dev)netif_stop_queue (dev); - dlp = dev->priv; + dlp =netdev_priv (dev); - flp = dlp->slave->priv; + flp =netdev_priv (dlp->slave); err = (*flp->deactivate)(dlp->slave, dev);return 0 ;
@@ -347,7 +347,7 @@ static struct net_device_stats *dlci_get_stats(struct net_device *dev) {struct dlci_local *dlp; - dlp = dev->priv; + dlp =netdev_priv (dev);return (&dlp->stats); }
@@ -365,7 +365,7 @@ static int dlci_add(struct dlci_add *dlci)if (!slave)return -ENODEV ; -if (slave->type !=ARPHRD_FRAD || slave->priv ==NULL ) +if (slave->type !=ARPHRD_FRAD ||netdev_priv (slave) ==NULL ) goto err1;/* create device name */
@@ -391,11 +391,11 @@ static int dlci_add(struct dlci_add *dlci) *(short *)(master->dev_addr) = dlci->dlci; - dlp = (struct dlci_local *) master->priv; + dlp =netdev_priv (master); dlp->slave = slave; dlp->master = master; - flp = slave->priv; + flp =netdev_priv (slave); err = (*flp->assoc)(slave, master);if (err <0 ) goto err2;
@@ -435,9 +435,9 @@ static int dlci_del(struct dlci_add *dlci)return (-EBUSY ); } - dlp = master->priv; + dlp =netdev_priv (master); slave = dlp->slave; - flp = slave->priv; + flp =netdev_priv (slave);rtnl_lock (); err = (*flp->deassoc)(slave, master);
@@ -491,7 +491,7 @@ static const struct header_ops dlci_header_ops = {static void dlci_setup (struct net_device *dev) { -struct dlci_local *dlp = dev->priv; +struct dlci_local *dlp =netdev_priv (dev); dev->flags =0 ; dev->open = dlci_open;
drivers/net/wan/sdla.c +24 -24
192 lines not on this page · raw message
drivers/net/wan/x25_asy.c +14 -14
@@ -64,7 +64,7 @@ static struct x25_asy *x25_asy_alloc(void)if (dev ==NULL )break ; - sl = dev->priv; + sl =netdev_priv (dev);/* Not in use ? */ if (!test_and_set_bit (SLF_INUSE , &sl->flags))return sl;
@@ -86,7 +86,7 @@ static struct x25_asy *x25_asy_alloc(void)return NULL ;/* Initialize channel control data */ - sl = dev->priv; + sl =netdev_priv (dev); dev->base_addr = i;/* register device so that it can be ifconfig'ed */
@@ -120,7 +120,7 @@ static void x25_asy_free(struct x25_asy *sl)static int x25_asy_change_mtu (struct net_device *dev,int newmtu) { -struct x25_asy *sl = dev->priv; +struct x25_asy *sl =netdev_priv (dev);unsigned char *xbuff, *rbuff;int len =2 * newmtu;
@@ -280,7 +280,7 @@ static void x25_asy_write_wakeup(struct tty_struct *tty)static void x25_asy_timeout (struct net_device *dev) { -struct x25_asy *sl = dev->priv; +struct x25_asy *sl =netdev_priv (dev);spin_lock (&sl->lock);if (netif_queue_stopped (dev)) {
@@ -301,7 +301,7 @@ static void x25_asy_timeout(struct net_device *dev)static int x25_asy_xmit (struct sk_buff *skb,struct net_device *dev) { -struct x25_asy *sl = dev->priv; +struct x25_asy *sl =netdev_priv (dev);int err;if (!netif_running (sl->dev)) {
@@ -373,7 +373,7 @@ static int x25_asy_data_indication(struct net_device *dev, struct sk_buff *skb)static void x25_asy_data_transmit (struct net_device *dev,struct sk_buff *skb) { -struct x25_asy *sl = dev->priv; +struct x25_asy *sl =netdev_priv (dev);spin_lock (&sl->lock);if (netif_queue_stopped (sl->dev) || sl->tty ==NULL ) {
@@ -398,7 +398,7 @@ static void x25_asy_data_transmit(struct net_device *dev, struct sk_buff *skb)static void x25_asy_connected (struct net_device *dev,int reason) { -struct x25_asy *sl = dev->priv; +struct x25_asy *sl =netdev_priv (dev);struct sk_buff *skb;unsigned char *ptr;
@@ -418,7 +418,7 @@ static void x25_asy_connected(struct net_device *dev, int reason)static void x25_asy_disconnected (struct net_device *dev,int reason) { -struct x25_asy *sl = dev->priv; +struct x25_asy *sl =netdev_priv (dev);struct sk_buff *skb;unsigned char *ptr;
@@ -450,7 +450,7 @@ static struct lapb_register_struct x25_asy_callbacks = {/* Open the low-level part of the X.25 channel. Easy! */ static int x25_asy_open (struct net_device *dev) { -struct x25_asy *sl = dev->priv; +struct x25_asy *sl =netdev_priv (dev);unsigned long len;int err;
@@ -499,7 +499,7 @@ norbuff:/* Close the low-level part of the X.25 channel. Easy! */ static int x25_asy_close (struct net_device *dev) { -struct x25_asy *sl = dev->priv; +struct x25_asy *sl =netdev_priv (dev);int err;spin_lock (&sl->lock);
@@ -615,7 +615,7 @@ static void x25_asy_close_tty(struct tty_struct *tty)static struct net_device_stats *x25_asy_get_stats (struct net_device *dev) { -struct x25_asy *sl = dev->priv; +struct x25_asy *sl =netdev_priv (dev);return &sl->stats; }
@@ -717,7 +717,7 @@ static int x25_asy_ioctl(struct tty_struct *tty, struct file *file,static int x25_asy_open_dev (struct net_device *dev) { -struct x25_asy *sl = dev->priv; +struct x25_asy *sl =netdev_priv (dev);if (sl->tty ==NULL )return -ENODEV ;return 0 ;
@@ -726,7 +726,7 @@ static int x25_asy_open_dev(struct net_device *dev)/* Initialise the X.25 driver. Called by the device init code */ static void x25_asy_setup (struct net_device *dev) { -struct x25_asy *sl = dev->priv; +struct x25_asy *sl =netdev_priv (dev); sl->magic =X25_ASY_MAGIC ; sl->dev = dev;
@@ -793,7 +793,7 @@ static void __exit exit_x25_asy(void)for (i =0 ; i < x25_asy_maxdev; i++) { dev = x25_asy_devs[i];if (dev) { -struct x25_asy *sl = dev->priv; +struct x25_asy *sl =netdev_priv (dev);spin_lock_bh (&sl->lock);if (sl->tty)
drivers/net/wireless/libertas/ethtool.c +6 -6
@@ -23,7 +23,7 @@ static const char * mesh_stat_strings[]= {static void lbs_ethtool_get_drvinfo (struct net_device *dev,struct ethtool_drvinfo *info) { -struct lbs_private *priv = (struct lbs_private *) dev->priv; +struct lbs_private *priv =netdev_priv (dev); 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 * bytes) { -struct lbs_private *priv = (struct lbs_private *) dev->priv; +struct lbs_private *priv =netdev_priv (dev);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 *data) { -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);struct cmd_ds_mesh_access mesh_access;int ret;
@@ -113,7 +113,7 @@ static void lbs_ethtool_get_stats(struct net_device *dev,static int lbs_ethtool_get_sset_count (struct net_device *dev,int sset) { -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);if (sset ==ETH_SS_STATS && dev == 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 = dev->priv; +struct lbs_private *priv =netdev_priv (dev);if (priv->wol_criteria ==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 = dev->priv; +struct lbs_private *priv =netdev_priv (dev);uint32_t criteria =0 ;if (priv->wol_criteria ==0xffffffff && wol->wolopts)
drivers/net/wireless/libertas/persistcfg.c +8 -8
@@ -18,7 +18,7 @@static int mesh_get_default_parameters (struct device *dev,struct mrvl_mesh_defaults *defs) { -struct lbs_private *priv =to_net_dev (dev)->priv; +struct lbs_private *priv =netdev_priv (to_net_dev (dev));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 *attr,const char *buf,size_t count) { -struct lbs_private *priv =to_net_dev (dev)->priv; +struct lbs_private *priv =netdev_priv (to_net_dev (dev));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 count) { -struct lbs_private *priv =to_net_dev (dev)->priv; +struct lbs_private *priv =netdev_priv (to_net_dev (dev));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 *attr,const char *buf,size_t count) { -struct lbs_private *priv =to_net_dev (dev)->priv; +struct lbs_private *priv =netdev_priv (to_net_dev (dev));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 device_attribute *attr,struct cmd_ds_mesh_config cmd;struct mrvl_mesh_defaults defs;struct mrvl_meshie *ie; -struct lbs_private *priv =to_net_dev (dev)->priv; +struct lbs_private *priv =netdev_priv (to_net_dev (dev));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 =to_net_dev (dev)->priv; +struct lbs_private *priv =netdev_priv (to_net_dev (dev));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 =to_net_dev (dev)->priv; +struct lbs_private *priv =netdev_priv (to_net_dev (dev));uint32_t datum;int ret;
@@ -377,7 +377,7 @@ static ssize_t capability_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 =to_net_dev (dev)->priv; +struct lbs_private *priv =netdev_priv (to_net_dev (dev));uint32_t datum;int ret;
drivers/net/wireless/libertas/scan.c +2 -2
@@ -939,7 +939,7 @@ out:int lbs_set_scan (struct net_device *dev,struct iw_request_info *info,union iwreq_data *wrqu,char *extra) { -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);int ret =0 ;lbs_deb_enter (LBS_DEB_WEXT );
@@ -997,7 +997,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 = dev->priv; + struct lbs_private *priv = netdev_priv(dev);int err =0 ;char *ev = extra;char *stop = ev + dwrq->length;
drivers/net/wireless/libertas/tx.c +1 -1
@@ -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 = dev->priv; +struct lbs_private *priv =netdev_priv (dev);struct txpd *txpd;char *p802x_hdr;uint16_t pkt_len;
Signature · 1 line
1.5.3.4
Re: [PATCH 03/18] netdevice: safe convert to netdev_priv() #part-3
drivers/net/typhoon.c static irqreturn_t · line 1803
Quoted 12 lines · Wang Chen
drivers/net/typhoon.c +1
-1@@ -1798,7 +1798,7 @@ static irqreturn_t typhoon_interrupt(int irq, void *dev_instance) { struct net_device *dev = dev_instance; -struct typhoon *tp = dev->priv; +struct typhoon *tp =netdev_priv (dev);void __iomem *ioaddr = tp->ioaddr;u32 intr_status;
For what it's worth
Acked-by Dave Dillow <[email protected]>
Thanks for the diffstats on the broken up patches -- I missed this patch to typhoon last time around. It was easy to find this time.
PATCH 4/18 netdevice: safe convert to netdev_priv() #part-4
In reply to Wang ChenSigned-off-by Wang Chen <[email protected]>
--- drivers/net/wireless/libertas/wext.c | 72 ++++++++++++++-------------- drivers/net/wireless/rndis_wlan.c | 62 ++++++++++++------------ drivers/net/wireless/wavelan.c | 88 ++++++++++++++++----------------- drivers/net/znet.c | 22 ++++---- net/appletalk/ddp.c | 2 +- net/atm/br2684.c | 2 +- net/atm/lec.c | 34 +++++++------ net/atm/mpc.c | 10 ++-- net/bluetooth/bnep/core.c | 2 +- net/bluetooth/bnep/netdev.c | 6 +- net/bridge/br_if.c | 2 +- net/bridge/br_sysfs_br.c | 2 +- net/irda/irlan/irlan_common.c | 2 +- 13 files changed, 153 insertions(+), 153 deletions(-)
drivers/net/wireless/libertas/wext.c +36 -36
@@ -183,7 +183,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 *info,struct iw_freq *fwrq,char *extra) { -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);struct chan_freq_power *cfp;lbs_deb_enter (LBS_DEB_WEXT );
@@ -209,7 +209,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 *info,struct sockaddr *awrq,char *extra) { -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);lbs_deb_enter (LBS_DEB_WEXT );
@@ -227,7 +227,7 @@ static int lbs_get_wap(struct net_device *dev, struct iw_request_info *info,static int lbs_set_nick (struct net_device *dev,struct iw_request_info *info,struct iw_point *dwrq,char *extra) { -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);lbs_deb_enter (LBS_DEB_WEXT );
@@ -251,7 +251,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 *info,struct iw_point *dwrq,char *extra) { -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);lbs_deb_enter (LBS_DEB_WEXT );
@@ -268,7 +268,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 *info,struct iw_point *dwrq,char *extra) { -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);lbs_deb_enter (LBS_DEB_WEXT );
@@ -293,7 +293,7 @@ static int lbs_set_rts(struct net_device *dev, struct iw_request_info *info, struct iw_param *vwrq, char *extra) { int ret = 0; -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);u32 rthr = vwrq->value;lbs_deb_enter (LBS_DEB_WEXT );
@@ -318,7 +318,7 @@ static int lbs_get_rts(struct net_device *dev, struct iw_request_info *info, struct iw_param *vwrq, char *extra) { int ret = 0; -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);lbs_deb_enter (LBS_DEB_WEXT );
@@ -344,7 +344,7 @@ static int lbs_set_frag(struct net_device *dev, struct iw_request_info *info, {int ret =0 ;u32 fthr = vwrq->value; -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);lbs_deb_enter (LBS_DEB_WEXT );
@@ -369,7 +369,7 @@ static int lbs_get_frag(struct net_device *dev, struct iw_request_info *info, struct iw_param *vwrq, char *extra) { int ret = 0; -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);lbs_deb_enter (LBS_DEB_WEXT );
@@ -394,7 +394,7 @@ out:static int lbs_get_mode (struct net_device *dev,struct iw_request_info *info,u32 * uwrq,char *extra) { -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);lbs_deb_enter (LBS_DEB_WEXT );
@@ -421,7 +421,7 @@ static int lbs_get_txpow(struct net_device *dev, struct iw_param *vwrq, char *extra) { int ret = 0; -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);lbs_deb_enter (LBS_DEB_WEXT );
@@ -452,7 +452,7 @@ static int lbs_set_retry(struct net_device *dev, struct iw_request_info *info, struct iw_param *vwrq, char *extra) { int ret = 0; -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);lbs_deb_enter (LBS_DEB_WEXT );
@@ -486,7 +486,7 @@ out:static int lbs_get_retry (struct net_device *dev,struct iw_request_info *info,struct iw_param *vwrq,char *extra) { -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);int ret =0 ;lbs_deb_enter (LBS_DEB_WEXT );
@@ -554,7 +554,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 = dev->priv; +struct lbs_private *priv =netdev_priv (dev);struct iw_range *range = (struct iw_range *)extra;struct chan_freq_power *cfp;u8 rates[MAX_RATES +1 ];
@@ -730,7 +730,7 @@ out:static int lbs_set_power (struct net_device *dev,struct iw_request_info *info,struct iw_param *vwrq,char *extra) { -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);lbs_deb_enter (LBS_DEB_WEXT );
@@ -780,7 +780,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 *info,struct iw_param *vwrq,char *extra) { -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);lbs_deb_enter (LBS_DEB_WEXT );
@@ -803,7 +803,7 @@ static struct iw_statistics *lbs_get_wireless_stats(struct net_device *dev)EXCELLENT =95 , PERFECT = 100 }; -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);u32 rssi_qual;u32 tx_qual;u32 quality =0 ;
@@ -908,7 +908,7 @@ static int lbs_set_freq(struct net_device *dev, struct iw_request_info *info, struct iw_freq *fwrq, char *extra) { int ret = -EINVAL; -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);struct chan_freq_power *cfp;struct assoc_request * assoc_req;
@@ -965,7 +965,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 = dev->priv; + struct lbs_private *priv = netdev_priv(dev);struct chan_freq_power *cfp;int ret = -EINVAL ;
@@ -1014,7 +1014,7 @@ out:static int lbs_set_rate (struct net_device *dev,struct iw_request_info *info,struct iw_param *vwrq,char *extra) { -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);u8 new_rate =0 ;int ret = -EINVAL ;u8 rates[MAX_RATES +1 ];
@@ -1062,7 +1062,7 @@ out:static int lbs_get_rate (struct net_device *dev,struct iw_request_info *info,struct iw_param *vwrq,char *extra) { -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);lbs_deb_enter (LBS_DEB_WEXT );
@@ -1087,7 +1087,7 @@ static int lbs_set_mode(struct net_device *dev, struct iw_request_info *info, u32 * uwrq, char *extra) { int ret = 0; -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);struct assoc_request * assoc_req;lbs_deb_enter (LBS_DEB_WEXT );
@@ -1132,7 +1132,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 = dev->priv; + struct lbs_private *priv = netdev_priv(dev);int index = (dwrq->flags &IW_ENCODE_INDEX ) -1 ;lbs_deb_enter (LBS_DEB_WEXT );
@@ -1327,7 +1327,7 @@ static int lbs_set_encode(struct net_device *dev, struct iw_point *dwrq, char *extra) { int ret = 0; -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);struct assoc_request * assoc_req;u16 is_default =0 , index =0 , set_tx_key =0 ;
@@ -1403,7 +1403,7 @@ static int lbs_get_encodeext(struct net_device *dev, char *extra) {int ret = -EINVAL ; -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;int index, max_key_len;
@@ -1509,7 +1509,7 @@ static int lbs_set_encodeext(struct net_device *dev, char *extra) {int ret =0 ; -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;int alg = ext->alg;struct assoc_request * assoc_req;
@@ -1633,7 +1633,7 @@ static int lbs_set_genie(struct net_device *dev,struct iw_point *dwrq, char *extra) { - struct lbs_private *priv = dev->priv; + struct lbs_private *priv = netdev_priv(dev);int ret =0 ;struct assoc_request * assoc_req;
@@ -1679,7 +1679,7 @@ static int lbs_get_genie(struct net_device *dev, char *extra) {int ret =0 ; -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);lbs_deb_enter (LBS_DEB_WEXT );
@@ -1707,7 +1707,7 @@ static int lbs_set_auth(struct net_device *dev,struct iw_param *dwrq, char *extra) { - struct lbs_private *priv = dev->priv; + struct lbs_private *priv = netdev_priv(dev);struct assoc_request * assoc_req;int ret =0 ;int updated =0 ;
@@ -1806,7 +1806,7 @@ static int lbs_get_auth(struct net_device *dev, char *extra) {int ret =0 ; -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);lbs_deb_enter (LBS_DEB_WEXT );
@@ -1843,7 +1843,7 @@ static int lbs_set_txpow(struct net_device *dev, struct iw_request_info *info, struct iw_param *vwrq, char *extra) { int ret = 0; -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);u16 dbm;
@@ -1884,7 +1884,7 @@ static int lbs_set_txpow(struct net_device *dev, struct iw_request_info *info,static int lbs_get_essid (struct net_device *dev,struct iw_request_info *info,struct iw_point *dwrq,char *extra) { -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);lbs_deb_enter (LBS_DEB_WEXT );
@@ -1919,7 +1919,7 @@ static int lbs_get_essid(struct net_device *dev, struct iw_request_info *info,static int lbs_set_essid (struct net_device *dev,struct iw_request_info *info,struct iw_point *dwrq,char *extra) { -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);int ret =0 ;u8 ssid[IW_ESSID_MAX_SIZE ];u8 ssid_len =0 ;
@@ -1982,7 +1982,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 = dev->priv; + struct lbs_private *priv = netdev_priv(dev);lbs_deb_enter (LBS_DEB_WEXT );
@@ -2000,7 +2000,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 = dev->priv; + struct lbs_private *priv = netdev_priv(dev);int ret =0 ;lbs_deb_enter (LBS_DEB_WEXT );
@@ -2039,7 +2039,7 @@ static int lbs_mesh_set_essid(struct net_device *dev,static int lbs_set_wap (struct net_device *dev,struct iw_request_info *info,struct sockaddr *awrq,char *extra) { -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);struct assoc_request * assoc_req;int ret =0 ;DECLARE_MAC_BUF (mac);
drivers/net/wireless/rndis_wlan.c +31 -31
248 lines not on this page · raw message
drivers/net/wireless/wavelan.c +43 -45
346 lines not on this page · raw message
drivers/net/znet.c +11 -11
@@ -167,7 +167,7 @@ static void znet_tx_timeout (struct net_device *dev);/* Request needed resources */ static int znet_request_resources (struct net_device *dev) { -struct znet_private *znet = dev->priv; +struct znet_private *znet =netdev_priv (dev);unsigned long flags;if (request_irq (dev->irq, &znet_interrupt,0 ,"ZNet" , dev))
@@ -201,7 +201,7 @@ static int znet_request_resources (struct net_device *dev)static void znet_release_resources (struct net_device *dev) { -struct znet_private *znet = dev->priv; +struct znet_private *znet =netdev_priv (dev);unsigned long flags;release_region (znet->sia_base, znet->sia_size);
@@ -216,7 +216,7 @@ static void znet_release_resources (struct net_device *dev)/* Keep the magical SIA stuff in a single function... */ static void znet_transceiver_power (struct net_device *dev,int on) { -struct znet_private *znet = dev->priv; +struct znet_private *znet =netdev_priv (dev);unsigned char v;/* Turn on/off the 82501 SIA, using zenith-specific magic. */
@@ -235,7 +235,7 @@ static void znet_transceiver_power (struct net_device *dev, int on)Also used from hardware_init. */ static void znet_set_multicast_list (struct net_device *dev) { -struct znet_private *znet = dev->priv; +struct znet_private *znet =netdev_priv (dev);short ioaddr = dev->base_addr;struct i82593_conf_block *cfblk = &znet->i593_init;
@@ -387,7 +387,7 @@ static int __init znet_probe (void)if (!dev)return -ENOMEM ; - znet = dev->priv; + znet =netdev_priv (dev); netinfo = (struct netidblk *)p; dev->base_addr = netinfo->iobase1;
@@ -531,7 +531,7 @@ static void znet_tx_timeout (struct net_device *dev)static int znet_send_packet (struct sk_buff *skb,struct net_device *dev) {int ioaddr = dev->base_addr; -struct znet_private *znet = dev->priv; +struct znet_private *znet =netdev_priv (dev);unsigned long flags;short length = skb->len;
@@ -601,7 +601,7 @@ static int znet_send_packet(struct sk_buff *skb, struct net_device *dev)static irqreturn_t znet_interrupt (int irq,void *dev_id) {struct net_device *dev = dev_id; -struct znet_private *znet = dev->priv; +struct znet_private *znet =netdev_priv (dev);int ioaddr;int boguscnt =20 ;int handled =0 ;
@@ -679,7 +679,7 @@ static irqreturn_t znet_interrupt(int irq, void *dev_id)static void znet_rx (struct net_device *dev) { -struct znet_private *znet = dev->priv; +struct znet_private *znet =netdev_priv (dev);int ioaddr = dev->base_addr;int boguscount =1 ;short next_frame_end_offset =0 ;/* Offset of next frame start. */
@@ -829,7 +829,7 @@ static void show_dma(struct net_device *dev) {short ioaddr = dev->base_addr;unsigned char stat =inb (ioaddr); -struct znet_private *znet = dev->priv; +struct znet_private *znet =netdev_priv (dev);unsigned long flags;short dma_port = ((znet->tx_dma&3 )<<2 ) +IO_DMA2_BASE ;unsigned addr =inb (dma_port);
@@ -852,7 +852,7 @@ static void hardware_init(struct net_device *dev) {unsigned long flags;short ioaddr = dev->base_addr; -struct znet_private *znet = dev->priv; +struct znet_private *znet =netdev_priv (dev); znet->rx_cur = znet->rx_start; znet->tx_cur = znet->tx_start;
@@ -914,7 +914,7 @@ static void update_stop_hit(short ioaddr, unsigned short rx_stop_offset) static __exit void znet_cleanup (void) {if (znet_dev) { -struct znet_private *znet = znet_dev->priv; +struct znet_private *znet =netdev_priv (znet_dev);unregister_netdev (znet_dev);kfree (znet->rx_start);
net/appletalk/ddp.c +1 -1
@@ -1284,7 +1284,7 @@ static int handle_ip_over_ddp(struct sk_buff *skb) skb->dev = dev;skb_reset_transport_header (skb); - stats = dev->priv; + stats =netdev_priv (dev); stats->rx_packets++; stats->rx_bytes += skb->len +13 ;netif_rx (skb);/* Send the SKB up to a higher place. */
net/atm/br2684.c +1 -1
@@ -101,7 +101,7 @@ static LIST_HEAD(br2684_devs);static inline struct br2684_dev *BRPRIV (const struct net_device *net_dev) { -return (struct br2684_dev *)net_dev->priv; +return (struct br2684_dev *)netdev_priv (net_dev); }static inline struct net_device *list_entry_brdev (const struct list_head *le)
net/atm/lec.c +18 -16
@@ -152,7 +152,7 @@ static void lec_handle_bridge(struct sk_buff *skb, struct net_device *dev) buff +=4 ; mesg->content.normal.flag = *buff &0x01 ;/* 0x01 is topology change */ - priv = (struct lec_priv *)dev->priv; + priv =netdev_priv (dev);atm_force_charge (priv->lecd, skb2->truesize); sk =sk_atm (priv->lecd);skb_queue_tail (&sk->sk_receive_queue, skb2);
@@ -218,7 +218,7 @@ static unsigned char *get_tr_dst(unsigned char *packet, unsigned char *rdesc)static int lec_open (struct net_device *dev) { -struct lec_priv *priv = (struct lec_priv *)dev->priv; +struct lec_priv *priv =netdev_priv (dev);netif_start_queue (dev);memset (&priv->stats,0 ,sizeof (struct net_device_stats ));
@@ -252,7 +252,7 @@ static void lec_tx_timeout(struct net_device *dev)static int lec_start_xmit (struct sk_buff *skb,struct net_device *dev) {struct sk_buff *skb2; -struct lec_priv *priv = (struct lec_priv *)dev->priv; +struct lec_priv *priv =netdev_priv (dev);struct lecdatahdr_8023 *lec_h;struct atm_vcc *vcc;struct lec_arp_table *entry;
@@ -442,14 +442,14 @@ static int lec_close(struct net_device *dev)*/ static struct net_device_stats *lec_get_stats (struct net_device *dev) { -return &((struct lec_priv *)dev->priv)->stats; +return &((struct lec_priv *)netdev_priv (dev))->stats; }static int lec_atm_send (struct atm_vcc *vcc,struct sk_buff *skb) {unsigned long flags;struct net_device *dev = (struct net_device *)vcc->proto_data; -struct lec_priv *priv = (struct lec_priv *)dev->priv; +struct lec_priv *priv =netdev_priv (dev);struct atmlec_msg *mesg;struct lec_arp_table *entry;int i;
@@ -596,7 +596,7 @@ static void lec_atm_close(struct atm_vcc *vcc) {struct sk_buff *skb;struct net_device *dev = (struct net_device *)vcc->proto_data; -struct lec_priv *priv = (struct lec_priv *)dev->priv; +struct lec_priv *priv =netdev_priv (dev); priv->lecd =NULL ;/* Do something needful? */
@@ -727,7 +727,7 @@ static void lec_push(struct atm_vcc *vcc, struct sk_buff *skb) {unsigned long flags;struct net_device *dev = (struct net_device *)vcc->proto_data; -struct lec_priv *priv = (struct lec_priv *)dev->priv; +struct lec_priv *priv =netdev_priv (dev);#if DUMP_PACKETS >0 int i =0 ;
@@ -874,7 +874,7 @@ static int lec_vcc_attach(struct atm_vcc *vcc, void __user *arg) vpriv->old_pop = vcc->pop; vcc->user_back = vpriv; vcc->pop = lec_pop; -lec_vcc_added (dev_lec[ioc_data.dev_num]->priv, +lec_vcc_added (netdev_priv (dev_lec[ioc_data.dev_num]), &ioc_data, vcc, vcc->push); vcc->proto_data = dev_lec[ioc_data.dev_num]; vcc->push = lec_push;
@@ -886,7 +886,8 @@ static int lec_mcast_attach(struct atm_vcc *vcc, int arg)if (arg <0 || arg >=MAX_LEC_ITF || !dev_lec[arg])return -EINVAL ; vcc->proto_data = dev_lec[arg]; -return (lec_mcast_make ((struct lec_priv *)dev_lec[arg]->priv, vcc)); +return lec_mcast_make ((struct lec_priv *)netdev_priv (dev_lec[arg]), + vcc); }/* Initialize device. */
@@ -928,11 +929,11 @@ static int lecd_attach(struct atm_vcc *vcc, int arg)return -EINVAL ; } - priv = dev_lec[i]->priv; + priv =netdev_priv (dev_lec[i]); priv->is_trdev = is_trdev;lec_init (dev_lec[i]); }else { - priv = dev_lec[i]->priv; + priv =netdev_priv (dev_lec[i]);if (priv->lecd)return -EADDRINUSE ; }
@@ -1093,7 +1094,8 @@ static void *lec_itf_walk(struct lec_state *state, loff_t *l)void *v; dev = state->dev ? state->dev : dev_lec[state->itf]; - v = (dev && dev->priv) ?lec_priv_walk (state, l, dev->priv) :NULL ; + v = (dev &&netdev_priv (dev)) ? +lec_priv_walk (state, l,netdev_priv (dev)) :NULL ;if (!v && dev) {dev_put (dev);/* Partial state reset for the next time we get called */
@@ -1255,7 +1257,7 @@ static void __exit lane_module_cleanup(void)for (i =0 ; i <MAX_LEC_ITF ; i++) {if (dev_lec[i] !=NULL ) { - priv = (struct lec_priv *)dev_lec[i]->priv; + priv =netdev_priv (dev_lec[i]);unregister_netdev (dev_lec[i]);free_netdev (dev_lec[i]); dev_lec[i] =NULL ;
@@ -1279,7 +1281,7 @@ static int lane2_resolve(struct net_device *dev, const u8 *dst_mac, int force, u8 **tlvs, u32 *sizeoftlvs) {unsigned long flags; -struct lec_priv *priv = (struct lec_priv *)dev->priv; +struct lec_priv *priv =netdev_priv (dev);struct lec_arp_table *table;struct sk_buff *skb;int retval;
@@ -1326,7 +1328,7 @@ static int lane2_associate_req(struct net_device *dev, const u8 *lan_dst, {int retval;struct sk_buff *skb; -struct lec_priv *priv = (struct lec_priv *)dev->priv; +struct lec_priv *priv =netdev_priv (dev);if (compare_ether_addr (lan_dst, dev->dev_addr))return (0 );/* not our mac address */
@@ -1363,7 +1365,7 @@ static void lane2_associate_ind(struct net_device *dev, const u8 *mac_addr,#if 0 int i =0 ;#endif -struct lec_priv *priv = (struct lec_priv *)dev->priv; +struct lec_priv *priv =netdev_priv (dev);#if 0 /* * Why have the TLVs in LE_ARP entries * since we do not use them? When you
net/atm/mpc.c +5 -5
@@ -785,7 +785,7 @@ static int atm_mpoa_mpoad_attach (struct atm_vcc *vcc, int arg) }if (mpc->dev) {/* check if the lec is LANE2 capable */ - priv = (struct lec_priv *)mpc->dev->priv; + priv =netdev_priv (mpc->dev);if (priv->lane_version <2 ) {dev_put (mpc->dev); mpc->dev =NULL ;
@@ -845,7 +845,7 @@ static void mpoad_close(struct atm_vcc *vcc) mpc->mpoad_vcc =NULL ;if (mpc->dev) { -struct lec_priv *priv = (struct lec_priv *)mpc->dev->priv; +struct lec_priv *priv =netdev_priv (mpc->dev); priv->lane2_ops->associate_indicator =NULL ;stop_mpc (mpc);dev_put (mpc->dev);
@@ -976,7 +976,7 @@ static int mpoa_event_listener(struct notifier_block *mpoa_notifier, unsigned loswitch (event) {case NETDEV_REGISTER :/* a new lec device was allocated */ - priv = (struct lec_priv *)dev->priv; + priv =netdev_priv (dev);if (priv->lane_version <2 )break ; priv->lane2_ops->associate_indicator = lane2_assoc_ind;
@@ -1322,7 +1322,7 @@ static void set_mpc_ctrl_addr_rcvd(struct k_message *mesg, struct mpoa_client *mdprintk ("\n" );if (mpc->dev) { - priv = (struct lec_priv *)mpc->dev->priv; + priv =netdev_priv (mpc->dev); retval = priv->lane2_ops->associate_req (mpc->dev, mpc->dev->dev_addr, tlv,sizeof (tlv));if (retval ==0 )printk ("mpoa: (%s) MPOA device type TLV association failed\n" , mpc->dev->name);
@@ -1472,7 +1472,7 @@ static void __exit atm_mpoa_cleanup(void) tmp = mpc->next;if (mpc->dev !=NULL ) {stop_mpc (mpc); - priv = (struct lec_priv *)mpc->dev->priv; + priv =netdev_priv (mpc->dev);if (priv->lane2_ops !=NULL ) priv->lane2_ops->associate_indicator =NULL ; }
net/bluetooth/bnep/core.c +1 -1
@@ -566,7 +566,7 @@ int bnep_add_connection(struct bnep_connadd_req *req, struct socket *sock) goto failed; } - s = dev->priv; + s =netdev_priv (dev);/* This is rx header therefore addresses are swapped. * ie eh.h_dest is our local address. */
net/bluetooth/bnep/netdev.c +3 -3
@@ -62,14 +62,14 @@ static int bnep_net_close(struct net_device *dev)static struct net_device_stats *bnep_net_get_stats (struct net_device *dev) { -struct bnep_session *s = dev->priv; +struct bnep_session *s =netdev_priv (dev);return &s->stats; }static void bnep_net_set_mc_list (struct net_device *dev) {#ifdef CONFIG_BT_BNEP_MC_FILTER -struct bnep_session *s = dev->priv; +struct bnep_session *s =netdev_priv (dev);struct sock *sk = s->sock->sk;struct bnep_set_filter_req *r;struct sk_buff *skb;
@@ -183,7 +183,7 @@ static inline int bnep_net_proto_filter(struct sk_buff *skb, struct bnep_sessionstatic int bnep_net_xmit (struct sk_buff *skb,struct net_device *dev) { -struct bnep_session *s = dev->priv; +struct bnep_session *s =netdev_priv (dev);struct sock *sk = s->sock->sk;BT_DBG ("skb %p, dev %p" , skb, dev);
net/bridge/br_if.c +1 -1
@@ -453,7 +453,7 @@ void __exit br_cleanup_bridges(void) restart:for_each_netdev (&init_net, dev) {if (dev->priv_flags &IFF_EBRIDGE ) { -del_br (dev->priv); +del_br (netdev_priv (dev)); goto restart; } }
net/bridge/br_sysfs_br.c +1 -1
@@ -22,7 +22,7 @@#include "br_private.h" #define to_dev (obj) container_of(obj, struct device, kobj) -#define to_bridge (cd) ((struct net_bridge *)(to_net_dev(cd)->priv)) +#define to_bridge (cd) ((struct net_bridge *)netdev_priv(to_net_dev(cd)))/* * Common code for storing bridge parameters.
net/irda/irlan/irlan_common.c +1 -1
@@ -207,7 +207,7 @@ static struct irlan_cb *irlan_open(__u32 saddr, __u32 daddr)if (!dev)return NULL ; - self = dev->priv; + self =netdev_priv (dev); self->dev = dev;/*
Signature · 1 line
1.5.3.4
PATCH 5/18 netdevice 82596: Convert directly reference of netdev->priv to netdev->ml_priv
In reply to Wang ChenWe have some reasons to kill netdev->priv:
1. netdev->priv is equal to netdev_priv().
2. netdev_priv() wraps the calculation of netdev->priv's offset, obviously netdev_priv() is more flexible than netdev->priv.
But we cann't kill netdev->priv, because so many drivers reference to it directly.
OK, becasue Dave S. Miller said, "every direct netdev->priv usage is a bug", and I want to kill netdev->priv later, I decided to convert all the direct reference of netdev->priv first.
Different to readonly reference of netdev->priv, in this driver, netdev->priv was changed. I use netdev->ml_priv to replace netdev->priv.
Signed-off-by Wang Chen <[email protected]>
--- drivers/net/82596.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-)
drivers/net/82596.c +14 -14
@@ -457,7 +457,7 @@ static inline int wait_cfg(struct net_device *dev, struct i596_cmd *cmd, int delstatic void i596_display_data (struct net_device *dev) { -struct i596_private *lp = dev->priv; +struct i596_private *lp = dev->ml_priv;struct i596_cmd *cmd;struct i596_rfd *rfd;struct i596_rbd *rbd;
@@ -527,7 +527,7 @@ static irqreturn_t i596_error(int irq, void *dev_id)static inline void init_rx_bufs (struct net_device *dev) { -struct i596_private *lp = dev->priv; +struct i596_private *lp = dev->ml_priv;int i;struct i596_rfd *rfd;struct i596_rbd *rbd;
@@ -578,7 +578,7 @@ static inline void init_rx_bufs(struct net_device *dev)static inline void remove_rx_bufs (struct net_device *dev) { -struct i596_private *lp = dev->priv; +struct i596_private *lp = dev->ml_priv;struct i596_rbd *rbd;int i;
@@ -592,7 +592,7 @@ static inline void remove_rx_bufs(struct net_device *dev)static void rebuild_rx_bufs (struct net_device *dev) { -struct i596_private *lp = dev->priv; +struct i596_private *lp = dev->ml_priv;int i;/* Ensure rx frame/buffer descriptors are tidy */
@@ -611,7 +611,7 @@ static void rebuild_rx_bufs(struct net_device *dev)static int init_i596_mem (struct net_device *dev) { -struct i596_private *lp = dev->priv; +struct i596_private *lp = dev->ml_priv;#if !defined(ENABLE_MVME16x_NET) && !defined(ENABLE_BVME6000_NET ) || defined(ENABLE_APRICOT )short ioaddr = dev->base_addr;#endif
@@ -764,7 +764,7 @@ failed:static inline int i596_rx (struct net_device *dev) { -struct i596_private *lp = dev->priv; +struct i596_private *lp = dev->ml_priv;struct i596_rfd *rfd;struct i596_rbd *rbd;int frames =0 ;
@@ -959,7 +959,7 @@ static void i596_reset(struct net_device *dev, struct i596_private *lp,static void i596_add_cmd (struct net_device *dev,struct i596_cmd *cmd) { -struct i596_private *lp = dev->priv; +struct i596_private *lp = dev->ml_priv;int ioaddr = dev->base_addr;unsigned long flags;
@@ -1029,7 +1029,7 @@ static int i596_open(struct net_device *dev)static void i596_tx_timeout (struct net_device *dev) { -struct i596_private *lp = dev->priv; +struct i596_private *lp = dev->ml_priv;int ioaddr = dev->base_addr;/* Transmitter timeout, serious problems. */
@@ -1058,7 +1058,7 @@ static void i596_tx_timeout (struct net_device *dev)static int i596_start_xmit (struct sk_buff *skb,struct net_device *dev) { -struct i596_private *lp = dev->priv; +struct i596_private *lp = dev->ml_priv;struct tx_cmd *tx_cmd;struct i596_tbd *tbd;short length = skb->len;
@@ -1244,9 +1244,9 @@ found: dev->tx_timeout = i596_tx_timeout; dev->watchdog_timeo =TX_TIMEOUT ; - dev->priv = (void *)(dev->mem_start); + dev->ml_priv = (void *)(dev->mem_start); - lp = dev->priv; + lp = dev->ml_priv; DEB(DEB_INIT,printk(KERN_DEBUG "%s: lp at 0x%08lx (%zd bytes), " "lp->scb at 0x%08lx\n", dev->name, (unsigned long)lp,
@@ -1307,7 +1307,7 @@ static irqreturn_t i596_interrupt(int irq, void *dev_id) } ioaddr = dev->base_addr; - lp = dev->priv; + lp = dev->ml_priv;spin_lock (&lp->lock);
@@ -1450,7 +1450,7 @@ static irqreturn_t i596_interrupt(int irq, void *dev_id)static int i596_close (struct net_device *dev) { -struct i596_private *lp = dev->priv; +struct i596_private *lp = dev->ml_priv;unsigned long flags;netif_stop_queue (dev);
@@ -1500,7 +1500,7 @@ static int i596_close(struct net_device *dev)static void set_multicast_list (struct net_device *dev) { -struct i596_private *lp = dev->priv; +struct i596_private *lp = dev->ml_priv;int config =0 , cnt; DEB(DEB_MULTI,printk(KERN_DEBUG "%s: set multicast list, %d entries, promisc %s, allmulti %s\n",
Signature · 1 line
1.5.3.4
PATCH 6/18 netdevice chelsio: Convert directly reference of netdev->priv to netdev->ml_priv
In reply to Wang ChenWe have some reasons to kill netdev->priv:
1. netdev->priv is equal to netdev_priv().
2. netdev_priv() wraps the calculation of netdev->priv's offset, obviously netdev_priv() is more flexible than netdev->priv.
But we cann't kill netdev->priv, because so many drivers reference to it directly.
OK, becasue Dave S. Miller said, "every direct netdev->priv usage is a bug", and I want to kill netdev->priv later, I decided to convert all the direct reference of netdev->priv first.
Different to readonly reference of netdev->priv, in this driver, netdev->priv was changed. I use netdev->ml_priv to replace netdev->priv.
Signed-off-by Wang Chen <[email protected]>
--- drivers/net/chelsio/cxgb2.c | 60 +++++++++++++++++++++--------------------- drivers/net/chelsio/sge.c | 2 +- 2 files changed, 31 insertions(+), 31 deletions(-)
drivers/net/chelsio/cxgb2.c +30 -30
@@ -120,7 +120,7 @@ static const char pci_speed[][4] = {*/ static void t1_set_rxmode (struct net_device *dev) { -struct adapter *adapter = dev->priv; +struct adapter *adapter = dev->ml_priv;struct cmac *mac = adapter->port[dev->if_port].mac;struct t1_rx_mode rm;
@@ -252,7 +252,7 @@ static void cxgb_down(struct adapter *adapter)static int cxgb_open (struct net_device *dev) {int err; -struct adapter *adapter = dev->priv; +struct adapter *adapter = dev->ml_priv;int other_ports = adapter->open_device_map &PORT_MASK ;napi_enable (&adapter->napi);
@@ -272,7 +272,7 @@ static int cxgb_open(struct net_device *dev)static int cxgb_close (struct net_device *dev) { -struct adapter *adapter = dev->priv; +struct adapter *adapter = dev->ml_priv;struct port_info *p = &adapter->port[dev->if_port];struct cmac *mac = p->mac;
@@ -298,7 +298,7 @@ static int cxgb_close(struct net_device *dev)static struct net_device_stats *t1_get_stats (struct net_device *dev) { -struct adapter *adapter = dev->priv; +struct adapter *adapter = dev->ml_priv;struct port_info *p = &adapter->port[dev->if_port];struct net_device_stats *ns = &p->netstats;const struct cmac_statistics *pstats;
@@ -346,14 +346,14 @@ static struct net_device_stats *t1_get_stats(struct net_device *dev)static u32 get_msglevel (struct net_device *dev) { -struct adapter *adapter = dev->priv; +struct adapter *adapter = dev->ml_priv;return adapter->msg_enable; }static void set_msglevel (struct net_device *dev,u32 val) { -struct adapter *adapter = dev->priv; +struct adapter *adapter = dev->ml_priv; adapter->msg_enable = val; }
@@ -434,7 +434,7 @@ static int get_regs_len(struct net_device *dev)static void get_drvinfo (struct net_device *dev,struct ethtool_drvinfo *info) { -struct adapter *adapter = dev->priv; +struct adapter *adapter = dev->ml_priv;strcpy (info->driver,DRV_NAME );strcpy (info->version,DRV_VERSION );
@@ -461,7 +461,7 @@ static void get_strings(struct net_device *dev, u32 stringset, u8 *data)static void get_stats (struct net_device *dev,struct ethtool_stats *stats,u64 *data) { -struct adapter *adapter = dev->priv; +struct adapter *adapter = dev->ml_priv;struct cmac *mac = adapter->port[dev->if_port].mac;const struct cmac_statistics *s;const struct sge_intr_counts *t;
@@ -552,7 +552,7 @@ static inline void reg_block_dump(struct adapter *ap, void *buf,static void get_regs (struct net_device *dev,struct ethtool_regs *regs,void *buf) { -struct adapter *ap = dev->priv; +struct adapter *ap = dev->ml_priv;/* * Version scheme: bits 0..9: chip version, bits 10..15: chip revision
@@ -574,7 +574,7 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,static int get_settings (struct net_device *dev,struct ethtool_cmd *cmd) { -struct adapter *adapter = dev->priv; +struct adapter *adapter = dev->ml_priv;struct port_info *p = &adapter->port[dev->if_port]; cmd->supported = p->link_config.supported;
@@ -634,7 +634,7 @@ static int speed_duplex_to_caps(int speed, int duplex)static int set_settings (struct net_device *dev,struct ethtool_cmd *cmd) { -struct adapter *adapter = dev->priv; +struct adapter *adapter = dev->ml_priv;struct port_info *p = &adapter->port[dev->if_port];struct link_config *lc = &p->link_config;
@@ -669,7 +669,7 @@ static int set_settings(struct net_device *dev, struct ethtool_cmd *cmd)static void get_pauseparam (struct net_device *dev,struct ethtool_pauseparam *epause) { -struct adapter *adapter = dev->priv; +struct adapter *adapter = dev->ml_priv;struct port_info *p = &adapter->port[dev->if_port]; epause->autoneg = (p->link_config.requested_fc &PAUSE_AUTONEG ) !=0 ;
@@ -680,7 +680,7 @@ static void get_pauseparam(struct net_device *dev,static int set_pauseparam (struct net_device *dev,struct ethtool_pauseparam *epause) { -struct adapter *adapter = dev->priv; +struct adapter *adapter = dev->ml_priv;struct port_info *p = &adapter->port[dev->if_port];struct link_config *lc = &p->link_config;
@@ -709,14 +709,14 @@ static int set_pauseparam(struct net_device *dev,static u32 get_rx_csum (struct net_device *dev) { -struct adapter *adapter = dev->priv; +struct adapter *adapter = dev->ml_priv;return (adapter->flags &RX_CSUM_ENABLED ) !=0 ; }static int set_rx_csum (struct net_device *dev,u32 data) { -struct adapter *adapter = dev->priv; +struct adapter *adapter = dev->ml_priv;if (data) adapter->flags |=RX_CSUM_ENABLED ;
@@ -727,7 +727,7 @@ static int set_rx_csum(struct net_device *dev, u32 data)static int set_tso (struct net_device *dev,u32 value) { -struct adapter *adapter = dev->priv; +struct adapter *adapter = dev->ml_priv;if (!(adapter->flags &TSO_CAPABLE ))return value ? -EOPNOTSUPP :0 ;
@@ -736,7 +736,7 @@ static int set_tso(struct net_device *dev, u32 value)static void get_sge_param (struct net_device *dev,struct ethtool_ringparam *e) { -struct adapter *adapter = dev->priv; +struct adapter *adapter = dev->ml_priv;int jumbo_fl =t1_is_T1B (adapter) ?1 :0 ; e->rx_max_pending =MAX_RX_BUFFERS ;
@@ -752,7 +752,7 @@ static void get_sge_param(struct net_device *dev, struct ethtool_ringparam *e)static int set_sge_param (struct net_device *dev,struct ethtool_ringparam *e) { -struct adapter *adapter = dev->priv; +struct adapter *adapter = dev->ml_priv;int jumbo_fl =t1_is_T1B (adapter) ?1 :0 ; if (e->rx_pending > MAX_RX_BUFFERS || e->rx_mini_pending ||
@@ -776,7 +776,7 @@ static int set_sge_param(struct net_device *dev, struct ethtool_ringparam *e)static int set_coalesce (struct net_device *dev,struct ethtool_coalesce *c) { -struct adapter *adapter = dev->priv; +struct adapter *adapter = dev->ml_priv; adapter->params.sge.rx_coalesce_usecs = c->rx_coalesce_usecs; adapter->params.sge.coalesce_enable = c->use_adaptive_rx_coalesce;
@@ -787,7 +787,7 @@ static int set_coalesce(struct net_device *dev, struct ethtool_coalesce *c)static int get_coalesce (struct net_device *dev,struct ethtool_coalesce *c) { -struct adapter *adapter = dev->priv; +struct adapter *adapter = dev->ml_priv; c->rx_coalesce_usecs = adapter->params.sge.rx_coalesce_usecs; c->rate_sample_interval = adapter->params.sge.sample_interval_usecs;
@@ -797,7 +797,7 @@ static int get_coalesce(struct net_device *dev, struct ethtool_coalesce *c)static int get_eeprom_len (struct net_device *dev) { -struct adapter *adapter = dev->priv; +struct adapter *adapter = dev->ml_priv;return t1_is_asic (adapter) ?EEPROM_SIZE :0 ; }
@@ -810,7 +810,7 @@ static int get_eeprom(struct net_device *dev, struct ethtool_eeprom *e, {int i; u8 buf[EEPROM_SIZE] __attribute__((aligned(4))); -struct adapter *adapter = dev->priv; +struct adapter *adapter = dev->ml_priv; e->magic =EEPROM_MAGIC (adapter);for (i = e->offset & ~3 ; i < e->offset + e->len; i +=sizeof (u32))
@@ -848,7 +848,7 @@ static const struct ethtool_ops t1_ethtool_ops = {static int t1_ioctl (struct net_device *dev,struct ifreq *req,int cmd) { -struct adapter *adapter = dev->priv; +struct adapter *adapter = dev->ml_priv;struct mii_ioctl_data *data =if_mii (req);switch (cmd) {
@@ -887,7 +887,7 @@ static int t1_ioctl(struct net_device *dev, struct ifreq *req, int cmd)static int t1_change_mtu (struct net_device *dev,int new_mtu) {int ret; -struct adapter *adapter = dev->priv; +struct adapter *adapter = dev->ml_priv;struct cmac *mac = adapter->port[dev->if_port].mac;if (!mac->ops->set_mtu)
@@ -902,7 +902,7 @@ static int t1_change_mtu(struct net_device *dev, int new_mtu)static int t1_set_mac_addr (struct net_device *dev,void *p) { -struct adapter *adapter = dev->priv; +struct adapter *adapter = dev->ml_priv;struct cmac *mac = adapter->port[dev->if_port].mac;struct sockaddr *addr = p;
@@ -918,7 +918,7 @@ static int t1_set_mac_addr(struct net_device *dev, void *p)static void vlan_rx_register (struct net_device *dev,struct vlan_group *grp) { -struct adapter *adapter = dev->priv; +struct adapter *adapter = dev->ml_priv;spin_lock_irq (&adapter->async_lock); adapter->vlan_grp = grp;
@@ -931,7 +931,7 @@ static void vlan_rx_register(struct net_device *dev,static void t1_netpoll (struct net_device *dev) {unsigned long flags; -struct adapter *adapter = dev->priv; +struct adapter *adapter = dev->ml_priv;local_irq_save (flags);t1_interrupt (adapter->pdev->irq, adapter);
@@ -1077,7 +1077,7 @@ static int __devinit init_one(struct pci_dev *pdev,SET_NETDEV_DEV (netdev, &pdev->dev);if (!adapter) { - adapter = netdev->priv; + adapter =netdev_priv (netdev); adapter->pdev = pdev; adapter->port[0 ].dev = netdev;/* so we don't leak it */
@@ -1118,7 +1118,7 @@ static int __devinit init_one(struct pci_dev *pdev, netdev->if_port = i; netdev->mem_start = mmio_start; netdev->mem_end = mmio_start + mmio_len -1 ; - netdev->priv = adapter; + netdev->ml_priv = adapter; netdev->features |=NETIF_F_SG |NETIF_F_IP_CSUM ; netdev->features |=NETIF_F_LLTX ;
@@ -1382,7 +1382,7 @@ static inline void t1_sw_reset(struct pci_dev *pdev) static void __devexit remove_one(struct pci_dev *pdev) {struct net_device *dev =pci_get_drvdata (pdev); -struct adapter *adapter = dev->priv; +struct adapter *adapter = dev->ml_priv;int i;for_each_port (adapter, i) {
drivers/net/chelsio/sge.c +1 -1
@@ -1786,7 +1786,7 @@ static inline int eth_hdr_len(const void *data)*/ int t1_start_xmit (struct sk_buff *skb,struct net_device *dev) { -struct adapter *adapter = dev->priv; +struct adapter *adapter = dev->ml_priv;struct sge *sge = adapter->sge;struct sge_port_stats *st =per_cpu_ptr (sge->port_stats[dev->if_port],smp_processor_id ());
Signature · 1 line
1.5.3.4
PATCH 7/18 netdevice hamradio: Convert directly reference of netdev->priv to netdev->ml_priv
In reply to Wang ChenWe have some reasons to kill netdev->priv:
1. netdev->priv is equal to netdev_priv().
2. netdev_priv() wraps the calculation of netdev->priv's offset, obviously netdev_priv() is more flexible than netdev->priv.
But we cann't kill netdev->priv, because so many drivers reference to it directly.
OK, becasue Dave S. Miller said, "every direct netdev->priv usage is a bug", and I want to kill netdev->priv later, I decided to convert all the direct reference of netdev->priv first.
Different to readonly reference of netdev->priv, in this driver, netdev->priv was changed. I use netdev->ml_priv to replace netdev->priv.
Signed-off-by Wang Chen <[email protected]>
--- drivers/net/hamradio/dmascc.c | 12 ++++++------ drivers/net/hamradio/scc.c | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-)
drivers/net/hamradio/dmascc.c +6 -6
@@ -572,7 +572,7 @@ static int __init setup_adapter(int card_base, int type, int n) priv->param.persist =256 ; priv->param.dma =-1 ;INIT_WORK (&priv->rx_work, rx_bh); - dev->priv = priv; + dev->ml_priv = priv;sprintf (dev->name,"dmascc%i" ,2 * n + i); dev->base_addr = card_base; dev->irq = irq;
@@ -720,7 +720,7 @@ static int read_scc_data(struct scc_priv *priv)static int scc_open (struct net_device *dev) { -struct scc_priv *priv = dev->priv; +struct scc_priv *priv = dev->ml_priv;struct scc_info *info = priv->info;int card_base = priv->card_base;
@@ -862,7 +862,7 @@ static int scc_open(struct net_device *dev)static int scc_close (struct net_device *dev) { -struct scc_priv *priv = dev->priv; +struct scc_priv *priv = dev->ml_priv;struct scc_info *info = priv->info;int card_base = priv->card_base;
@@ -891,7 +891,7 @@ static int scc_close(struct net_device *dev)static int scc_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) { -struct scc_priv *priv = dev->priv; +struct scc_priv *priv = dev->ml_priv;switch (cmd) {case SIOCGSCCPARAM :
@@ -918,7 +918,7 @@ static int scc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)static int scc_send_packet (struct sk_buff *skb,struct net_device *dev) { -struct scc_priv *priv = dev->priv; +struct scc_priv *priv = dev->ml_priv;unsigned long flags;int i;
@@ -963,7 +963,7 @@ static int scc_send_packet(struct sk_buff *skb, struct net_device *dev)static struct net_device_stats *scc_get_stats (struct net_device *dev) { -struct scc_priv *priv = dev->priv; +struct scc_priv *priv = dev->ml_priv;return &priv->stats; }
drivers/net/hamradio/scc.c +6 -6
@@ -1518,7 +1518,7 @@ static int scc_net_alloc(const char *name, struct scc_channel *scc)if (!dev)return -ENOMEM ; - dev->priv = scc; + dev->ml_priv = scc; scc->dev = dev;spin_lock_init (&scc->lock);init_timer (&scc->tx_t);
@@ -1575,7 +1575,7 @@ static void scc_net_setup(struct net_device *dev)static int scc_net_open (struct net_device *dev) { -struct scc_channel *scc = (struct scc_channel *) dev->priv; +struct scc_channel *scc = (struct scc_channel *) dev->ml_priv;if (!scc->init)return -EINVAL ;
@@ -1593,7 +1593,7 @@ static int scc_net_open(struct net_device *dev)static int scc_net_close (struct net_device *dev) { -struct scc_channel *scc = (struct scc_channel *) dev->priv; +struct scc_channel *scc = (struct scc_channel *) dev->ml_priv;unsigned long flags;netif_stop_queue (dev);
@@ -1635,7 +1635,7 @@ static void scc_net_rx(struct scc_channel *scc, struct sk_buff *skb)static int scc_net_tx (struct sk_buff *skb,struct net_device *dev) { -struct scc_channel *scc = (struct scc_channel *) dev->priv; +struct scc_channel *scc = (struct scc_channel *) dev->ml_priv;unsigned long flags;char kisscmd;
@@ -1705,7 +1705,7 @@ static int scc_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)struct scc_mem_config memcfg;struct scc_hw_config hwcfg;struct scc_calibrate cal; -struct scc_channel *scc = (struct scc_channel *) dev->priv; +struct scc_channel *scc = (struct scc_channel *) dev->ml_priv;int chan;unsigned char device_name[IFNAMSIZ ];void __user *arg = ifr->ifr_data;
@@ -1952,7 +1952,7 @@ static int scc_net_set_mac_address(struct net_device *dev, void *addr)static struct net_device_stats *scc_net_get_stats (struct net_device *dev) { -struct scc_channel *scc = (struct scc_channel *) dev->priv; +struct scc_channel *scc = (struct scc_channel *) dev->ml_priv; scc->dev_stat.rx_errors = scc->stat.rxerrs + scc->stat.rx_over; scc->dev_stat.tx_errors = scc->stat.txerrs + scc->stat.tx_under;
Signature · 1 line
1.5.3.4
PATCH 8/18 netdevice lance: Convert directly reference of netdev->priv to netdev->ml_priv
In reply to Wang ChenWe have some reasons to kill netdev->priv:
1. netdev->priv is equal to netdev_priv().
2. netdev_priv() wraps the calculation of netdev->priv's offset, obviously netdev_priv() is more flexible than netdev->priv.
But we cann't kill netdev->priv, because so many drivers reference to it directly.
OK, becasue Dave S. Miller said, "every direct netdev->priv usage is a bug", and I want to kill netdev->priv later, I decided to convert all the direct reference of netdev->priv first.
Different to readonly reference of netdev->priv, in this driver, netdev->priv was changed. I use netdev->ml_priv to replace netdev->priv.
Signed-off-by Wang Chen <[email protected]>
--- drivers/net/lance.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-)
drivers/net/lance.c +13 -13
@@ -359,7 +359,7 @@ int __init init_module(void)static void cleanup_card (struct net_device *dev) { -struct lance_private *lp = dev->priv; +struct lance_private *lp = dev->ml_priv;if (dev->dma !=4 )free_dma (dev->dma);release_region (dev->base_addr,LANCE_TOTAL_SIZE );
@@ -418,7 +418,7 @@ static int __init do_lance_probe(struct net_device *dev)if (card <NUM_CARDS ) {/*Signature OK*/ result =lance_probe1 (dev, ioaddr,0 ,0 );if (!result) { -struct lance_private *lp = dev->priv; +struct lance_private *lp = dev->ml_priv;int ver = lp->chip_version; r->name = chip_table[ver].name;
@@ -538,7 +538,7 @@ static int __init lance_probe1(struct net_device *dev, int ioaddr, int irq, intif (lp==NULL )return -ENODEV ;if (lance_debug >6 )printk (" (#0x%05lx)" , (unsigned long )lp); - dev->priv = lp; + dev->ml_priv = lp; lp->name = chipname; lp->rx_buffs = (unsigned long )kmalloc (PKT_BUF_SZ *RX_RING_SIZE ,GFP_DMA |GFP_KERNEL );
@@ -742,7 +742,7 @@ out_lp:static int lance_open (struct net_device *dev) { -struct lance_private *lp = dev->priv; +struct lance_private *lp = dev->ml_priv;int ioaddr = dev->base_addr;int i;
@@ -830,7 +830,7 @@ lance_open(struct net_device *dev)static void lance_purge_ring (struct net_device *dev) { -struct lance_private *lp = dev->priv; +struct lance_private *lp = dev->ml_priv;int i;/* Free all the skbuffs in the Rx and Tx queues. */
@@ -854,7 +854,7 @@ lance_purge_ring(struct net_device *dev)static void lance_init_ring (struct net_device *dev,gfp_t gfp) { -struct lance_private *lp = dev->priv; +struct lance_private *lp = dev->ml_priv;int i; lp->cur_rx = lp->cur_tx =0 ;
@@ -896,7 +896,7 @@ lance_init_ring(struct net_device *dev, gfp_t gfp)static void lance_restart (struct net_device *dev,unsigned int csr0_bits,int must_reinit) { -struct lance_private *lp = dev->priv; +struct lance_private *lp = dev->ml_priv;if (must_reinit || (chip_table[lp->chip_version].flags &LANCE_MUST_REINIT_RING )) {
@@ -910,7 +910,7 @@ lance_restart(struct net_device *dev, unsigned int csr0_bits, int must_reinit)static void lance_tx_timeout (struct net_device *dev) { -struct lance_private *lp = (struct lance_private *) dev->priv; +struct lance_private *lp = (struct lance_private *) dev->ml_priv;int ioaddr = dev->base_addr;outw (0 , ioaddr +LANCE_ADDR );
@@ -944,7 +944,7 @@ static void lance_tx_timeout (struct net_device *dev)static int lance_start_xmit (struct sk_buff *skb,struct net_device *dev) { -struct lance_private *lp = dev->priv; +struct lance_private *lp = dev->ml_priv;int ioaddr = dev->base_addr;int entry;unsigned long flags;
@@ -1021,7 +1021,7 @@ static irqreturn_t lance_interrupt(int irq, void *dev_id)int must_restart; ioaddr = dev->base_addr; - lp = dev->priv; + lp = dev->ml_priv;spin_lock (&lp->devlock);
@@ -1134,7 +1134,7 @@ static irqreturn_t lance_interrupt(int irq, void *dev_id)static int lance_rx (struct net_device *dev) { -struct lance_private *lp = dev->priv; +struct lance_private *lp = dev->ml_priv;int entry = lp->cur_rx &RX_RING_MOD_MASK ;int i;
@@ -1213,7 +1213,7 @@ static int lance_close(struct net_device *dev) {int ioaddr = dev->base_addr; -struct lance_private *lp = dev->priv; +struct lance_private *lp = dev->ml_priv;netif_stop_queue (dev);
@@ -1246,7 +1246,7 @@ lance_close(struct net_device *dev)static struct net_device_stats *lance_get_stats (struct net_device *dev) { -struct lance_private *lp = dev->priv; +struct lance_private *lp = dev->ml_priv;if (chip_table[lp->chip_version].flags &LANCE_HAS_MISSED_FRAME ) {short ioaddr = dev->base_addr;
Signature · 1 line
1.5.3.4
PATCH 9/18 netdevice ni65: Convert directly reference of netdev->priv to netdev->ml_priv
In reply to Wang ChenWe have some reasons to kill netdev->priv:
1. netdev->priv is equal to netdev_priv().
2. netdev_priv() wraps the calculation of netdev->priv's offset, obviously netdev_priv() is more flexible than netdev->priv.
But we cann't kill netdev->priv, because so many drivers reference to it directly.
OK, becasue Dave S. Miller said, "every direct netdev->priv usage is a bug", and I want to kill netdev->priv later, I decided to convert all the direct reference of netdev->priv first.
Different to readonly reference of netdev->priv, in this driver, netdev->priv was changed. I use netdev->ml_priv to replace netdev->priv.
Signed-off-by Wang Chen <[email protected]>
--- drivers/net/ni65.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-)
drivers/net/ni65.c +16 -16
@@ -295,7 +295,7 @@ static void ni65_set_performance(struct priv *p)*/ static int ni65_open (struct net_device *dev) { -struct priv *p = (struct priv *) dev->priv; +struct priv *p = dev->ml_priv;int irqval =request_irq (dev->irq, &ni65_interrupt,0 , cards[p->cardno].cardname,dev);if (irqval) {
@@ -321,7 +321,7 @@ static int ni65_open(struct net_device *dev)*/ static int ni65_close (struct net_device *dev) { -struct priv *p = (struct priv *) dev->priv; +struct priv *p = dev->ml_priv;netif_stop_queue (dev);
@@ -345,7 +345,7 @@ static int ni65_close(struct net_device *dev)static void cleanup_card (struct net_device *dev) { -struct priv *p = (struct priv *) dev->priv; +struct priv *p = dev->ml_priv;disable_dma (dev->dma);free_dma (dev->dma);release_region (dev->base_addr, cards[p->cardno].total_size);
@@ -444,7 +444,7 @@ static int __init ni65_probe1(struct net_device *dev,int ioaddr)release_region (ioaddr, cards[i].total_size);return j; } - p = (struct priv *) dev->priv; + p = dev->ml_priv; p->cmdr_addr = ioaddr + cards[i].cmd_offset; p->cardno = i;spin_lock_init (&p->ring_lock);
@@ -647,8 +647,8 @@ static int ni65_alloc_buffer(struct net_device *dev)if (!ptr)return -ENOMEM ; - p = dev->priv = (struct priv *) (((unsigned long ) ptr +7 ) & ~0x7 ); -memset ((char *) dev->priv,0 ,sizeof (struct priv )); + p = dev->ml_priv = (struct priv *) (((unsigned long ) ptr +7 ) & ~0x7 ); +memset ((char *)p,0 ,sizeof (struct priv )); p->self = ptr;for (i=0 ;i<TMDNUM ;i++)
@@ -790,7 +790,7 @@ static void ni65_stop_start(struct net_device *dev,struct priv *p)static int ni65_lance_reinit (struct net_device *dev) {int i; -struct priv *p = (struct priv *) dev->priv; +struct priv *p = dev->ml_priv;unsigned long flags; p->lock =0 ;
@@ -876,7 +876,7 @@ static irqreturn_t ni65_interrupt(int irq, void * dev_id)struct priv *p;int bcnt =32 ; - p = (struct priv *) dev->priv; + p = dev->ml_priv;spin_lock (&p->ring_lock);
@@ -899,7 +899,7 @@ static irqreturn_t ni65_interrupt(int irq, void * dev_id)if (csr0 &CSR0_ERR ) { -struct priv *p = (struct priv *) dev->priv; +struct priv *p = dev->ml_priv;if (debuglevel >1 )printk (KERN_ERR "%s: general error: %04x.\n" ,dev->name,csr0);if (csr0 &CSR0_BABL )
@@ -924,7 +924,7 @@ static irqreturn_t ni65_interrupt(int irq, void * dev_id)int j;for (j=0 ;j<RMDNUM ;j++) { -struct priv *p = (struct priv *) dev->priv; +struct priv *p = dev->ml_priv;int i,k,num1,num2;for (i=RMDNUM -1 ;i>0 ;i--) { num2 = (p->rmdnum + i) & (RMDNUM -1 );
@@ -982,7 +982,7 @@ static irqreturn_t ni65_interrupt(int irq, void * dev_id)*/ static void ni65_xmit_intr (struct net_device *dev,int csr0) { -struct priv *p = (struct priv *) dev->priv; +struct priv *p = dev->ml_priv;while (p->xmit_queued) {
@@ -1049,7 +1049,7 @@ static void ni65_recv_intr(struct net_device *dev,int csr0)struct rmd *rmdp;int rmdstat,len;int cnt=0 ; -struct priv *p = (struct priv *) dev->priv; +struct priv *p = dev->ml_priv; rmdp = p->rmdhead + p->rmdnum;while (!( (rmdstat = rmdp->u.s.status) &RCV_OWN ))
@@ -1140,7 +1140,7 @@ static void ni65_recv_intr(struct net_device *dev,int csr0)static void ni65_timeout (struct net_device *dev) {int i; -struct priv *p = (struct priv *) dev->priv; +struct priv *p = dev->ml_priv;printk (KERN_ERR "%s: xmitter timed out, try to restart!\n" ,dev->name);for (i=0 ;i<TMDNUM ;i++)
@@ -1157,7 +1157,7 @@ static void ni65_timeout(struct net_device *dev)static int ni65_send_packet (struct sk_buff *skb,struct net_device *dev) { -struct priv *p = (struct priv *) dev->priv; +struct priv *p = dev->ml_priv;netif_stop_queue (dev);
@@ -1222,7 +1222,7 @@ static struct net_device_stats *ni65_get_stats(struct net_device *dev)#if 0 int i; -struct priv *p = (struct priv *) dev->priv; +struct priv *p = dev->ml_priv;for (i=0 ;i<RMDNUM ;i++) {struct rmd *rmdp = p->rmdhead + ((p->rmdnum + i) & (RMDNUM -1 ));
@@ -1231,7 +1231,7 @@ static struct net_device_stats *ni65_get_stats(struct net_device *dev)printk ("\n" );#endif -return &((struct priv *) dev->priv)->stats; +return &((struct priv *)dev->ml_priv)->stats; }static void set_multicast_list (struct net_device *dev)
Signature · 1 line
1.5.3.4
PATCH 10/18 netdevice ppp: Convert directly reference of netdev->priv to netdev->ml_priv
In reply to Wang ChenWe have some reasons to kill netdev->priv:
1. netdev->priv is equal to netdev_priv().
2. netdev_priv() wraps the calculation of netdev->priv's offset, obviously netdev_priv() is more flexible than netdev->priv.
But we cann't kill netdev->priv, because so many drivers reference to it directly.
OK, becasue Dave S. Miller said, "every direct netdev->priv usage is a bug", and I want to kill netdev->priv later, I decided to convert all the direct reference of netdev->priv first.
Different to readonly reference of netdev->priv, in this driver, netdev->priv was changed. I use netdev->ml_priv to replace netdev->priv.
Signed-off-by Wang Chen <[email protected]>
--- drivers/net/ppp_generic.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/ppp_generic.c +3 -3
@@ -886,7 +886,7 @@ out_chrdev:static int ppp_start_xmit (struct sk_buff *skb,struct net_device *dev) { -struct ppp *ppp = (struct ppp *) dev->priv; +struct ppp *ppp = dev->ml_priv;int npi, proto;unsigned char *pp;
@@ -931,7 +931,7 @@ ppp_start_xmit(struct sk_buff *skb, struct net_device *dev)static int ppp_net_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) { -struct ppp *ppp = dev->priv; +struct ppp *ppp = dev->ml_priv;int err = -EFAULT ;void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;struct ppp_stats stats;
@@ -2435,7 +2435,7 @@ ppp_create_interface(int unit, int *retp)skb_queue_head_init (&ppp->mrq);#endif /* CONFIG_PPP_MULTILINK */ ppp->dev = dev; - dev->priv = ppp; + dev->ml_priv = ppp; dev->hard_start_xmit = ppp_start_xmit; dev->do_ioctl = ppp_net_ioctl;
Signature · 1 line
1.5.3.4
PATCH 11/18 netdevice cycx_x25: Convert directly reference of netdev->priv to netdev->ml_priv
In reply to Wang ChenWe have some reasons to kill netdev->priv:
1. netdev->priv is equal to netdev_priv().
2. netdev_priv() wraps the calculation of netdev->priv's offset, obviously netdev_priv() is more flexible than netdev->priv.
But we cann't kill netdev->priv, because so many drivers reference to it directly.
OK, becasue Dave S. Miller said, "every direct netdev->priv usage is a bug", and I want to kill netdev->priv later, I decided to convert all the direct reference of netdev->priv first.
Different to readonly reference of netdev->priv, in this driver, netdev->priv was changed. I use netdev->ml_priv to replace netdev->priv.
Signed-off-by Wang Chen <[email protected]>
--- drivers/net/wan/cycx_x25.c | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-)
drivers/net/wan/cycx_x25.c +21 -21
@@ -445,7 +445,7 @@ static int cycx_wan_new_if(struct wan_device *wandev, struct net_device *dev,/* prepare network device data space for registration */ strcpy (dev->name, chan->name); dev->init = cycx_netdevice_init; - dev->priv = chan; + dev->ml_priv = chan;return 0 ; }
@@ -453,8 +453,8 @@ static int cycx_wan_new_if(struct wan_device *wandev, struct net_device *dev,/* Delete logical channel. */ static int cycx_wan_del_if (struct wan_device *wandev,struct net_device *dev) { -if (dev->priv) { -struct cycx_x25_channel *chan = dev->priv; +if (dev->ml_priv) { +struct cycx_x25_channel *chan = dev->ml_priv;if (chan->svc) {kfree (chan->local_addr);
@@ -463,7 +463,7 @@ static int cycx_wan_del_if(struct wan_device *wandev, struct net_device *dev) }kfree (chan); - dev->priv =NULL ; + dev->ml_priv =NULL ; }return 0 ;
@@ -484,7 +484,7 @@ static const struct header_ops cycx_header_ops = {* registration. */ static int cycx_netdevice_init (struct net_device *dev) { -struct cycx_x25_channel *chan = dev->priv; +struct cycx_x25_channel *chan = dev->ml_priv;struct cycx_device *card = chan->card;struct wan_device *wandev = &card->wandev;
@@ -542,7 +542,7 @@ static int cycx_netdevice_open(struct net_device *dev)* o if there's no more open channels then disconnect physical link. */ static int cycx_netdevice_stop (struct net_device *dev) { -struct cycx_x25_channel *chan = dev->priv; +struct cycx_x25_channel *chan = dev->ml_priv;netif_stop_queue (dev);
@@ -596,7 +596,7 @@ static int cycx_netdevice_rebuild_header(struct sk_buff *skb)static int cycx_netdevice_hard_start_xmit (struct sk_buff *skb,struct net_device *dev) { -struct cycx_x25_channel *chan = dev->priv; +struct cycx_x25_channel *chan = dev->ml_priv;struct cycx_device *card = chan->card;if (!chan->svc)
@@ -670,7 +670,7 @@ free_packet:* Return a pointer to struct net_device_stats */ static struct net_device_stats *cycx_netdevice_get_stats (struct net_device *dev) { -struct cycx_x25_channel *chan = dev->priv; +struct cycx_x25_channel *chan = dev->ml_priv;return chan ? &chan->ifstats :NULL ; }
@@ -783,7 +783,7 @@ static void cycx_x25_irq_rx(struct cycx_device *card, struct cycx_x25_cmd *cmd)return ; } - chan = dev->priv; + chan = dev->ml_priv;reset_timer (dev);if (chan->drop_sequence) {
@@ -884,7 +884,7 @@ static void cycx_x25_irq_connect(struct cycx_device *card,return ; } - chan = dev->priv; + chan = dev->ml_priv; chan->lcn = lcn;cycx_x25_connect_response (card, chan);cycx_x25_set_chan_state (dev,WAN_CONNECTED );
@@ -914,7 +914,7 @@ static void cycx_x25_irq_connect_confirm(struct cycx_device *card, }clear_bit (--key, (void *)&card->u.x.connection_keys); - chan = dev->priv; + chan = dev->ml_priv; chan->lcn = lcn;cycx_x25_set_chan_state (dev,WAN_CONNECTED ); }
@@ -954,7 +954,7 @@ static void cycx_x25_irq_disconnect(struct cycx_device *card, dev =cycx_x25_get_dev_by_lcn (wandev, lcn);if (dev) { -struct cycx_x25_channel *chan = dev->priv; +struct cycx_x25_channel *chan = dev->ml_priv;cycx_x25_disconnect_response (card, chan->link, lcn);cycx_x25_set_chan_state (dev,WAN_DISCONNECTED );
@@ -1302,7 +1302,7 @@ static struct net_device *cycx_x25_get_dev_by_lcn(struct wan_device *wandev,struct cycx_x25_channel *chan;while (dev) { - chan = (struct cycx_x25_channel *)dev->priv; + chan = (struct cycx_x25_channel *)dev->ml_priv;if (chan->lcn == lcn)break ;
@@ -1319,7 +1319,7 @@ static struct net_device *struct cycx_x25_channel *chan;while (dev) { - chan = (struct cycx_x25_channel *)dev->priv; + chan = (struct cycx_x25_channel *)dev->ml_priv;if (!strcmp (chan->addr, dte))break ;
@@ -1337,7 +1337,7 @@ static struct net_device ** <0 failure */ static int cycx_x25_chan_connect (struct net_device *dev) { -struct cycx_x25_channel *chan = dev->priv; +struct cycx_x25_channel *chan = dev->ml_priv;struct cycx_device *card = chan->card;if (chan->svc) {
@@ -1362,7 +1362,7 @@ static int cycx_x25_chan_connect(struct net_device *dev)* o if SVC then clear X.25 call */ static void cycx_x25_chan_disconnect (struct net_device *dev) { -struct cycx_x25_channel *chan = dev->priv; +struct cycx_x25_channel *chan = dev->ml_priv;if (chan->svc) {x25_clear_call (chan->card, chan->link, chan->lcn,0 ,0 );
@@ -1375,7 +1375,7 @@ static void cycx_x25_chan_disconnect(struct net_device *dev)static void cycx_x25_chan_timer (unsigned long d) {struct net_device *dev = (struct net_device *)d; -struct cycx_x25_channel *chan = dev->priv; +struct cycx_x25_channel *chan = dev->ml_priv;if (chan->state ==WAN_CONNECTED )cycx_x25_chan_disconnect (dev);
@@ -1387,7 +1387,7 @@ static void cycx_x25_chan_timer(unsigned long d)/* Set logical channel state. */ static void cycx_x25_set_chan_state (struct net_device *dev,u8 state) { -struct cycx_x25_channel *chan = dev->priv; +struct cycx_x25_channel *chan = dev->ml_priv;struct cycx_device *card = chan->card;unsigned long flags;char *string_state =NULL ;
@@ -1453,7 +1453,7 @@ static void cycx_x25_set_chan_state(struct net_device *dev, u8 state)* to the router. */ static int cycx_x25_chan_send (struct net_device *dev,struct sk_buff *skb) { -struct cycx_x25_channel *chan = dev->priv; +struct cycx_x25_channel *chan = dev->ml_priv;struct cycx_device *card = chan->card;int bitm =0 ;/* final packet */ unsigned len = skb->len;
@@ -1547,7 +1547,7 @@ static unsigned dec_to_uint(u8 *str, int len)static void reset_timer (struct net_device *dev) { -struct cycx_x25_channel *chan = dev->priv; +struct cycx_x25_channel *chan = dev->ml_priv;if (chan->svc)mod_timer (&chan->timer, jiffies+chan->idle_tmout*HZ );
@@ -1600,7 +1600,7 @@ static void cycx_x25_dump_devs(struct wan_device *wandev)printk (KERN_INFO "---------------------------------------\n" );while (dev) { -struct cycx_x25_channel *chan = dev->priv; +struct cycx_x25_channel *chan = dev->ml_priv; printk(KERN_INFO "%-5.5s %-15.15s %d ETH_P_%s\n", chan->name, chan->addr, netif_queue_stopped(dev),
Signature · 1 line
1.5.3.4
PATCH 12/18 netdevice hdlc: Convert directly reference of netdev->priv to netdev->ml_priv
In reply to Wang ChenWe have some reasons to kill netdev->priv:
1. netdev->priv is equal to netdev_priv().
2. netdev_priv() wraps the calculation of netdev->priv's offset, obviously netdev_priv() is more flexible than netdev->priv.
But we cann't kill netdev->priv, because so many drivers reference to it directly.
OK, becasue Dave S. Miller said, "every direct netdev->priv usage is a bug", and I want to kill netdev->priv later, I decided to convert all the direct reference of netdev->priv first.
Different to readonly reference of netdev->priv, in this driver, netdev->priv was changed. I use netdev->ml_priv to replace netdev->priv.
Signed-off-by Wang Chen <[email protected]>
Acked-by Krzysztof Halasa <[email protected]>
--- drivers/net/wan/hdlc_fr.c | 10 +++++----- include/linux/hdlc.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/net/wan/hdlc_fr.c +5 -5
@@ -342,7 +342,7 @@ static int fr_hard_header(struct sk_buff **skb_p, u16 dlci)static int pvc_open (struct net_device *dev) { -pvc_device *pvc = dev->priv; +pvc_device *pvc = dev->ml_priv;if ((pvc->frad->flags &IFF_UP ) ==0 )return -EIO ;/* Frad must be UP in order to activate PVC */
@@ -362,7 +362,7 @@ static int pvc_open(struct net_device *dev)static int pvc_close (struct net_device *dev) { -pvc_device *pvc = dev->priv; +pvc_device *pvc = dev->ml_priv;if (--pvc->open_count ==0 ) {hdlc_device *hdlc =dev_to_hdlc (pvc->frad);
@@ -381,7 +381,7 @@ static int pvc_close(struct net_device *dev)static int pvc_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) { -pvc_device *pvc = dev->priv; +pvc_device *pvc = dev->ml_priv;fr_proto_pvc_info info;if (ifr->ifr_settings.type ==IF_GET_PROTO ) {
@@ -409,7 +409,7 @@ static int pvc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)static int pvc_xmit (struct sk_buff *skb,struct net_device *dev) { -pvc_device *pvc = dev->priv; +pvc_device *pvc = dev->ml_priv;if (pvc->state.active) {if (dev->type ==ARPHRD_ETHER ) {
@@ -1111,7 +1111,7 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type) dev->change_mtu = pvc_change_mtu; dev->mtu =HDLC_MAX_MTU ; dev->tx_queue_len =0 ; - dev->priv = pvc; + dev->ml_priv = pvc; result =dev_alloc_name (dev, dev->name);if (result <0 ) {
include/linux/hdlc.h +1 -1
@@ -80,7 +80,7 @@ struct net_device *alloc_hdlcdev(void *priv);static inline struct hdlc_device *dev_to_hdlc (struct net_device *dev) { -return dev->priv; +return netdev_priv (dev); }static __inline__void debug_frame (const struct sk_buff *skb)
Signature · 1 line
1.5.3.4
Krzysztof Halasa
maintainerRe: [PATCH 12/18] netdevice hdlc: Convert directly reference of netdev->priv to netdev->ml_priv
Quoted 6 lines · Wang Chen
Signed-off-by Wang Chen <[email protected]>Acked-by Krzysztof Halasa <[email protected]>--- drivers/net/wan/hdlc_fr.c | 10 +++++----- include/linux/hdlc.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
Since it's now a separate patch I will just take it. Thanks.
Signature · 1 line
Krzysztof Halasa
PATCH 13/18 netdevice wanrouter: Convert directly reference of netdev->priv to netdev->ml_priv
In reply to Wang ChenWe have some reasons to kill netdev->priv:
1. netdev->priv is equal to netdev_priv().
2. netdev_priv() wraps the calculation of netdev->priv's offset, obviously netdev_priv() is more flexible than netdev->priv.
But we cann't kill netdev->priv, because so many drivers reference to it directly.
OK, becasue Dave S. Miller said, "every direct netdev->priv usage is a bug", and I want to kill netdev->priv later, I decided to convert all the direct reference of netdev->priv first.
Different to readonly reference of netdev->priv, in this driver, netdev->priv was changed. I use netdev->ml_priv to replace netdev->priv.
Signed-off-by Wang Chen <[email protected]>
--- net/wanrouter/wanmain.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-)
net/wanrouter/wanmain.c +12 -11
@@ -59,6 +59,7 @@#include <linux/init.h> /* __initfunc et al. */ #define KMEM_SAFETYZONE 8 +#define DEV_ML_PRIV (dev) (*((struct net_device **)dev->ml_priv))/* * Function Prototypes
@@ -622,10 +623,10 @@ static int wanrouter_device_new_if(struct wan_device *wandev, wandev->dev = dev; }else {for (slave=wandev->dev; - *((struct net_device **)slave->priv); - slave = *((struct net_device **)slave->priv)); +DEV_ML_PRIV (slave); + slave =DEV_ML_PRIV (slave)); - *((struct net_device **)slave->priv) = dev; +DEV_ML_PRIV (slave) = dev; } ++wandev->ndev;
@@ -639,8 +640,8 @@ static int wanrouter_device_new_if(struct wan_device *wandev, }/* This code has moved from del_if() function */ -kfree (dev->priv); - dev->priv =NULL ; +kfree (dev->ml_priv); + dev->ml_priv =NULL ;/* Sync PPP is disabled */ if (cnf->config_id !=WANCONFIG_MPPP )
@@ -734,7 +735,7 @@ static int wanrouter_delete_interface(struct wan_device *wandev, char *name) dev = wandev->dev; prev =NULL ;while (dev &&strcmp (name, dev->name)) { -struct net_device **slave = dev->priv; +struct net_device **slave = dev->ml_priv; prev = dev; dev = *slave; }
@@ -751,12 +752,12 @@ static int wanrouter_delete_interface(struct wan_device *wandev, char *name)lock_adapter_irq (&wandev->lock, &smp_flags);if (prev) { -struct net_device **prev_slave = prev->priv; -struct net_device **slave = dev->priv; +struct net_device **prev_slave = prev->ml_priv; +struct net_device **slave = dev->ml_priv; *prev_slave = *slave; }else { -struct net_device **slave = dev->priv; +struct net_device **slave = dev->ml_priv; wandev->dev = *slave; } --wandev->ndev;
@@ -766,8 +767,8 @@ static int wanrouter_delete_interface(struct wan_device *wandev, char *name)/* Due to new interface linking method using dev->priv, * this code has moved from del_if() function.*/ -kfree (dev->priv); - dev->priv=NULL ; +kfree (dev->ml_priv); + dev->ml_priv =NULL ;unregister_netdev (dev);
Signature · 1 line
1.5.3.4
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 15/18 netdevice libertas: Fix directly reference of netdev->priv
We have some reasons to kill netdev->priv:
1. netdev->priv is equal to netdev_priv().
2. netdev_priv() wraps the calculation of netdev->priv's offset, obviously netdev_priv() is more flexible than netdev->priv.
But we cann't kill netdev->priv, because so many drivers reference to it directly.
OK, becasue Dave S. Miller said, "every direct netdev->priv usage is a bug", and I want to kill netdev->priv later, I decided to convert all the direct reference of netdev->priv first.
Different to readonly reference of netdev->priv, in this driver, netdev->priv was changed. I use netdev->ml_priv to replace netdev->priv.
Signed-off-by Wang Chen <[email protected]>
--- drivers/net/wireless/libertas/main.c | 36 +++++++++++++++++----------------- 1 files changed, 18 insertions(+), 18 deletions(-)
drivers/net/wireless/libertas/main.c +18 -18
@@ -223,7 +223,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 =to_net_dev (dev)->priv; +struct lbs_private *priv =netdev_priv (to_net_dev (dev));struct cmd_ds_mesh_access mesh_access;int ret;
@@ -242,7 +242,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 count) { -struct lbs_private *priv =to_net_dev (dev)->priv; +struct lbs_private *priv =netdev_priv (to_net_dev (dev));struct cmd_ds_mesh_access mesh_access;uint32_t datum;int ret;
@@ -270,7 +270,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 =to_net_dev (dev)->priv; +struct lbs_private *priv =netdev_priv (to_net_dev (dev));return snprintf (buf,5 ,"0x%X\n" , priv->monitormode); }
@@ -281,7 +281,7 @@ static ssize_t lbs_rtap_set(struct device *dev, struct device_attribute *attr, const char * buf, size_t count) { int monitor_mode; -struct lbs_private *priv =to_net_dev (dev)->priv; +struct lbs_private *priv =netdev_priv (to_net_dev (dev));sscanf (buf,"%x" , &monitor_mode);if (monitor_mode) {
@@ -330,7 +330,7 @@ static DEVICE_ATTR(lbs_rtap, 0644, lbs_rtap_get, lbs_rtap_set );static ssize_t lbs_mesh_get (struct device *dev,struct device_attribute *attr,char * buf) { -struct lbs_private *priv =to_net_dev (dev)->priv; +struct lbs_private *priv =netdev_priv (to_net_dev (dev));return snprintf (buf,5 ,"0x%X\n" , !!priv->mesh_dev); }
@@ -340,7 +340,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 count) { -struct lbs_private *priv =to_net_dev (dev)->priv; +struct lbs_private *priv =netdev_priv (to_net_dev (dev));int enable;int ret, action =CMD_ACT_MESH_CONFIG_STOP ;
@@ -391,7 +391,7 @@ static struct attribute_group lbs_mesh_attr_group = {*/ static int lbs_dev_open (struct net_device *dev) { -struct lbs_private *priv = (struct lbs_private *) dev->priv ; +struct lbs_private *priv =netdev_priv (dev) ;int ret =0 ;lbs_deb_enter (LBS_DEB_NET );
@@ -433,7 +433,7 @@ static int lbs_dev_open(struct net_device *dev)*/ static int lbs_mesh_stop (struct net_device *dev) { -struct lbs_private *priv = (struct lbs_private *) (dev->priv); +struct lbs_private *priv = dev->ml_priv;lbs_deb_enter (LBS_DEB_MESH );spin_lock_irq (&priv->driver_lock);
@@ -460,7 +460,7 @@ static int lbs_mesh_stop(struct net_device *dev)*/ static int lbs_eth_stop (struct net_device *dev) { -struct lbs_private *priv = (struct lbs_private *) dev->priv; +struct lbs_private *priv =netdev_priv (dev);lbs_deb_enter (LBS_DEB_NET );
@@ -477,7 +477,7 @@ static int lbs_eth_stop(struct net_device *dev)static void lbs_tx_timeout (struct net_device *dev) { -struct lbs_private *priv = (struct lbs_private *) dev->priv; +struct lbs_private *priv =netdev_priv (dev);lbs_deb_enter (LBS_DEB_TX );
@@ -529,7 +529,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 = (struct lbs_private *) dev->priv; +struct lbs_private *priv =netdev_priv (dev);lbs_deb_enter (LBS_DEB_NET );return &priv->stats;
@@ -538,7 +538,7 @@ static struct net_device_stats *lbs_get_stats(struct net_device *dev)static int lbs_set_mac_address (struct net_device *dev,void *addr) {int ret =0 ; -struct lbs_private *priv = (struct lbs_private *) dev->priv; +struct lbs_private *priv =netdev_priv (dev);struct sockaddr *phwaddr = addr;struct cmd_ds_802_11_mac_address cmd;
@@ -672,7 +672,7 @@ static void lbs_set_mcast_worker(struct work_struct *work)static void lbs_set_multicast_list (struct net_device *dev) { -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);schedule_work (&priv->mcast_work); }
@@ -688,7 +688,7 @@ static void lbs_set_multicast_list(struct net_device *dev)static int lbs_thread (void *data) {struct net_device *dev = data; -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);wait_queue_t wait;lbs_deb_enter (LBS_DEB_THREAD );
@@ -1116,7 +1116,7 @@ struct lbs_private *lbs_add_card(void *card, struct device *dmdev)lbs_pr_err ("init ethX device failed\n" ); goto done; } - priv = dev->priv; + priv =netdev_priv (dev);if (lbs_init_adapter (priv)) {lbs_pr_err ("failed to initialize adapter structure.\n" );
@@ -1351,7 +1351,7 @@ static int lbs_add_mesh(struct lbs_private *priv) ret = -ENOMEM ; goto done; } - mesh_dev->priv = priv; + mesh_dev->ml_priv = priv; priv->mesh_dev = mesh_dev; mesh_dev->open = lbs_dev_open;
@@ -1564,7 +1564,7 @@ static int lbs_rtap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)static struct net_device_stats *lbs_rtap_get_stats (struct net_device *dev) { -struct lbs_private *priv = dev->priv; +struct lbs_private *priv = dev->ml_priv;lbs_deb_enter (LBS_DEB_NET );return &priv->stats; }
@@ -1605,7 +1605,7 @@ static int lbs_add_rtap(struct lbs_private *priv) rtap_dev->stop = lbs_rtap_stop; rtap_dev->get_stats = lbs_rtap_get_stats; rtap_dev->hard_start_xmit = lbs_rtap_hard_start_xmit; - rtap_dev->priv = priv; + rtap_dev->ml_priv = priv;SET_NETDEV_DEV (rtap_dev, priv->dev->dev.parent); ret =register_netdev (rtap_dev);
Signature · 7 lines
1.5.3.4 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH 15/18] netdevice libertas: Fix directly reference of netdev->priv
Quoted 7 lines · Wang Chen
We have some reasons to kill
netdev->priv:
1.netdev->privis equal tonetdev_priv().
2.netdev_priv()wraps the calculation of netdev->priv's offset, obviouslynetdev_priv()is more flexible thannetdev->priv.
But we cann't killnetdev->priv, because so many drivers reference to it directly.
Quoted 6 lines
OK, becasue Dave S. Miller said, "every direct
netdev->privusage is a bug", and I want to killnetdev->privlater, I decided to convert all the direct reference ofnetdev->privfirst.Different to readonly reference of
netdev->priv, in this driver,netdev->privwas changed. I usenetdev->ml_privto replacenetdev->priv.
Same comment as the other two; any reason we can't use netdev_priv() instead of ->ml_priv? That would be preferable.
Thanks!
Dan
Quoted 163 lines
Signed-off-by Wang Chen <[email protected]>--- drivers/net/wireless/libertas/main.c | 36 +++++++++++++++++----------------- 1 files changed, 18 insertions(+), 18 deletions(-)drivers/net/wireless/libertas/main.c +17
-17@@ -223,7 +223,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 =to_net_dev (dev)->priv; +struct lbs_private *priv =netdev_priv (to_net_dev (dev));struct cmd_ds_mesh_access mesh_access;int ret;@@ -242,7 +242,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 count) { -struct lbs_private *priv =to_net_dev (dev)->priv; +struct lbs_private *priv =netdev_priv (to_net_dev (dev));struct cmd_ds_mesh_access mesh_access;uint32_t datum;int ret;@@ -270,7 +270,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 =to_net_dev (dev)->priv; +struct lbs_private *priv =netdev_priv (to_net_dev (dev));return snprintf (buf,5 ,"0x%X\n" , priv->monitormode); }@@ -281,7 +281,7 @@ static ssize_t lbs_rtap_set(struct device *dev, struct device_attribute *attr, const char * buf, size_t count) { int monitor_mode; -struct lbs_private *priv =to_net_dev (dev)->priv; +struct lbs_private *priv =netdev_priv (to_net_dev (dev));sscanf (buf,"%x" , &monitor_mode);if (monitor_mode) {@@ -330,7 +330,7 @@ static DEVICE_ATTR(lbs_rtap, 0644, lbs_rtap_get, lbs_rtap_set );static ssize_t lbs_mesh_get (struct device *dev,struct device_attribute *attr,char * buf) { -struct lbs_private *priv =to_net_dev (dev)->priv; +struct lbs_private *priv =netdev_priv (to_net_dev (dev));return snprintf (buf,5 ,"0x%X\n" , !!priv->mesh_dev); }@@ -340,7 +340,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 count) { -struct lbs_private *priv =to_net_dev (dev)->priv; +struct lbs_private *priv =netdev_priv (to_net_dev (dev));int enable;int ret, action =CMD_ACT_MESH_CONFIG_STOP ;@@ -391,7 +391,7 @@ static struct attribute_group lbs_mesh_attr_group = {*/ static int lbs_dev_open (struct net_device *dev) { -struct lbs_private *priv = (struct lbs_private *) dev->priv ; +struct lbs_private *priv =netdev_priv (dev) ;int ret =0 ;lbs_deb_enter (LBS_DEB_NET );@@ -433,7 +433,7 @@ static int lbs_dev_open(struct net_device *dev)*/ static int lbs_mesh_stop (struct net_device *dev) { -struct lbs_private *priv = (struct lbs_private *) (dev->priv); +struct lbs_private *priv = dev->ml_priv;lbs_deb_enter (LBS_DEB_MESH );spin_lock_irq (&priv->driver_lock);@@ -460,7 +460,7 @@ static int lbs_mesh_stop(struct net_device *dev)*/ static int lbs_eth_stop (struct net_device *dev) { -struct lbs_private *priv = (struct lbs_private *) dev->priv; +struct lbs_private *priv =netdev_priv (dev);lbs_deb_enter (LBS_DEB_NET );@@ -477,7 +477,7 @@ static int lbs_eth_stop(struct net_device *dev)static void lbs_tx_timeout (struct net_device *dev) { -struct lbs_private *priv = (struct lbs_private *) dev->priv; +struct lbs_private *priv =netdev_priv (dev);lbs_deb_enter (LBS_DEB_TX );@@ -529,7 +529,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 = (struct lbs_private *) dev->priv; +struct lbs_private *priv =netdev_priv (dev);lbs_deb_enter (LBS_DEB_NET );return &priv->stats;@@ -538,7 +538,7 @@ static struct net_device_stats *lbs_get_stats(struct net_device *dev)static int lbs_set_mac_address (struct net_device *dev,void *addr) {int ret =0 ; -struct lbs_private *priv = (struct lbs_private *) dev->priv; +struct lbs_private *priv =netdev_priv (dev);struct sockaddr *phwaddr = addr;struct cmd_ds_802_11_mac_address cmd;@@ -672,7 +672,7 @@ static void lbs_set_mcast_worker(struct work_struct *work)static void lbs_set_multicast_list (struct net_device *dev) { -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);schedule_work (&priv->mcast_work); }@@ -688,7 +688,7 @@ static void lbs_set_multicast_list(struct net_device *dev)static int lbs_thread (void *data) {struct net_device *dev = data; -struct lbs_private *priv = dev->priv; +struct lbs_private *priv =netdev_priv (dev);wait_queue_t wait;lbs_deb_enter (LBS_DEB_THREAD );@@ -1116,7 +1116,7 @@ struct lbs_private *lbs_add_card(void *card, struct device *dmdev)lbs_pr_err ("init ethX device failed\n" ); goto done; } - priv = dev->priv; + priv =netdev_priv (dev);if (lbs_init_adapter (priv)) {lbs_pr_err ("failed to initialize adapter structure.\n" );@@ -1351,7 +1351,7 @@ static int lbs_add_mesh(struct lbs_private *priv) ret = -ENOMEM ; goto done; } - mesh_dev->priv = priv; + mesh_dev->ml_priv = priv; priv->mesh_dev = mesh_dev; mesh_dev->open = lbs_dev_open;@@ -1564,7 +1564,7 @@ static int lbs_rtap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)static struct net_device_stats *lbs_rtap_get_stats (struct net_device *dev) { -struct lbs_private *priv = dev->priv; +struct lbs_private *priv = dev->ml_priv;lbs_deb_enter (LBS_DEB_NET );return &priv->stats; }
drivers/net/wireless/libertas/main.c static int lbs_add_rtap(struct lbs_private *priv) · line 1611
Quoted 8 lines
drivers/net/wireless/libertas/main.c +1
-1@@ -1605,7 +1605,7 @@ static int lbs_add_rtap(struct lbs_private *priv) rtap_dev->stop = lbs_rtap_stop; rtap_dev->get_stats = lbs_rtap_get_stats; rtap_dev->hard_start_xmit = lbs_rtap_hard_start_xmit; - rtap_dev->priv = priv; + rtap_dev->ml_priv = priv;SET_NETDEV_DEV (rtap_dev, priv->dev->dev.parent); ret =register_netdev (rtap_dev);
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 1220634465.6430.16.camel-bi+AKbBUZKY6gyzm1THtWbp2dZbC/[email protected]
Re: [PATCH 15/18] netdevice libertas: Fix directly reference of netdev->priv
Quoted 12 lines · Dan Williams
Quoted 11 lines · Wang Chen
We have some reasons to kill
netdev->priv:
1.netdev->privis equal tonetdev_priv().
2.netdev_priv()wraps the calculation of netdev->priv's offset, obviouslynetdev_priv()is more flexible thannetdev->priv.
But we cann't killnetdev->priv, because so many drivers reference to it directly.OK, becasue Dave S. Miller said, "every direct
netdev->privusage is a bug", and I want to killnetdev->privlater, I decided to convert all the direct reference ofnetdev->privfirst.
Quoted 5 lines
Quoted 2 lines
Different to readonly reference of
netdev->priv, in this driver,netdev->privwas changed. I usenetdev->ml_privto replacenetdev->priv.Same comment as the other two; any reason we can't use
netdev_priv()instead of ->ml_priv? That would be preferable.
Actually, I think this one was OK -- the two ml_priv uses were for the extra mesh and rtap devices, which point back to the already allocated priv data for the main device.
John
Signature · 6 lines
John W. Linville Linux should be at the core [email protected] of your literate lifestyle. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 16/18 netdevice zd1201: Convert directly reference of netdev->priv to netdev->ml_priv
In reply to a message not in the archiveWe have some reasons to kill netdev->priv:
1. netdev->priv is equal to netdev_priv().
2. netdev_priv() wraps the calculation of netdev->priv's offset, obviously netdev_priv() is more flexible than netdev->priv.
But we cann't kill netdev->priv, because so many drivers reference to it directly.
OK, becasue Dave S. Miller said, "every direct netdev->priv usage is a bug", and I want to kill netdev->priv later, I decided to convert all the direct reference of netdev->priv first.
Different to readonly reference of netdev->priv, in this driver, netdev->priv was changed. I use netdev->ml_priv to replace netdev->priv.
Signed-off-by Wang Chen <[email protected]>
--- drivers/net/wireless/zd1201.c | 64 ++++++++++++++++++++-------------------- 1 files changed, 32 insertions(+), 32 deletions(-)
drivers/net/wireless/zd1201.c +32 -32
@@ -745,7 +745,7 @@ static int zd1201_join(struct zd1201 *zd, char *essid, int essidlen)static int zd1201_net_open (struct net_device *dev) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;/* Start MAC with wildcard if no essid set */ if (!zd->mac_enabled)
@@ -783,7 +783,7 @@ static int zd1201_net_stop(struct net_device *dev)*/ static int zd1201_hard_start_xmit (struct sk_buff *skb,struct net_device *dev) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;unsigned char *txbuf = zd->txdata;int txbuflen, pad =0 , err;struct urb *urb = zd->tx_urb;
@@ -833,7 +833,7 @@ static int zd1201_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)static void zd1201_tx_timeout (struct net_device *dev) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;if (!zd)return ;
@@ -848,7 +848,7 @@ static void zd1201_tx_timeout(struct net_device *dev)static int zd1201_set_mac_address (struct net_device *dev,void *p) {struct sockaddr *addr = p; -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;int err;if (!zd)
@@ -865,21 +865,21 @@ static int zd1201_set_mac_address(struct net_device *dev, void *p)static struct net_device_stats *zd1201_get_stats (struct net_device *dev) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;return &zd->stats; }static struct iw_statistics *zd1201_get_wireless_stats (struct net_device *dev) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;return &zd->iwstats; }static void zd1201_set_multicast (struct net_device *dev) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;struct dev_mc_list *mc = dev->mc_list;unsigned char reqbuf[ETH_ALEN *ZD1201_MAXMULTI ];int i;
@@ -899,7 +899,7 @@ static void zd1201_set_multicast(struct net_device *dev)static int zd1201_config_commit (struct net_device *dev,struct iw_request_info *info,struct iw_point *data,char *essid) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;return zd1201_mac_reset (zd); }
@@ -914,7 +914,7 @@ static int zd1201_get_name(struct net_device *dev,static int zd1201_set_freq (struct net_device *dev,struct iw_request_info *info,struct iw_freq *freq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;short channel =0 ;int err;
@@ -939,7 +939,7 @@ static int zd1201_set_freq(struct net_device *dev,static int zd1201_get_freq (struct net_device *dev,struct iw_request_info *info,struct iw_freq *freq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;short channel;int err;
@@ -955,7 +955,7 @@ static int zd1201_get_freq(struct net_device *dev,static int zd1201_set_mode (struct net_device *dev,struct iw_request_info *info,__u32 *mode,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;short porttype, monitor =0 ;unsigned char buffer[IW_ESSID_MAX_SIZE +2 ];int err;
@@ -1017,7 +1017,7 @@ static int zd1201_set_mode(struct net_device *dev,static int zd1201_get_mode (struct net_device *dev,struct iw_request_info *info,__u32 *mode,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;short porttype;int err;
@@ -1093,7 +1093,7 @@ static int zd1201_get_range(struct net_device *dev,static int zd1201_get_wap (struct net_device *dev,struct iw_request_info *info,struct sockaddr *ap_addr,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;unsigned char buffer[6 ];if (!zd1201_getconfig (zd,ZD1201_RID_COMMSQUALITY , buffer,6 )) {
@@ -1121,7 +1121,7 @@ static int zd1201_set_scan(struct net_device *dev,static int zd1201_get_scan (struct net_device *dev,struct iw_request_info *info,struct iw_point *srq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;int err, i, j, enabled_save;struct iw_event iwe;char *cev = extra;
@@ -1213,7 +1213,7 @@ static int zd1201_get_scan(struct net_device *dev,static int zd1201_set_essid (struct net_device *dev,struct iw_request_info *info,struct iw_point *data,char *essid) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;if (data->length >IW_ESSID_MAX_SIZE )return -EINVAL ;
@@ -1228,7 +1228,7 @@ static int zd1201_set_essid(struct net_device *dev,static int zd1201_get_essid (struct net_device *dev,struct iw_request_info *info,struct iw_point *data,char *essid) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;memcpy (essid, zd->essid, zd->essidlen); data->flags =1 ;
@@ -1249,7 +1249,7 @@ static int zd1201_get_nick(struct net_device *dev, struct iw_request_info *info,static int zd1201_set_rate (struct net_device *dev,struct iw_request_info *info,struct iw_param *rrq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;short rate;int err;
@@ -1282,7 +1282,7 @@ static int zd1201_set_rate(struct net_device *dev,static int zd1201_get_rate (struct net_device *dev,struct iw_request_info *info,struct iw_param *rrq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;short rate;int err;
@@ -1315,7 +1315,7 @@ static int zd1201_get_rate(struct net_device *dev,static int zd1201_set_rts (struct net_device *dev,struct iw_request_info *info,struct iw_param *rts,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;int err;short val = rts->value;
@@ -1335,7 +1335,7 @@ static int zd1201_set_rts(struct net_device *dev, struct iw_request_info *info,static int zd1201_get_rts (struct net_device *dev,struct iw_request_info *info,struct iw_param *rts,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;short rtst;int err;
@@ -1352,7 +1352,7 @@ static int zd1201_get_rts(struct net_device *dev, struct iw_request_info *info,static int zd1201_set_frag (struct net_device *dev,struct iw_request_info *info,struct iw_param *frag,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;int err;short val = frag->value;
@@ -1373,7 +1373,7 @@ static int zd1201_set_frag(struct net_device *dev, struct iw_request_info *info,static int zd1201_get_frag (struct net_device *dev,struct iw_request_info *info,struct iw_param *frag,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;short fragt;int err;
@@ -1402,7 +1402,7 @@ static int zd1201_get_retry(struct net_device *dev,static int zd1201_set_encode (struct net_device *dev,struct iw_request_info *info,struct iw_point *erq,char *key) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;short i;int err, rid;
@@ -1459,7 +1459,7 @@ static int zd1201_set_encode(struct net_device *dev,static int zd1201_get_encode (struct net_device *dev,struct iw_request_info *info,struct iw_point *erq,char *key) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;short i;int err;
@@ -1492,7 +1492,7 @@ static int zd1201_get_encode(struct net_device *dev,static int zd1201_set_power (struct net_device *dev,struct iw_request_info *info,struct iw_param *vwrq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;short enabled, duration, level;int err;
@@ -1531,7 +1531,7 @@ out:static int zd1201_get_power (struct net_device *dev,struct iw_request_info *info,struct iw_param *vwrq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;short enabled, level, duration;int err;
@@ -1618,7 +1618,7 @@ static const iw_handler zd1201_iw_handler[] =static int zd1201_set_hostauth (struct net_device *dev,struct iw_request_info *info,struct iw_param *rrq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;if (!zd->ap)return -EOPNOTSUPP ;
@@ -1629,7 +1629,7 @@ static int zd1201_set_hostauth(struct net_device *dev,static int zd1201_get_hostauth (struct net_device *dev,struct iw_request_info *info,struct iw_param *rrq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;short hostauth;int err;
@@ -1648,7 +1648,7 @@ static int zd1201_get_hostauth(struct net_device *dev,static int zd1201_auth_sta (struct net_device *dev,struct iw_request_info *info,struct sockaddr *sta,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;unsigned char buffer[10 ];if (!zd->ap)
@@ -1664,7 +1664,7 @@ static int zd1201_auth_sta(struct net_device *dev,static int zd1201_set_maxassoc (struct net_device *dev,struct iw_request_info *info,struct iw_param *rrq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;int err;if (!zd->ap)
@@ -1679,7 +1679,7 @@ static int zd1201_set_maxassoc(struct net_device *dev,static int zd1201_get_maxassoc (struct net_device *dev,struct iw_request_info *info,struct iw_param *rrq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd = dev->ml_priv;short maxassoc;int err;
@@ -1779,7 +1779,7 @@ static int zd1201_probe(struct usb_interface *interface,if (!zd->dev) goto err_start; - zd->dev->priv = zd; + zd->dev->ml_priv = zd; zd->dev->open = zd1201_net_open; zd->dev->stop = zd1201_net_stop; zd->dev->get_stats = zd1201_get_stats;
Signature · 7 lines
1.5.3.4 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 16/18] netdevice zd1201: Convert directly reference of netdev->priv to netdev->ml_priv
Quoted 7 lines · Wang Chen
We have some reasons to kill
netdev->priv:
1.netdev->privis equal tonetdev_priv().
2.netdev_priv()wraps the calculation of netdev->priv's offset, obviouslynetdev_priv()is more flexible thannetdev->priv.
But we cann't killnetdev->priv, because so many drivers reference to it directly.
Quoted 8 lines
OK, becasue Dave S. Miller said, "every direct
netdev->privusage is a bug", and I want to killnetdev->privlater, I decided to convert all the direct reference ofnetdev->privfirst.Different to readonly reference of
netdev->priv, in this driver,netdev->privwas changed. I usenetdev->ml_privto replacenetdev->priv.Signed-off-by Wang Chen <[email protected]>
Same comment as the other patch.
Also, I have to be honest and say that I had never been aware of dev->ml_priv before, so I'm not entirely sure what it is. However, from the comment at it's definision ("mid-layer private") and it's usage in qeth, loopback, and ppp, I'm not at all sure that you are using it as intended.
Can you explain?
Thanks,
John
Signature · 2 lines
John W. Linville [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH 16/18] netdevice zd1201: Convert directly reference of netdev->priv to netdev->ml_priv
Quoted 7 lines · Wang Chen
We have some reasons to kill
netdev->priv:
1.netdev->privis equal tonetdev_priv().
2.netdev_priv()wraps the calculation of netdev->priv's offset, obviouslynetdev_priv()is more flexible thannetdev->priv.
But we cann't killnetdev->priv, because so many drivers reference to it directly.
Quoted 8 lines
OK, becasue Dave S. Miller said, "every direct
netdev->privusage is a bug", and I want to killnetdev->privlater, I decided to convert all the direct reference ofnetdev->privfirst.Different to readonly reference of
netdev->priv, in this driver,netdev->privwas changed. I usenetdev->ml_privto replacenetdev->priv.Signed-off-by Wang Chen <[email protected]>
I don't think this is the right approach for this driver. Alternative patch to follow...
John
Signature · 6 lines
John W. Linville Linux should be at the core [email protected] of your literate lifestyle. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 netdevice zd1201: Convert directly reference of netdev->priv to netdev_priv()
We have some reasons to kill netdev->priv:
1. netdev->priv is equal to netdev_priv().
2. netdev_priv() wraps the calculation of netdev->priv's offset, obviously netdev_priv() is more flexible than netdev->priv.
But we cann't kill netdev->priv, because so many drivers reference to it directly.
OK, becasue Dave S. Miller said, "every direct netdev->priv usage is a bug", and I want to kill netdev->priv later, I decided to convert all the direct reference of netdev->priv first.
(Original patch posted by Wang Chen <[email protected]> w/ above changelog but using dev->ml_priv. That doesn't seem appropriate
to me for this driver, so I've revamped it to use netdev_priv()
instead. -- JWL)
Cc Wang Chen <[email protected]>
Signed-off-by John W. Linville <[email protected]>
--- drivers/net/wireless/zd1201.c | 115 ++++++++++++++++++++--------------------- 1 files changed, 56 insertions(+), 59 deletions(-)
drivers/net/wireless/zd1201.c +56 -59
@@ -745,7 +745,7 @@ static int zd1201_join(struct zd1201 *zd, char *essid, int essidlen)static int zd1201_net_open (struct net_device *dev) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);/* Start MAC with wildcard if no essid set */ if (!zd->mac_enabled)
@@ -783,7 +783,7 @@ static int zd1201_net_stop(struct net_device *dev)*/ static int zd1201_hard_start_xmit (struct sk_buff *skb,struct net_device *dev) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);unsigned char *txbuf = zd->txdata;int txbuflen, pad =0 , err;struct urb *urb = zd->tx_urb;
@@ -833,7 +833,7 @@ static int zd1201_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)static void zd1201_tx_timeout (struct net_device *dev) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);if (!zd)return ;
@@ -848,7 +848,7 @@ static void zd1201_tx_timeout(struct net_device *dev)static int zd1201_set_mac_address (struct net_device *dev,void *p) {struct sockaddr *addr = p; -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);int err;if (!zd)
@@ -865,21 +865,21 @@ static int zd1201_set_mac_address(struct net_device *dev, void *p)static struct net_device_stats *zd1201_get_stats (struct net_device *dev) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);return &zd->stats; }static struct iw_statistics *zd1201_get_wireless_stats (struct net_device *dev) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);return &zd->iwstats; }static void zd1201_set_multicast (struct net_device *dev) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);struct dev_mc_list *mc = dev->mc_list;unsigned char reqbuf[ETH_ALEN *ZD1201_MAXMULTI ];int i;
@@ -899,7 +899,7 @@ static void zd1201_set_multicast(struct net_device *dev)static int zd1201_config_commit (struct net_device *dev,struct iw_request_info *info,struct iw_point *data,char *essid) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);return zd1201_mac_reset (zd); }
@@ -914,7 +914,7 @@ static int zd1201_get_name(struct net_device *dev,static int zd1201_set_freq (struct net_device *dev,struct iw_request_info *info,struct iw_freq *freq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);short channel =0 ;int err;
@@ -939,7 +939,7 @@ static int zd1201_set_freq(struct net_device *dev,static int zd1201_get_freq (struct net_device *dev,struct iw_request_info *info,struct iw_freq *freq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);short channel;int err;
@@ -955,7 +955,7 @@ static int zd1201_get_freq(struct net_device *dev,static int zd1201_set_mode (struct net_device *dev,struct iw_request_info *info,__u32 *mode,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);short porttype, monitor =0 ;unsigned char buffer[IW_ESSID_MAX_SIZE +2 ];int err;
@@ -1017,7 +1017,7 @@ static int zd1201_set_mode(struct net_device *dev,static int zd1201_get_mode (struct net_device *dev,struct iw_request_info *info,__u32 *mode,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);short porttype;int err;
@@ -1093,7 +1093,7 @@ static int zd1201_get_range(struct net_device *dev,static int zd1201_get_wap (struct net_device *dev,struct iw_request_info *info,struct sockaddr *ap_addr,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);unsigned char buffer[6 ];if (!zd1201_getconfig (zd,ZD1201_RID_COMMSQUALITY , buffer,6 )) {
@@ -1121,7 +1121,7 @@ static int zd1201_set_scan(struct net_device *dev,static int zd1201_get_scan (struct net_device *dev,struct iw_request_info *info,struct iw_point *srq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);int err, i, j, enabled_save;struct iw_event iwe;char *cev = extra;
@@ -1213,7 +1213,7 @@ static int zd1201_get_scan(struct net_device *dev,static int zd1201_set_essid (struct net_device *dev,struct iw_request_info *info,struct iw_point *data,char *essid) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);if (data->length >IW_ESSID_MAX_SIZE )return -EINVAL ;
@@ -1228,7 +1228,7 @@ static int zd1201_set_essid(struct net_device *dev,static int zd1201_get_essid (struct net_device *dev,struct iw_request_info *info,struct iw_point *data,char *essid) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);memcpy (essid, zd->essid, zd->essidlen); data->flags =1 ;
@@ -1249,7 +1249,7 @@ static int zd1201_get_nick(struct net_device *dev, struct iw_request_info *info,static int zd1201_set_rate (struct net_device *dev,struct iw_request_info *info,struct iw_param *rrq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);short rate;int err;
@@ -1282,7 +1282,7 @@ static int zd1201_set_rate(struct net_device *dev,static int zd1201_get_rate (struct net_device *dev,struct iw_request_info *info,struct iw_param *rrq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);short rate;int err;
@@ -1315,7 +1315,7 @@ static int zd1201_get_rate(struct net_device *dev,static int zd1201_set_rts (struct net_device *dev,struct iw_request_info *info,struct iw_param *rts,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);int err;short val = rts->value;
@@ -1335,7 +1335,7 @@ static int zd1201_set_rts(struct net_device *dev, struct iw_request_info *info,static int zd1201_get_rts (struct net_device *dev,struct iw_request_info *info,struct iw_param *rts,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);short rtst;int err;
@@ -1352,7 +1352,7 @@ static int zd1201_get_rts(struct net_device *dev, struct iw_request_info *info,static int zd1201_set_frag (struct net_device *dev,struct iw_request_info *info,struct iw_param *frag,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);int err;short val = frag->value;
@@ -1373,7 +1373,7 @@ static int zd1201_set_frag(struct net_device *dev, struct iw_request_info *info,static int zd1201_get_frag (struct net_device *dev,struct iw_request_info *info,struct iw_param *frag,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);short fragt;int err;
@@ -1402,7 +1402,7 @@ static int zd1201_get_retry(struct net_device *dev,static int zd1201_set_encode (struct net_device *dev,struct iw_request_info *info,struct iw_point *erq,char *key) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);short i;int err, rid;
@@ -1459,7 +1459,7 @@ static int zd1201_set_encode(struct net_device *dev,static int zd1201_get_encode (struct net_device *dev,struct iw_request_info *info,struct iw_point *erq,char *key) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);short i;int err;
@@ -1492,7 +1492,7 @@ static int zd1201_get_encode(struct net_device *dev,static int zd1201_set_power (struct net_device *dev,struct iw_request_info *info,struct iw_param *vwrq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);short enabled, duration, level;int err;
@@ -1531,7 +1531,7 @@ out:static int zd1201_get_power (struct net_device *dev,struct iw_request_info *info,struct iw_param *vwrq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);short enabled, level, duration;int err;
@@ -1618,7 +1618,7 @@ static const iw_handler zd1201_iw_handler[] =static int zd1201_set_hostauth (struct net_device *dev,struct iw_request_info *info,struct iw_param *rrq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);if (!zd->ap)return -EOPNOTSUPP ;
@@ -1629,7 +1629,7 @@ static int zd1201_set_hostauth(struct net_device *dev,static int zd1201_get_hostauth (struct net_device *dev,struct iw_request_info *info,struct iw_param *rrq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);short hostauth;int err;
@@ -1648,7 +1648,7 @@ static int zd1201_get_hostauth(struct net_device *dev,static int zd1201_auth_sta (struct net_device *dev,struct iw_request_info *info,struct sockaddr *sta,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);unsigned char buffer[10 ];if (!zd->ap)
@@ -1664,7 +1664,7 @@ static int zd1201_auth_sta(struct net_device *dev,static int zd1201_set_maxassoc (struct net_device *dev,struct iw_request_info *info,struct iw_param *rrq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);int err;if (!zd->ap)
@@ -1679,7 +1679,7 @@ static int zd1201_set_maxassoc(struct net_device *dev,static int zd1201_get_maxassoc (struct net_device *dev,struct iw_request_info *info,struct iw_param *rrq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);short maxassoc;int err;
@@ -1731,6 +1731,7 @@ static int zd1201_probe(struct usb_interface *interface, const struct usb_device_id *id) {struct zd1201 *zd; +struct net_device *dev;struct usb_device *usb;int err;short porttype;
@@ -1738,9 +1739,12 @@ static int zd1201_probe(struct usb_interface *interface, usb =interface_to_usbdev (interface); - zd =kzalloc (sizeof (struct zd1201 ),GFP_KERNEL ); -if (!zd) + dev =alloc_etherdev (sizeof (*zd)); +if (!dev)return -ENOMEM ; + zd =netdev_priv (dev); + zd->dev = dev; + zd->ap = ap; zd->usb = usb; zd->removed =0 ;
@@ -1775,34 +1779,29 @@ static int zd1201_probe(struct usb_interface *interface,if (err) goto err_start; - zd->dev =alloc_etherdev (0 ); -if (!zd->dev) - goto err_start; - - zd->dev->priv = zd; - zd->dev->open = zd1201_net_open; - zd->dev->stop = zd1201_net_stop; - zd->dev->get_stats = zd1201_get_stats; - zd->dev->wireless_handlers = + dev->open = zd1201_net_open; + dev->stop = zd1201_net_stop; + dev->get_stats = zd1201_get_stats; + dev->wireless_handlers = (struct iw_handler_def *)&zd1201_iw_handlers; - zd->dev->hard_start_xmit = zd1201_hard_start_xmit; - zd->dev->watchdog_timeo =ZD1201_TX_TIMEOUT ; - zd->dev->tx_timeout = zd1201_tx_timeout; - zd->dev->set_multicast_list = zd1201_set_multicast; - zd->dev->set_mac_address = zd1201_set_mac_address; -strcpy (zd->dev->name,"wlan%d" ); + dev->hard_start_xmit = zd1201_hard_start_xmit; + dev->watchdog_timeo =ZD1201_TX_TIMEOUT ; + dev->tx_timeout = zd1201_tx_timeout; + dev->set_multicast_list = zd1201_set_multicast; + dev->set_mac_address = zd1201_set_mac_address; +strcpy (dev->name,"wlan%d" ); err =zd1201_getconfig (zd,ZD1201_RID_CNFOWNMACADDR , - zd->dev->dev_addr, zd->dev->addr_len); + dev->dev_addr, dev->addr_len);if (err) - goto err_net; + goto err_start;/* Set wildcard essid to match zd->essid */ *(__le16 *)buf =cpu_to_le16 (0 ); err =zd1201_setconfig (zd,ZD1201_RID_CNFDESIREDSSID , buf,IW_ESSID_MAX_SIZE +2 ,1 );if (err) - goto err_net; + goto err_start;if (zd->ap) porttype =ZD1201_PORTTYPE_AP ;
@@ -1810,30 +1809,28 @@ static int zd1201_probe(struct usb_interface *interface, porttype =ZD1201_PORTTYPE_BSS ; err =zd1201_setconfig16 (zd,ZD1201_RID_CNFPORTTYPE , porttype);if (err) - goto err_net; + goto err_start; -SET_NETDEV_DEV (zd->dev, &usb->dev); +SET_NETDEV_DEV (dev, &usb->dev); - err =register_netdev (zd->dev); + err =register_netdev (dev);if (err) - goto err_net; + goto err_start;dev_info (&usb->dev,"%s: ZD1201 USB Wireless interface\n" , - zd->dev->name); + dev->name);usb_set_intfdata (interface, zd);zd1201_enable (zd);/* zd1201 likes to startup enabled, */ zd1201_disable (zd);/* interfering with all the wifis in range */ return 0 ; -err_net: -free_netdev (zd->dev); err_start:/* Leave the device in reset state */ zd1201_docmd (zd,ZD1201_CMDCODE_INIT ,0 ,0 ,0 ); err_zd:usb_free_urb (zd->tx_urb);usb_free_urb (zd->rx_urb); -kfree (zd); +free_netdev (dev);return err; }
Signature · 6 lines
1.5.4.3 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 1225478896-28987-1-git-send-email-linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org
Re: [PATCH] netdevice zd1201: Convert directly reference of netdev->priv to netdev_priv()
Quoted 312 lines · On Fri, 31 Oct 2008 14:48:16 -0400 "John W. Linville"…
We have some reasons to kill
netdev->priv:
1.netdev->privis equal tonetdev_priv().
2.netdev_priv()wraps the calculation of netdev->priv's offset, obviouslynetdev_priv()is more flexible thannetdev->priv.
But we cann't killnetdev->priv, because so many drivers reference to it directly.OK, becasue Dave S. Miller said, "every direct
netdev->privusage is a bug", and I want to killnetdev->privlater, I decided to convert all the direct reference ofnetdev->privfirst.(Original patch posted by Wang Chen <[email protected]> w/ above changelog but using
dev->ml_priv. That doesn't seem appropriate
to me for this driver, so I've revamped it to usenetdev_priv()
instead. -- JWL)Cc Wang Chen <[email protected]>Signed-off-by John W. Linville <[email protected]>--- drivers/net/wireless/zd1201.c | 115 ++++++++++++++++++++--------------------- 1 files changed, 56 insertions(+), 59 deletions(-)drivers/net/wireless/zd1201.c +32
-31@@ -745,7 +745,7 @@ static int zd1201_join(struct zd1201 *zd, char *essid, int essidlen)static int zd1201_net_open (struct net_device *dev) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);/* Start MAC with wildcard if no essid set */ if (!zd->mac_enabled)@@ -783,7 +783,7 @@ static int zd1201_net_stop(struct net_device *dev)*/ static int zd1201_hard_start_xmit (struct sk_buff *skb,struct net_device *dev) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);unsigned char *txbuf = zd->txdata;int txbuflen, pad =0 , err;struct urb *urb = zd->tx_urb;@@ -833,7 +833,7 @@ static int zd1201_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)static void zd1201_tx_timeout (struct net_device *dev) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);if (!zd)return ;@@ -848,7 +848,7 @@ static void zd1201_tx_timeout(struct net_device *dev)static int zd1201_set_mac_address (struct net_device *dev,void *p) {struct sockaddr *addr = p; -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);int err;if (!zd)@@ -865,21 +865,21 @@ static int zd1201_set_mac_address(struct net_device *dev, void *p)static struct net_device_stats *zd1201_get_stats (struct net_device *dev) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);return &zd->stats; }static struct iw_statistics *zd1201_get_wireless_stats (struct net_device *dev) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);return &zd->iwstats; }static void zd1201_set_multicast (struct net_device *dev) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);struct dev_mc_list *mc = dev->mc_list;unsigned char reqbuf[ETH_ALEN *ZD1201_MAXMULTI ];int i;@@ -899,7 +899,7 @@ static void zd1201_set_multicast(struct net_device *dev)static int zd1201_config_commit (struct net_device *dev,struct iw_request_info *info,struct iw_point *data,char *essid) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);return zd1201_mac_reset (zd); }@@ -914,7 +914,7 @@ static int zd1201_get_name(struct net_device *dev,static int zd1201_set_freq (struct net_device *dev,struct iw_request_info *info,struct iw_freq *freq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);short channel =0 ;int err;@@ -939,7 +939,7 @@ static int zd1201_set_freq(struct net_device *dev,static int zd1201_get_freq (struct net_device *dev,struct iw_request_info *info,struct iw_freq *freq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);short channel;int err;@@ -955,7 +955,7 @@ static int zd1201_get_freq(struct net_device *dev,static int zd1201_set_mode (struct net_device *dev,struct iw_request_info *info,__u32 *mode,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);short porttype, monitor =0 ;unsigned char buffer[IW_ESSID_MAX_SIZE +2 ];int err;@@ -1017,7 +1017,7 @@ static int zd1201_set_mode(struct net_device *dev,static int zd1201_get_mode (struct net_device *dev,struct iw_request_info *info,__u32 *mode,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);short porttype;int err;@@ -1093,7 +1093,7 @@ static int zd1201_get_range(struct net_device *dev,static int zd1201_get_wap (struct net_device *dev,struct iw_request_info *info,struct sockaddr *ap_addr,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);unsigned char buffer[6 ];if (!zd1201_getconfig (zd,ZD1201_RID_COMMSQUALITY , buffer,6 )) {@@ -1121,7 +1121,7 @@ static int zd1201_set_scan(struct net_device *dev,static int zd1201_get_scan (struct net_device *dev,struct iw_request_info *info,struct iw_point *srq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);int err, i, j, enabled_save;struct iw_event iwe;char *cev = extra;@@ -1213,7 +1213,7 @@ static int zd1201_get_scan(struct net_device *dev,static int zd1201_set_essid (struct net_device *dev,struct iw_request_info *info,struct iw_point *data,char *essid) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);if (data->length >IW_ESSID_MAX_SIZE )return -EINVAL ;@@ -1228,7 +1228,7 @@ static int zd1201_set_essid(struct net_device *dev,static int zd1201_get_essid (struct net_device *dev,struct iw_request_info *info,struct iw_point *data,char *essid) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);memcpy (essid, zd->essid, zd->essidlen); data->flags =1 ;@@ -1249,7 +1249,7 @@ static int zd1201_get_nick(struct net_device *dev, struct iw_request_info *info,static int zd1201_set_rate (struct net_device *dev,struct iw_request_info *info,struct iw_param *rrq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);short rate;int err;@@ -1282,7 +1282,7 @@ static int zd1201_set_rate(struct net_device *dev,static int zd1201_get_rate (struct net_device *dev,struct iw_request_info *info,struct iw_param *rrq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);short rate;int err;@@ -1315,7 +1315,7 @@ static int zd1201_get_rate(struct net_device *dev,static int zd1201_set_rts (struct net_device *dev,struct iw_request_info *info,struct iw_param *rts,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);int err;short val = rts->value;@@ -1335,7 +1335,7 @@ static int zd1201_set_rts(struct net_device *dev, struct iw_request_info *info,static int zd1201_get_rts (struct net_device *dev,struct iw_request_info *info,struct iw_param *rts,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);short rtst;int err;@@ -1352,7 +1352,7 @@ static int zd1201_get_rts(struct net_device *dev, struct iw_request_info *info,static int zd1201_set_frag (struct net_device *dev,struct iw_request_info *info,struct iw_param *frag,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);int err;short val = frag->value;@@ -1373,7 +1373,7 @@ static int zd1201_set_frag(struct net_device *dev, struct iw_request_info *info,static int zd1201_get_frag (struct net_device *dev,struct iw_request_info *info,struct iw_param *frag,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);short fragt;int err;@@ -1402,7 +1402,7 @@ static int zd1201_get_retry(struct net_device *dev,static int zd1201_set_encode (struct net_device *dev,struct iw_request_info *info,struct iw_point *erq,char *key) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);short i;int err, rid;@@ -1459,7 +1459,7 @@ static int zd1201_set_encode(struct net_device *dev,static int zd1201_get_encode (struct net_device *dev,struct iw_request_info *info,struct iw_point *erq,char *key) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);short i;int err;@@ -1492,7 +1492,7 @@ static int zd1201_get_encode(struct net_device *dev,static int zd1201_set_power (struct net_device *dev,struct iw_request_info *info,struct iw_param *vwrq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);short enabled, duration, level;int err;@@ -1531,7 +1531,7 @@ out:static int zd1201_get_power (struct net_device *dev,struct iw_request_info *info,struct iw_param *vwrq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);short enabled, level, duration;int err;@@ -1618,7 +1618,7 @@ static const iw_handler zd1201_iw_handler[] =static int zd1201_set_hostauth (struct net_device *dev,struct iw_request_info *info,struct iw_param *rrq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);if (!zd->ap)return -EOPNOTSUPP ;@@ -1629,7 +1629,7 @@ static int zd1201_set_hostauth(struct net_device *dev,static int zd1201_get_hostauth (struct net_device *dev,struct iw_request_info *info,struct iw_param *rrq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);short hostauth;int err;@@ -1648,7 +1648,7 @@ static int zd1201_get_hostauth(struct net_device *dev,static int zd1201_auth_sta (struct net_device *dev,struct iw_request_info *info,struct sockaddr *sta,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);unsigned char buffer[10 ];if (!zd->ap)@@ -1664,7 +1664,7 @@ static int zd1201_auth_sta(struct net_device *dev,static int zd1201_set_maxassoc (struct net_device *dev,struct iw_request_info *info,struct iw_param *rrq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);int err;if (!zd->ap)@@ -1679,7 +1679,7 @@ static int zd1201_set_maxassoc(struct net_device *dev,static int zd1201_get_maxassoc (struct net_device *dev,struct iw_request_info *info,struct iw_param *rrq,char *extra) { -struct zd1201 *zd = (struct zd1201 *)dev->priv; +struct zd1201 *zd =netdev_priv (dev);short maxassoc;int err;@@ -1731,6 +1731,7 @@ static int zd1201_probe(struct usb_interface *interface, const struct usb_device_id *id) {struct zd1201 *zd; +struct net_device *dev;struct usb_device *usb;int err;short porttype;
drivers/net/wireless/zd1201.c static int zd1201_probe(struct usb_interface *interface, · line 1746
Quoted 10 lines
drivers/net/wireless/zd1201.c +4
-2@@ -1738,9 +1739,12 @@ static int zd1201_probe(struct usb_interface *interface, usb =interface_to_usbdev (interface); - zd =kzalloc (sizeof (struct zd1201 ),GFP_KERNEL ); -if (!zd) + dev =alloc_etherdev (sizeof (*zd)); +if (!dev)return -ENOMEM ; + zd =netdev_priv (dev); + zd->dev = dev;
This also fixes a bug where the driver would crash if sysfs files were open when module was removed. See Documentation/networking/driver.txt --
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Wang Chen
Reviewed-byRe: [PATCH] netdevice zd1201: Convert directly reference of netdev->priv to netdev_priv()
In reply to a message not in the archiveJohn W. Linville said the following on 2008-11-1 2:48:
Quoted 22 lines
We have some reasons to kill
netdev->priv:
1.netdev->privis equal tonetdev_priv().
2.netdev_priv()wraps the calculation of netdev->priv's offset, obviouslynetdev_priv()is more flexible thannetdev->priv.
But we cann't killnetdev->priv, because so many drivers reference to it directly.OK, becasue Dave S. Miller said, "every direct
netdev->privusage is a bug", and I want to killnetdev->privlater, I decided to convert all the direct reference ofnetdev->privfirst.(Original patch posted by Wang Chen <[email protected]> w/ above changelog but using
dev->ml_priv. That doesn't seem appropriate to me for this driver, so I've revamped it to usenetdev_priv()instead. -- JWL)Cc Wang Chen <[email protected]>Signed-off-by John W. Linville <[email protected]>--- drivers/net/wireless/zd1201.c | 115 ++++++++++++++++++++--------------------- 1 files changed, 56 insertions(+), 59 deletions(-)
snip...
Quoted 10 lines
drivers/net/wireless/zd1201.c +1
-0@@ -1731,6 +1731,7 @@ static int zd1201_probe(struct usb_interface *interface, const struct usb_device_id *id) {struct zd1201 *zd; +struct net_device *dev;struct usb_device *usb;int err;short porttype;@@ -1738,9 +1739,12 @@ static int zd1201_probe(struct usb_interface *interface,
drivers/net/wireless/zd1201.c static int zd1201_probe(struct usb_interface *interface, · line 1747
Quoted 10 lines
drivers/net/wireless/zd1201.c +5
-2usb =interface_to_usbdev (interface); - zd =kzalloc (sizeof (struct zd1201 ),GFP_KERNEL ); -if (!zd) + dev =alloc_etherdev (sizeof (*zd)); +if (!dev)return -ENOMEM ; + zd =netdev_priv (dev); + zd->dev = dev; +
It's ok to me.
Reviewed-by Wang Chen <[email protected]>
PATCH 1/1 netdevice zd1201: Use after free
In reply to John W. Linville| commit 3d29b0c33d431ecc69ec778f8c236d382f59a85f | Author: John W. Linville <[email protected]> | Date: Fri Oct 31 14:13:12 2008 -0400 | | netdevice zd1201: Convert directly reference of netdev->priv to netdev_priv() | | We have some reasons to kill netdev->priv: | 1. netdev->priv is equal to netdev_priv(). | 2. netdev_priv() wraps the calculation of netdev->priv's offset, obviously | netdev_priv() is more flexible than netdev->priv. | But we cann't kill netdev->priv, because so many drivers reference to it | directly. | | OK, becasue Dave S. Miller said, "every direct netdev->priv usage is a bug", | and I want to kill netdev->priv later, I decided to convert all the direct | reference of netdev->priv first. | | (Original patch posted by Wang Chen <[email protected]> w/ above | changelog but using dev->ml_priv. That doesn't seem appropriate | to me for this driver, so I've revamped it to use netdev_priv() | instead. -- JWL)
This commit changed the allocation of netdev, but didn't change the free method of it.
This causes "zd" be used after the memory, which is pointed by "zd", being freed by free_netdev().
Signed-off-by Wang Chen <[email protected]>
Cc John W. Linville <[email protected]>
--- drivers/net/wireless/zd1201.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
drivers/net/wireless/zd1201.c +5 -5
@@ -1841,10 +1841,6 @@ static void zd1201_disconnect(struct usb_interface *interface)if (!zd)return ;usb_set_intfdata (interface,NULL ); -if (zd->dev) { -unregister_netdev (zd->dev); -free_netdev (zd->dev); - }hlist_for_each_entry_safe (frag, node, node2, &zd->fraglist, fnode) {hlist_del_init (&frag->fnode);
@@ -1860,7 +1856,11 @@ static void zd1201_disconnect(struct usb_interface *interface)usb_kill_urb (zd->rx_urb);usb_free_urb (zd->rx_urb); } -kfree (zd); + +if (zd->dev) { +unregister_netdev (zd->dev); +free_netdev (zd->dev); + } }#ifdef CONFIG_PM
Signature · 1 line
1.5.3.4
Re: [PATCH -next] netdevice zd1201: Use after free
Quoted 22 lines · Wang Chen
| commit 3d29b0c33d431ecc69ec778f8c236d382f59a85f | Author: John W. Linville <[email protected]> | Date: Fri Oct 31 14:13:12 2008 -0400 | | netdevice zd1201: Convert directly reference of netdev->priv to netdev_priv() | | We have some reasons to kill netdev->priv: | 1. netdev->priv is equal to netdev_priv(). | 2. netdev_priv() wraps the calculation of netdev->priv's offset, obviously | netdev_priv() is more flexible than netdev->priv. | But we cann't kill netdev->priv, because so many drivers reference to it | directly. | | OK, becasue Dave S. Miller said, "every direct netdev->priv usage is a bug", | and I want to kill netdev->priv later, I decided to convert all the direct | reference of netdev->priv first. | | (Original patch posted by Wang Chen <[email protected]> w/ above | changelog but using dev->ml_priv. That doesn't seem appropriate | to me for this driver, so I've revamped it to use netdev_priv() | instead. -- JWL)
Quoted 4 lines
This commit changed the allocation of netdev, but didn't change the free method of it.
This causes "zd" be used after the memory, which is pointed by "zd", being freed byfree_netdev().
Oops...thanks!
John
Signature · 2 lines
John W. Linville Linux should be at the core [email protected] of your literate lifestyle.
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH -next] netdevice zd1201: Use after free
From: Wang Chen <[email protected]>
Date: Thu, 18 Dec 2008 14:53:31 +0800
Quoted 5 lines
| commit 3d29b0c33d431ecc69ec778f8c236d382f59a85f | Author: John W. Linville <[email protected]> | Date: Fri Oct 31 14:13:12 2008 -0400 | | netdevice zd1201: Convert directly reference of netdev->priv to netdev_priv()
...
Quoted 7 lines
This commit changed the allocation of netdev, but didn't change the free method of it.
This causes "zd" be used after the memory, which is pointed by "zd", being freed byfree_netdev().Signed-off-by Wang Chen <[email protected]>
Patch applied to net-next-2.6, thanks!
PATCH 14/18 netdevice airo: Convert directly reference of netdev->priv to netdev->ml_priv
In reply to Wang ChenWe have some reasons to kill netdev->priv:
1. netdev->priv is equal to netdev_priv().
2. netdev_priv() wraps the calculation of netdev->priv's offset, obviously netdev_priv() is more flexible than netdev->priv.
But we cann't kill netdev->priv, because so many drivers reference to it directly.
OK, becasue Dave S. Miller said, "every direct netdev->priv usage is a bug", and I want to kill netdev->priv later, I decided to convert all the direct reference of netdev->priv first.
Different to readonly reference of netdev->priv, in this driver, netdev->priv was changed. I use netdev->ml_priv to replace netdev->priv.
Signed-off-by Wang Chen <[email protected]>
--- drivers/net/wireless/airo.c | 171 ++++++++++++++++++++++--------------------- 1 files changed, 86 insertions(+), 85 deletions(-)
drivers/net/wireless/airo.c +86 -85
@@ -1270,6 +1270,7 @@ static int flashrestart(struct airo_info *ai,struct net_device *dev); #define airo_print_err(name, fmt, args...) \ airo_print(KERN_ERR, name, fmt, ##args) +#define AIRO_FLASH (dev) (((struct airo_info *)dev->ml_priv)->flash)/*********************************************************************** * MIC ROUTINES *
@@ -1865,7 +1866,7 @@ static void try_auto_wep(struct airo_info *ai) }static int airo_open (struct net_device *dev) { -struct airo_info *ai = dev->priv; +struct airo_info *ai = dev->ml_priv;int rc =0 ;if (test_bit (FLAG_FLASHING , &ai->flags))
@@ -1912,7 +1913,7 @@ static int airo_open(struct net_device *dev) {static int mpi_start_xmit (struct sk_buff *skb,struct net_device *dev) {int npacks, pending;unsigned long flags; -struct airo_info *ai = dev->priv; +struct airo_info *ai = dev->ml_priv;if (!skb) {airo_print_err (dev->name,"%s: skb == NULL!" ,__FUNCTION__);
@@ -1956,7 +1957,7 @@ static int mpi_send_packet (struct net_device *dev)unsigned char *buffer;s16 len;__le16 *payloadLen; -struct airo_info *ai = dev->priv; +struct airo_info *ai = dev->ml_priv;u8 *sendbuf;/* get a packet to send */
@@ -2085,7 +2086,7 @@ static void get_tx_error(struct airo_info *ai, s32 fid)static void airo_end_xmit (struct net_device *dev) {u16 status;int i; -struct airo_info *priv = dev->priv; +struct airo_info *priv = dev->ml_priv;struct sk_buff *skb = priv->xmit.skb;int fid = priv->xmit.fid;u32 *fids = priv->fids;
@@ -2111,7 +2112,7 @@ static void airo_end_xmit(struct net_device *dev) {static int airo_start_xmit (struct sk_buff *skb,struct net_device *dev) {s16 len;int i, j; -struct airo_info *priv = dev->priv; +struct airo_info *priv = dev->ml_priv;u32 *fids = priv->fids;if ( skb ==NULL ) {
@@ -2150,7 +2151,7 @@ static int airo_start_xmit(struct sk_buff *skb, struct net_device *dev) {static void airo_end_xmit11 (struct net_device *dev) {u16 status;int i; -struct airo_info *priv = dev->priv; +struct airo_info *priv = dev->ml_priv;struct sk_buff *skb = priv->xmit11.skb;int fid = priv->xmit11.fid;u32 *fids = priv->fids;
@@ -2176,7 +2177,7 @@ static void airo_end_xmit11(struct net_device *dev) {static int airo_start_xmit11 (struct sk_buff *skb,struct net_device *dev) {s16 len;int i, j; -struct airo_info *priv = dev->priv; +struct airo_info *priv = dev->ml_priv;u32 *fids = priv->fids;if (test_bit (FLAG_MPI , &priv->flags)) {
@@ -2220,7 +2221,7 @@ static int airo_start_xmit11(struct sk_buff *skb, struct net_device *dev) {static void airo_read_stats (struct net_device *dev) { -struct airo_info *ai = dev->priv; +struct airo_info *ai = dev->ml_priv;StatsRid stats_rid;__le32 *vals = stats_rid.vals;
@@ -2254,7 +2255,7 @@ static void airo_read_stats(struct net_device *dev)static struct net_device_stats *airo_get_stats (struct net_device *dev) { -struct airo_info *local = dev->priv; +struct airo_info *local = dev->ml_priv;if (!test_bit (JOB_STATS , &local->jobs)) {/* Get stats out of the card if available */
@@ -2281,7 +2282,7 @@ static void airo_set_promisc(struct airo_info *ai) { }static void airo_set_multicast_list (struct net_device *dev) { -struct airo_info *ai = dev->priv; +struct airo_info *ai = dev->ml_priv;if ((dev->flags ^ ai->flags) &IFF_PROMISC ) {change_bit (FLAG_PROMISC , &ai->flags);
@@ -2299,7 +2300,7 @@ static void airo_set_multicast_list(struct net_device *dev) {static int airo_set_mac_address (struct net_device *dev,void *p) { -struct airo_info *ai = dev->priv; +struct airo_info *ai = dev->ml_priv;struct sockaddr *addr = p;readConfigRid (ai,1 );
@@ -2339,7 +2340,7 @@ static void del_airo_dev(struct airo_info *ai) }static int airo_close (struct net_device *dev) { -struct airo_info *ai = dev->priv; +struct airo_info *ai = dev->ml_priv;netif_stop_queue (dev);
@@ -2365,7 +2366,7 @@ static int airo_close(struct net_device *dev) {void stop_airo_card (struct net_device *dev,int freeres ) { -struct airo_info *ai = dev->priv; +struct airo_info *ai = dev->ml_priv;set_bit (FLAG_RADIO_DOWN , &ai->flags);disable_MAC (ai,1 );
@@ -2665,7 +2666,7 @@ static struct net_device *init_wifidev(struct airo_info *ai,struct net_device *dev =alloc_netdev (0 ,"wifi%d" , wifi_setup);if (!dev)return NULL ; - dev->priv = ethdev->priv; + dev->ml_priv = ethdev->ml_priv; dev->irq = ethdev->irq; dev->base_addr = ethdev->base_addr; dev->wireless_data = ethdev->wireless_data;
@@ -2680,7 +2681,7 @@ static struct net_device *init_wifidev(struct airo_info *ai, }static int reset_card (struct net_device *dev ,int lock) { -struct airo_info *ai = dev->priv; +struct airo_info *ai = dev->ml_priv;if (lock &&down_interruptible (&ai->sem))return -1 ;
@@ -2766,7 +2767,7 @@ static struct net_device *_init_airo_card( unsigned short irq, int port,return NULL ; } - ai = dev->priv; + ai = dev->ml_priv =netdev_priv (dev); ai->wifidev =NULL ; ai->flags =1 <<FLAG_RADIO_DOWN ; ai->jobs =0 ;
@@ -2868,7 +2869,7 @@ static struct net_device *_init_airo_card( unsigned short irq, int port,for ( i =0 ; i <MAX_FIDS ; i++ ) ai->fids[i] =transmit_allocate (ai,AIRO_DEF_MTU ,i>=MAX_FIDS /2 ); -if (setup_proc_entry (dev, dev->priv) <0 ) +if (setup_proc_entry (dev, dev->ml_priv) <0 ) goto err_out_wifi;return dev;
@@ -2917,7 +2918,7 @@ static int waitbusy (struct airo_info *ai) {int reset_airo_card (struct net_device *dev ) {int i; -struct airo_info *ai = dev->priv; +struct airo_info *ai = dev->ml_priv;DECLARE_MAC_BUF (mac);if (reset_card (dev,1 ))
@@ -2942,7 +2943,7 @@ int reset_airo_card( struct net_device *dev )EXPORT_SYMBOL (reset_airo_card);static void airo_send_event (struct net_device *dev) { -struct airo_info *ai = dev->priv; +struct airo_info *ai = dev->ml_priv;union iwreq_data wrqu;StatusRid status_rid;
@@ -3019,7 +3020,7 @@ out:static int airo_thread (void *data) {struct net_device *dev = data; -struct airo_info *ai = dev->priv; +struct airo_info *ai = dev->ml_priv;int locked;set_freezable ();
@@ -3134,7 +3135,7 @@ static irqreturn_t airo_interrupt(int irq, void *dev_id)struct net_device *dev = dev_id;u16 status;u16 fid; -struct airo_info *apriv = dev->priv; +struct airo_info *apriv = dev->ml_priv;u16 savedInterrupts =0 ;int handled =0 ;
@@ -4604,7 +4605,7 @@ static int proc_status_open(struct inode *inode, struct file *file)struct proc_data *data;struct proc_dir_entry *dp =PDE (inode);struct net_device *dev = dp->data; -struct airo_info *apriv = dev->priv; +struct airo_info *apriv = dev->ml_priv;CapabilityRid cap_rid;StatusRid status_rid;u16 mode;
@@ -4687,7 +4688,7 @@ static int proc_stats_rid_open( struct inode *inode,struct proc_data *data;struct proc_dir_entry *dp =PDE (inode);struct net_device *dev = dp->data; -struct airo_info *apriv = dev->priv; +struct airo_info *apriv = dev->ml_priv;StatsRid stats;int i, j;__le32 *vals = stats.vals;
@@ -4750,7 +4751,7 @@ static void proc_config_on_close(struct inode *inode, struct file *file)struct proc_data *data = file->private_data;struct proc_dir_entry *dp =PDE (inode);struct net_device *dev = dp->data; -struct airo_info *ai = dev->priv; +struct airo_info *ai = dev->ml_priv;char *line;if ( !data->writelen )return ;
@@ -4962,7 +4963,7 @@ static int proc_config_open(struct inode *inode, struct file *file)struct proc_data *data;struct proc_dir_entry *dp =PDE (inode);struct net_device *dev = dp->data; -struct airo_info *ai = dev->priv; +struct airo_info *ai = dev->ml_priv;int i;__le16 mode;
@@ -5053,7 +5054,7 @@ static void proc_SSID_on_close(struct inode *inode, struct file *file)struct proc_data *data = (struct proc_data *)file->private_data;struct proc_dir_entry *dp =PDE (inode);struct net_device *dev = dp->data; -struct airo_info *ai = dev->priv; +struct airo_info *ai = dev->ml_priv;SsidRid SSID_rid;int i;char *p = data->wbuffer;
@@ -5096,7 +5097,7 @@ static void proc_APList_on_close( struct inode *inode, struct file *file ) {struct proc_data *data = (struct proc_data *)file->private_data;struct proc_dir_entry *dp =PDE (inode);struct net_device *dev = dp->data; -struct airo_info *ai = dev->priv; +struct airo_info *ai = dev->ml_priv;APListRid APList_rid;int i;
@@ -5191,7 +5192,7 @@ static void proc_wepkey_on_close( struct inode *inode, struct file *file ) {struct proc_data *data;struct proc_dir_entry *dp =PDE (inode);struct net_device *dev = dp->data; -struct airo_info *ai = dev->priv; +struct airo_info *ai = dev->ml_priv;int i;char key[16 ];u16 index =0 ;
@@ -5233,7 +5234,7 @@ static int proc_wepkey_open( struct inode *inode, struct file *file )struct proc_data *data;struct proc_dir_entry *dp =PDE (inode);struct net_device *dev = dp->data; -struct airo_info *ai = dev->priv; +struct airo_info *ai = dev->ml_priv;char *ptr;WepKeyRid wkr;__le16 lastindex;
@@ -5282,7 +5283,7 @@ static int proc_SSID_open(struct inode *inode, struct file *file)struct proc_data *data;struct proc_dir_entry *dp =PDE (inode);struct net_device *dev = dp->data; -struct airo_info *ai = dev->priv; +struct airo_info *ai = dev->ml_priv;int i;char *ptr;SsidRid SSID_rid;
@@ -5326,7 +5327,7 @@ static int proc_APList_open( struct inode *inode, struct file *file ) {struct proc_data *data;struct proc_dir_entry *dp =PDE (inode);struct net_device *dev = dp->data; -struct airo_info *ai = dev->priv; +struct airo_info *ai = dev->ml_priv;int i;char *ptr;APListRid APList_rid;
@@ -5368,7 +5369,7 @@ static int proc_BSSList_open( struct inode *inode, struct file *file ) {struct proc_data *data;struct proc_dir_entry *dp =PDE (inode);struct net_device *dev = dp->data; -struct airo_info *ai = dev->priv; +struct airo_info *ai = dev->ml_priv;char *ptr;BSSListRid BSSList_rid;int rc;
@@ -5447,7 +5448,7 @@ static int proc_close( struct inode *inode, struct file *file )associated we will check every minute to see if anything has changed. */ static void timer_func (struct net_device *dev ) { -struct airo_info *apriv = dev->priv; +struct airo_info *apriv = dev->ml_priv;/* We don't have a link so try changing the authtype */ readConfigRid (apriv,0 );
@@ -5518,7 +5519,7 @@ static void __devexit airo_pci_remove(struct pci_dev *pdev)static int airo_pci_suspend (struct pci_dev *pdev,pm_message_t state) {struct net_device *dev =pci_get_drvdata (pdev); -struct airo_info *ai = dev->priv; +struct airo_info *ai = dev->ml_priv;Cmd cmd;Resp rsp;
@@ -5550,7 +5551,7 @@ static int airo_pci_suspend(struct pci_dev *pdev, pm_message_t state)static int airo_pci_resume (struct pci_dev *pdev) {struct net_device *dev =pci_get_drvdata (pdev); -struct airo_info *ai = dev->priv; +struct airo_info *ai = dev->ml_priv;pci_power_t prev_state = pdev->current_state;pci_set_power_state (pdev,PCI_D0 );
@@ -5729,7 +5730,7 @@ static int airo_set_freq(struct net_device *dev,struct iw_freq *fwrq, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;int rc = -EINPROGRESS ;/* Call commit handler */ /* If setting by frequency, convert to a channel */
@@ -5774,7 +5775,7 @@ static int airo_get_freq(struct net_device *dev,struct iw_freq *fwrq, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;StatusRid status_rid;/* Card status info */ int ch;
@@ -5805,7 +5806,7 @@ static int airo_set_essid(struct net_device *dev,struct iw_point *dwrq, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;SsidRid SSID_rid;/* SSIDs */ /* Reload the list of current SSID */
@@ -5851,7 +5852,7 @@ static int airo_get_essid(struct net_device *dev,struct iw_point *dwrq, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;StatusRid status_rid;/* Card status info */ readStatusRid (local, &status_rid,1 );
@@ -5879,7 +5880,7 @@ static int airo_set_wap(struct net_device *dev,struct sockaddr *awrq, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;Cmd cmd;Resp rsp;APListRid APList_rid;
@@ -5916,7 +5917,7 @@ static int airo_get_wap(struct net_device *dev,struct sockaddr *awrq, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;StatusRid status_rid;/* Card status info */ readStatusRid (local, &status_rid,1 );
@@ -5937,7 +5938,7 @@ static int airo_set_nick(struct net_device *dev,struct iw_point *dwrq, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;/* Check the size of the string */ if (dwrq->length >16 ) {
@@ -5960,7 +5961,7 @@ static int airo_get_nick(struct net_device *dev,struct iw_point *dwrq, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;readConfigRid (local,1 );strncpy (extra, local->config.nodeName,16 );
@@ -5979,7 +5980,7 @@ static int airo_set_rate(struct net_device *dev,struct iw_param *vwrq, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;CapabilityRid cap_rid;/* Card capability info */ u8 brate =0 ;int i;
@@ -6049,7 +6050,7 @@ static int airo_get_rate(struct net_device *dev,struct iw_param *vwrq, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;StatusRid status_rid;/* Card status info */ readStatusRid (local, &status_rid,1 );
@@ -6071,7 +6072,7 @@ static int airo_set_rts(struct net_device *dev,struct iw_param *vwrq, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;int rthr = vwrq->value;if (vwrq->disabled)
@@ -6095,7 +6096,7 @@ static int airo_get_rts(struct net_device *dev,struct iw_param *vwrq, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;readConfigRid (local,1 ); vwrq->value =le16_to_cpu (local->config.rtsThres);
@@ -6114,7 +6115,7 @@ static int airo_set_frag(struct net_device *dev,struct iw_param *vwrq, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;int fthr = vwrq->value;if (vwrq->disabled)
@@ -6139,7 +6140,7 @@ static int airo_get_frag(struct net_device *dev,struct iw_param *vwrq, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;readConfigRid (local,1 ); vwrq->value =le16_to_cpu (local->config.fragThresh);
@@ -6158,7 +6159,7 @@ static int airo_set_mode(struct net_device *dev, __u32 *uwrq, char *extra) { -struct airo_info *local = dev->priv; +struct airo_info *local = dev->ml_priv;int reset =0 ;readConfigRid (local,1 );
@@ -6221,7 +6222,7 @@ static int airo_get_mode(struct net_device *dev, __u32 *uwrq, char *extra) { -struct airo_info *local = dev->priv; +struct airo_info *local = dev->ml_priv;readConfigRid (local,1 );/* If not managed, assume it's ad-hoc */
@@ -6258,7 +6259,7 @@ static int airo_set_encode(struct net_device *dev,struct iw_point *dwrq, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;CapabilityRid cap_rid;/* Card capability info */ int perm = ( dwrq->flags &IW_ENCODE_TEMP ?0 :1 );__le16 currentAuthType = local->config.authType;
@@ -6345,7 +6346,7 @@ static int airo_get_encode(struct net_device *dev,struct iw_point *dwrq, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;int index = (dwrq->flags &IW_ENCODE_INDEX ) -1 ;CapabilityRid cap_rid;/* Card capability info */
@@ -6393,7 +6394,7 @@ static int airo_set_encodeext(struct net_device *dev,union iwreq_data *wrqu, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;struct iw_point *encoding = &wrqu->encoding;struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;CapabilityRid cap_rid;/* Card capability info */
@@ -6479,7 +6480,7 @@ static int airo_get_encodeext(struct net_device *dev,union iwreq_data *wrqu, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;struct iw_point *encoding = &wrqu->encoding;struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;CapabilityRid cap_rid;/* Card capability info */
@@ -6542,7 +6543,7 @@ static int airo_set_auth(struct net_device *dev,struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;struct iw_param *param = &wrqu->param;__le16 currentAuthType = local->config.authType;
@@ -6610,7 +6611,7 @@ static int airo_get_auth(struct net_device *dev,struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;struct iw_param *param = &wrqu->param;__le16 currentAuthType = local->config.authType;
@@ -6659,7 +6660,7 @@ static int airo_set_txpow(struct net_device *dev,struct iw_param *vwrq, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;CapabilityRid cap_rid;/* Card capability info */ int i;int rc = -EINVAL ;
@@ -6696,7 +6697,7 @@ static int airo_get_txpow(struct net_device *dev,struct iw_param *vwrq, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;readConfigRid (local,1 ); vwrq->value =le16_to_cpu (local->config.txPower);
@@ -6716,7 +6717,7 @@ static int airo_set_retry(struct net_device *dev,struct iw_param *vwrq, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;int rc = -EINVAL ;if (vwrq->disabled) {
@@ -6754,7 +6755,7 @@ static int airo_get_retry(struct net_device *dev,struct iw_param *vwrq, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv; vwrq->disabled =0 ;/* Can't be disabled */
@@ -6785,7 +6786,7 @@ static int airo_get_range(struct net_device *dev,struct iw_point *dwrq, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;struct iw_range *range = (struct iw_range *) extra;CapabilityRid cap_rid;/* Card capability info */ int i;
@@ -6910,7 +6911,7 @@ static int airo_set_power(struct net_device *dev,struct iw_param *vwrq, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;readConfigRid (local,1 );if (vwrq->disabled) {
@@ -6967,7 +6968,7 @@ static int airo_get_power(struct net_device *dev,struct iw_param *vwrq, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;__le16 mode;readConfigRid (local,1 );
@@ -6998,7 +6999,7 @@ static int airo_set_sens(struct net_device *dev,struct iw_param *vwrq, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;readConfigRid (local,1 ); local->config.rssiThreshold =
@@ -7017,7 +7018,7 @@ static int airo_get_sens(struct net_device *dev,struct iw_param *vwrq, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;readConfigRid (local,1 ); vwrq->value =le16_to_cpu (local->config.rssiThreshold);
@@ -7037,7 +7038,7 @@ static int airo_get_aplist(struct net_device *dev,struct iw_point *dwrq, char *extra) { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;struct sockaddr *address = (struct sockaddr *) extra;struct iw_quality qual[IW_MAX_AP ];BSSListRid BSSList;
@@ -7110,7 +7111,7 @@ static int airo_set_scan(struct net_device *dev,struct iw_param *vwrq, char *extra) { - struct airo_info *ai = dev->priv; + struct airo_info *ai = dev->ml_priv;Cmd cmd;Resp rsp;int wake =0 ;
@@ -7156,7 +7157,7 @@ static inline char *airo_translate_scan(struct net_device *dev,char *end_buf, BSSListRid *bss) { - struct airo_info *ai = dev->priv; + struct airo_info *ai = dev->ml_priv;struct iw_event iwe;/* Temporary buffer */ __le16 capabilities;char * current_val;/* For rates */
@@ -7338,7 +7339,7 @@ static int airo_get_scan(struct net_device *dev,struct iw_point *dwrq, char *extra) { - struct airo_info *ai = dev->priv; + struct airo_info *ai = dev->ml_priv;BSSListElement *net;int err =0 ;char *current_ev = extra;
@@ -7382,7 +7383,7 @@ static int airo_config_commit(struct net_device *dev,void *zwrq,/* NULL */ char *extra) /* NULL */ { - struct airo_info *local = dev->priv; + struct airo_info *local = dev->ml_priv;if (!test_bit (FLAG_COMMIT , &local->flags))return 0 ;
@@ -7527,7 +7528,7 @@ static const struct iw_handler_def airo_handler_def =static int airo_ioctl (struct net_device *dev,struct ifreq *rq,int cmd) {int rc =0 ; -struct airo_info *ai = (struct airo_info *)dev->priv; +struct airo_info *ai = dev->ml_priv;if (ai->power.event)return 0 ;
@@ -7655,7 +7656,7 @@ static void airo_read_wireless_stats(struct airo_info *local)static struct iw_statistics *airo_get_wireless_stats (struct net_device *dev) { -struct airo_info *local = dev->priv; +struct airo_info *local = dev->ml_priv;if (!test_bit (JOB_WSTATS , &local->jobs)) {/* Get stats out of the card if available */
@@ -7680,7 +7681,7 @@ static int readrids(struct net_device *dev, aironet_ioctl *comp) {unsigned short ridcode;unsigned char *iobuf;int len; -struct airo_info *ai = dev->priv; +struct airo_info *ai = dev->ml_priv;if (test_bit (FLAG_FLASHING , &ai->flags))return -EIO ;
@@ -7746,7 +7747,7 @@ static int readrids(struct net_device *dev, aironet_ioctl *comp) {*/ static int writerids (struct net_device *dev,aironet_ioctl *comp) { -struct airo_info *ai = dev->priv; +struct airo_info *ai = dev->ml_priv;int ridcode;int enabled;static int (* writer)(struct airo_info *,u16 rid,const void *,int ,int );
@@ -7869,41 +7870,41 @@ static int flashcard(struct net_device *dev, aironet_ioctl *comp) {switch (comp->command) {case AIROFLSHRST : -return cmdreset ((struct airo_info *)dev->priv); +return cmdreset ((struct airo_info *)dev->ml_priv);case AIROFLSHSTFL : -if (!((struct airo_info *)dev->priv)->flash && - (((struct airo_info *)dev->priv)->flash =kmalloc (FLASHSIZE ,GFP_KERNEL )) ==NULL ) +if (!AIRO_FLASH (dev) && + (AIRO_FLASH (dev) =kmalloc (FLASHSIZE ,GFP_KERNEL )) ==NULL )return -ENOMEM ; -return setflashmode ((struct airo_info *)dev->priv); +return setflashmode ((struct airo_info *)dev->ml_priv);case AIROFLSHGCHR :/* Get char from aux */ if (comp->len !=sizeof (int ))return -EINVAL ;if (copy_from_user (&z,comp->data,comp->len))return -EFAULT ; -return flashgchar ((struct airo_info *)dev->priv,z,8000 ); +return flashgchar ((struct airo_info *)dev->ml_priv, z,8000 );case AIROFLSHPCHR :/* Send char to card. */ if (comp->len !=sizeof (int ))return -EINVAL ;if (copy_from_user (&z,comp->data,comp->len))return -EFAULT ; -return flashpchar ((struct airo_info *)dev->priv,z,8000 ); +return flashpchar ((struct airo_info *)dev->ml_priv, z,8000 );case AIROFLPUTBUF :/* Send 32k to card */ -if (!((struct airo_info *)dev->priv)->flash) +if (!AIRO_FLASH (dev))return -ENOMEM ;if (comp->len >FLASHSIZE )return -EINVAL ; -if (copy_from_user (((struct airo_info *)dev->priv)->flash,comp->data,comp->len)) +if (copy_from_user (AIRO_FLASH (dev), comp->data, comp->len))return -EFAULT ; -flashputbuf ((struct airo_info *)dev->priv); +flashputbuf ((struct airo_info *)dev->ml_priv);return 0 ;case AIRORESTART : -if (flashrestart ((struct airo_info *)dev->priv,dev)) +if (flashrestart ((struct airo_info *)dev->ml_priv, dev))return -EIO ;return 0 ; }
Signature · 1 line
1.5.3.4
Re: [PATCH 14/18] netdevice airo: Convert directly reference of netdev->priv to netdev->ml_priv
Quoted 7 lines · Wang Chen
We have some reasons to kill
netdev->priv:
1.netdev->privis equal tonetdev_priv().
2.netdev_priv()wraps the calculation of netdev->priv's offset, obviouslynetdev_priv()is more flexible thannetdev->priv.
But we cann't killnetdev->priv, because so many drivers reference to it directly.
Quoted 8 lines
OK, becasue Dave S. Miller said, "every direct
netdev->privusage is a bug", and I want to killnetdev->privlater, I decided to convert all the direct reference ofnetdev->privfirst.Different to readonly reference of
netdev->priv, in this driver,netdev->privwas changed. I usenetdev->ml_privto replacenetdev->priv.Signed-off-by Wang Chen <[email protected]>
Thank you for your patch. However, I do not understand why you didn't simply replace netdev->priv with netdev_priv()? Can you explain?
Thanks,
John
Signature · 2 lines
John W. Linville [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH 14/18] netdevice airo: Convert directly reference of netdev->priv to netdev->ml_priv
Quoted 12 lines · John W. Linville
Quoted 11 lines · Wang Chen
We have some reasons to kill
netdev->priv:
1.netdev->privis equal tonetdev_priv().
2.netdev_priv()wraps the calculation of netdev->priv's offset, obviouslynetdev_priv()is more flexible thannetdev->priv.
But we cann't killnetdev->priv, because so many drivers reference to it directly.OK, becasue Dave S. Miller said, "every direct
netdev->privusage is a bug", and I want to killnetdev->privlater, I decided to convert all the direct reference ofnetdev->privfirst.
Quoted 7 lines
Quoted 4 lines
Different to readonly reference of
netdev->priv, in this driver,netdev->privwas changed. I usenetdev->ml_privto replacenetdev->priv.Signed-off-by Wang Chen <[email protected]>Thank you for your patch. However, I do not understand why you didn't simply replace
netdev->privwithnetdev_priv()? Can you explain?
Yeah, that would have been my first choice too...
Dan
A message that is not in the archive (sent off-list or not yet received): 1220634383.6430.14.camel-bi+AKbBUZKY6gyzm1THtWbp2dZbC/[email protected]
Re: [PATCH 14/18] netdevice airo: Convert directly reference of netdev->priv to netdev->ml_priv
Dan Williams said the following on 2008-9-6 1:06:
Quoted 13 lines · John W. Linville
Quoted 12 lines · Wang Chen
Quoted 11 lines
We have some reasons to kill
netdev->priv:
1.netdev->privis equal tonetdev_priv().
2.netdev_priv()wraps the calculation of netdev->priv's offset, obviouslynetdev_priv()is more flexible thannetdev->priv.
But we cann't killnetdev->priv, because so many drivers reference to it directly.OK, becasue Dave S. Miller said, "every direct
netdev->privusage is a bug", and I want to killnetdev->privlater, I decided to convert all the direct reference ofnetdev->privfirst.
Quoted 9 lines
Quoted 6 lines
Quoted 4 lines
Different to readonly reference of
netdev->priv, in this driver,netdev->privwas changed. I usenetdev->ml_privto replacenetdev->priv.Signed-off-by Wang Chen <[email protected]>Thank you for your patch. However, I do not understand why you didn't simply replace
netdev->privwithnetdev_priv()? Can you explain?Yeah, that would have been my first choice too...
1. Why I don't use netdev_priv() to replace netdev->priv here? Because, here
drivers/net/wireless/airo.c static struct net_device *_init_airo_card( unsigned short irq, int port, · line 2770
Quoted 12 lines
drivers/net/wireless/airo.c +2
-2@@ -2665,7 +2666,7 @@ static struct net_device *init_wifidev(struct airo_info *ai,struct net_device *dev =alloc_netdev (0 ,"wifi%d" , wifi_setup);if (!dev)return NULL ; - dev->priv = ethdev->priv; + dev->ml_priv = ethdev->ml_priv;@@ -2766,7 +2767,7 @@ static struct net_device *_init_airo_card( unsigned short irq, int port,return NULL ; } - ai = dev->priv; + ai = dev->ml_priv =netdev_priv (dev);
netdev->priv was changed here, but it shouldn't, the memory was allocated when alloc_netdev and netdev->priv should always pointed to that memory.
2. Why I use netdev->ml_priv here to replace netdev->priv?
In this driver, netdev->priv are shared by multi wifidevs, that means wifidevs need mid-layer private data, which are all same as their parent netdev. This usage is same as Dave's commit "syncppp: Fix crashes."
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH 14/18] netdevice airo: Convert directly reference of netdev->priv to netdev->ml_priv
Wang Chen said the following on 2008-9-6 17:37:
Quoted 37 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
We have some reasons to kill
netdev->priv:
1.netdev->privis equal tonetdev_priv().
2.netdev_priv()wraps the calculation of netdev->priv's offset, obviouslynetdev_priv()is more flexible thannetdev->priv.
But we cann't killnetdev->priv, because so many drivers reference to it directly.OK, becasue Dave S. Miller said, "every direct
netdev->privusage is a bug", and I want to killnetdev->privlater, I decided to convert all the direct reference ofnetdev->privfirst.Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Different to readonly reference of
netdev->priv, in this driver,netdev->privwas changed. I usenetdev->ml_privto replacenetdev->priv.Signed-off-by Wang Chen <[email protected]>Thank you for your patch. However, I do not understand why you didn't simply replace
netdev->privwithnetdev_priv()? Can you explain?Yeah, that would have been my first choice too...
1. Why I don't use
netdev_priv()to replacenetdev->privhere? Because, hereReview static struct net_device *_init_airo_card( unsigned short irq, int port, · line 2770
Quoted 12 lines
(quoted diff) +2
-2@@ -2665,7 +2666,7 @@ static struct net_device *init_wifidev(struct airo_info *ai, struct net_device *dev = alloc_netdev(0, "wifi%d", wifi_setup); if (!dev) return NULL; - dev->priv = ethdev->priv; + dev->ml_priv = ethdev->ml_priv;@@ -2766,7 +2767,7 @@ static struct net_device *_init_airo_card( unsigned short irq, int port, return NULL; } - ai = dev->priv; + ai = dev->ml_priv = netdev_priv(dev);
netdev->privwas changed here, but it shouldn't, the memory was allocated whenalloc_netdevandnetdev->privshould always pointed to that memory.
Quoted 5 lines
2. Why I use
netdev->ml_privhere to replacenetdev->priv?
In this driver,netdev->privare shared by multi wifidevs, that means wifidevs need mid-layer private data, which are all same as their parent netdev. This usage is same as Dave's commit "syncppp: Fix crashes."
John, do you have any comments about my answer?
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 17/18 netdevice pc300: Convert directly reference of netdev->priv to netdev->ml_priv
In reply to Wang ChenWe have some reasons to kill netdev->priv:
1. netdev->priv is equal to netdev_priv().
2. netdev_priv() wraps the calculation of netdev->priv's offset, obviously netdev_priv() is more flexible than netdev->priv.
But we cann't kill netdev->priv, because so many drivers reference to it directly.
OK, becasue Dave S. Miller said, "every direct netdev->priv usage is a bug", and I want to kill netdev->priv later, I decided to convert all the direct reference of netdev->priv first.
Different to readonly reference of netdev->priv, in this driver, netdev->priv was changed. I use netdev->ml_priv to replace netdev->priv.
Signed-off-by Wang Chen <[email protected]>
--- drivers/net/wan/pc300_drv.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-)
drivers/net/wan/pc300_drv.c +9 -8
@@ -1769,7 +1769,7 @@ cpc_trace(struct net_device *dev, struct sk_buff *skb_main, char rx_tx)static void cpc_tx_timeout (struct net_device *dev) { -pc300dev_t *d = (pc300dev_t *) dev->priv; +pc300dev_t *d = (pc300dev_t *) dev->ml_priv;pc300ch_t *chan = (pc300ch_t *) d->chan;pc300_t *card = (pc300_t *) chan->card;int ch = chan->channel;
@@ -1796,7 +1796,7 @@ static void cpc_tx_timeout(struct net_device *dev)static int cpc_queue_xmit (struct sk_buff *skb,struct net_device *dev) { -pc300dev_t *d = (pc300dev_t *) dev->priv; +pc300dev_t *d = (pc300dev_t *) dev->ml_priv;pc300ch_t *chan = (pc300ch_t *) d->chan;pc300_t *card = (pc300_t *) chan->card;int ch = chan->channel;
@@ -1874,7 +1874,7 @@ static int cpc_queue_xmit(struct sk_buff *skb, struct net_device *dev)static void cpc_net_rx (struct net_device *dev) { -pc300dev_t *d = (pc300dev_t *) dev->priv; +pc300dev_t *d = (pc300dev_t *) dev->ml_priv;pc300ch_t *chan = (pc300ch_t *) d->chan;pc300_t *card = (pc300_t *) chan->card;int ch = chan->channel;
@@ -2522,7 +2522,7 @@ static int cpc_change_mtu(struct net_device *dev, int new_mtu)static int cpc_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) { -pc300dev_t *d = (pc300dev_t *) dev->priv; +pc300dev_t *d = (pc300dev_t *) dev->ml_priv;pc300ch_t *chan = (pc300ch_t *) d->chan;pc300_t *card = (pc300_t *) chan->card;pc300conf_t conf_aux;
@@ -3058,7 +3058,7 @@ static int tx_config(pc300dev_t * d)static int cpc_attach (struct net_device *dev,unsigned short encoding,unsigned short parity) { -pc300dev_t *d = (pc300dev_t *)dev->priv; +pc300dev_t *d = (pc300dev_t *)dev->ml_priv;pc300ch_t *chan = (pc300ch_t *)d->chan;pc300_t *card = (pc300_t *)chan->card;pc300chconf_t *conf = (pc300chconf_t *)&chan->conf;
@@ -3138,7 +3138,7 @@ static void cpc_closech(pc300dev_t * d)int cpc_open (struct net_device *dev) { -pc300dev_t *d = (pc300dev_t *) dev->priv; +pc300dev_t *d = (pc300dev_t *) dev->ml_priv;struct ifreq ifr;int result;
@@ -3166,7 +3166,7 @@ err_out:static int cpc_close (struct net_device *dev) { -pc300dev_t *d = (pc300dev_t *) dev->priv; +pc300dev_t *d = (pc300dev_t *) dev->ml_priv;pc300ch_t *chan = (pc300ch_t *) d->chan;pc300_t *card = (pc300_t *) chan->card;unsigned long flags;
@@ -3372,7 +3372,8 @@ static void cpc_init_card(pc300_t * card) dev->do_ioctl = cpc_ioctl;if (register_hdlc_device (dev) ==0 ) { - dev->priv = d;/* We need 'priv', hdlc doesn't */ +/* We need 'priv', hdlc doesn't */ + dev->ml_priv = d;printk ("%s: Cyclades-PC300/" , dev->name);switch (card->hw.type) {case PC300_TE :
Signature · 1 line
1.5.3.4
Krzysztof Halasa
maintainerRe: [PATCH 17/18] netdevice pc300: Convert directly reference of netdev->priv to netdev->ml_priv
Quoted 2 lines · Wang Chen
drivers/net/wan/pc300_drv.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-)
I think I'll also take this. Though I don't yet know what to do with this driver. Perhaps I should fix it somehow or merge with pc300too.
Thanks.
Signature · 1 line
Krzysztof Halasa
PATCH 18/18 netdevice sbni: Convert directly reference of netdev->priv to netdev_priv()
In reply to Wang ChenWe have some reasons to kill netdev->priv:
1. netdev->priv is equal to netdev_priv().
2. netdev_priv() wraps the calculation of netdev->priv's offset, obviously netdev_priv() is more flexible than netdev->priv.
But we cann't kill netdev->priv, because so many drivers reference to it directly.
OK, becasue Dave S. Miller said, "every direct netdev->priv usage is a bug", and I want to kill netdev->priv later, I decided to convert all the direct reference of netdev->priv first.
Different to readonly reference of netdev->priv, in this driver, netdev->priv was changed. But obviously, the change of netdev->priv is needless.
Signed-off-by Wang Chen <[email protected]>
--- drivers/net/wan/sbni.c | 99 +++++++++++++++++++++++++----------------------- 1 files changed, 52 insertions(+), 47 deletions(-)
drivers/net/wan/sbni.c +52 -47
@@ -186,6 +186,7 @@ static unsigned int netcard_portlist[ ] __initdata = {0x2b0 ,0x2b4 ,0x2c0 ,0x2c4 ,0x2d0 ,0x2d4 ,0x2e0 ,0x2e4 ,0x2f0 ,0x2f4 , 0 }; +#define NET_LOCAL_LOCK (dev) (((struct net_local *)netdev_priv(dev))->lock)/* * Look for SBNI card which addr stored in dev->base_addr, if nonzero.
@@ -287,7 +288,7 @@ static int __init sbni_init(struct net_device *dev) } -int __init +static int __init sbni_pci_probe (struct net_device *dev ) {struct pci_dev *pdev =NULL ;
@@ -378,22 +379,23 @@ sbni_probe1( struct net_device *dev, unsigned long ioaddr, int irq ) dev->irq = irq; dev->base_addr = ioaddr; -/* Allocate dev->priv and fill in sbni-specific dev fields. */ - nl = dev->priv; +/* Fill in sbni-specific dev fields. */ + nl =netdev_priv (dev);if ( !nl ) {printk (KERN_ERR "%s: unable to get memory!\n" , dev->name );release_region ( ioaddr,SBNI_IO_EXTENT );return NULL ; } - dev->priv = nl;memset ( nl,0 ,sizeof (struct net_local ) );spin_lock_init ( &nl->lock );/* store MAC address (generate if that isn't known) */ *(__be16 *)dev->dev_addr =htons (0x00ff ); *(__be32 *)(dev->dev_addr +2 ) =htonl (0x01000000 | - ( (mac[num] ? mac[num] : (u32)((long )dev->priv)) &0x00ffffff ) ); + ((mac[num] ? + mac[num] : + (u32)((long )netdev_priv (dev))) &0x00ffffff ));/* store link settings (speed, receive level ) */ nl->maxframe =DEFAULT_FRAME_LEN ;
@@ -447,7 +449,7 @@ sbni_start_xmit( struct sk_buff *skb, struct net_device *dev )/* Looking for idle device in the list */ for ( p = dev; p; ) { -struct net_local *nl = (struct net_local *) p->priv; +struct net_local *nl =netdev_priv (p);spin_lock ( &nl->lock );if ( nl->tx_buf_p || (nl->state &FL_LINE_DOWN ) ) { p = nl->link;
@@ -469,7 +471,7 @@ sbni_start_xmit( struct sk_buff *skb, struct net_device *dev )static int sbni_start_xmit (struct sk_buff *skb,struct net_device *dev ) { -struct net_local *nl = (struct net_local *) dev->priv; +struct net_local *nl =netdev_priv (dev);netif_stop_queue ( dev );spin_lock ( &nl->lock );
@@ -503,12 +505,12 @@ static irqreturn_t sbni_interrupt( int irq, void *dev_id ) { struct net_device *dev = dev_id; -struct net_local *nl = dev->priv; +struct net_local *nl =netdev_priv (dev);int repeat;spin_lock ( &nl->lock );if ( nl->second ) -spin_lock ( &((struct net_local *) nl->second->priv)->lock ); +spin_lock (&NET_LOCAL_LOCK (nl->second)); do { repeat = 0;
@@ -522,7 +524,7 @@ sbni_interrupt( int irq, void *dev_id ) }while ( repeat );if ( nl->second ) -spin_unlock ( &((struct net_local *)nl->second->priv)->lock ); +spin_unlock (&NET_LOCAL_LOCK (nl->second));spin_unlock ( &nl->lock );return IRQ_HANDLED ; }
@@ -531,7 +533,7 @@ sbni_interrupt( int irq, void *dev_id )static void handle_channel (struct net_device *dev ) { -struct net_local *nl = (struct net_local *) dev->priv; +struct net_local *nl =netdev_priv (dev);unsigned long ioaddr = dev->base_addr;int req_ans;
@@ -540,7 +542,7 @@ handle_channel( struct net_device *dev )#ifdef CONFIG_SBNI_MULTILINE /* Lock the master device because we going to change its local data */ if ( nl->state &FL_SLAVE ) -spin_lock ( &((struct net_local *) nl->master->priv)->lock ); +spin_lock (&NET_LOCAL_LOCK (nl->master));#endif outb ( (inb ( ioaddr +CSR0 ) & ~EN_INT ) |TR_REQ , ioaddr +CSR0 );
@@ -576,7 +578,7 @@ handle_channel( struct net_device *dev )#ifdef CONFIG_SBNI_MULTILINE if ( nl->state &FL_SLAVE ) -spin_unlock ( &((struct net_local *) nl->master->priv)->lock ); +spin_unlock (&NET_LOCAL_LOCK (nl->master));#endif }
@@ -589,7 +591,7 @@ handle_channel( struct net_device *dev )static int recv_frame (struct net_device *dev ) { -struct net_local *nl = (struct net_local *) dev->priv; +struct net_local *nl =netdev_priv (dev);unsigned long ioaddr = dev->base_addr;u32 crc =CRC32_INITIAL ;
@@ -623,7 +625,7 @@ recv_frame( struct net_device *dev )static void send_frame (struct net_device *dev ) { -struct net_local *nl = (struct net_local *) dev->priv; +struct net_local *nl =netdev_priv (dev);u32 crc =CRC32_INITIAL ;
@@ -680,7 +682,7 @@ do_send:static void download_data (struct net_device *dev,u32 *crc_p ) { -struct net_local *nl = (struct net_local *) dev->priv; +struct net_local *nl =netdev_priv (dev);struct sk_buff *skb = nl->tx_buf_p; unsigned len = min_t(unsigned int, skb->len - nl->outpos, nl->framelen);
@@ -699,7 +701,7 @@ static int upload_data( struct net_device *dev, unsigned framelen, unsigned frameno, unsigned is_first, u32 crc ) { - struct net_local *nl = (struct net_local *) dev->priv; + struct net_local *nl = netdev_priv(dev);int frame_ok;
@@ -721,9 +723,9 @@ upload_data( struct net_device *dev, unsigned framelen, unsigned frameno, nl->wait_frameno =0 , nl->inppos =0 , #ifdef CONFIG_SBNI_MULTILINE - ((struct net_local *) nl->master->priv) + ((struct net_local *)netdev_priv (nl->master)) ->stats.rx_errors++, - ((struct net_local *) nl->master->priv) + ((struct net_local *)netdev_priv (nl->master)) ->stats.rx_missed_errors++;#else nl->stats.rx_errors++,
@@ -740,8 +742,10 @@ upload_data( struct net_device *dev, unsigned framelen, unsigned frameno,*/ nl->wait_frameno =0 , #ifdef CONFIG_SBNI_MULTILINE - ((struct net_local *) nl->master->priv)->stats.rx_errors++, - ((struct net_local *) nl->master->priv)->stats.rx_crc_errors++; + ((struct net_local *)netdev_priv (nl->master)) + ->stats.rx_errors++, + ((struct net_local *)netdev_priv (nl->master)) + ->stats.rx_crc_errors++;#else nl->stats.rx_errors++, nl->stats.rx_crc_errors++;
@@ -755,8 +759,8 @@ static inline void send_complete( struct net_local *nl ) {#ifdef CONFIG_SBNI_MULTILINE - ((struct net_local *) nl->master->priv)->stats.tx_packets++; - ((struct net_local *) nl->master->priv)->stats.tx_bytes + ((struct net_local *)netdev_priv (nl->master))->stats.tx_packets++; + ((struct net_local *)netdev_priv (nl->master))->stats.tx_bytes += nl->tx_buf_p->len;#else nl->stats.tx_packets++;
@@ -775,7 +779,7 @@ send_complete( struct net_local *nl )static void interpret_ack (struct net_device *dev,unsigned ack ) { -struct net_local *nl = (struct net_local *) dev->priv; +struct net_local *nl =netdev_priv (dev);if ( ack ==FRAME_SENT_OK ) { nl->state &= ~FL_NEED_RESEND ;
@@ -809,7 +813,7 @@ interpret_ack( struct net_device *dev, unsigned ack )static int append_frame_to_pkt (struct net_device *dev,unsigned framelen,u32 crc ) { -struct net_local *nl = (struct net_local *) dev->priv; +struct net_local *nl =netdev_priv (dev);u8 *p;
@@ -840,7 +844,7 @@ append_frame_to_pkt( struct net_device *dev, unsigned framelen, u32 crc )static void prepare_to_send (struct sk_buff *skb,struct net_device *dev ) { -struct net_local *nl = (struct net_local *) dev->priv; +struct net_local *nl =netdev_priv (dev);unsigned int len;
@@ -871,15 +875,15 @@ prepare_to_send( struct sk_buff *skb, struct net_device *dev )static void drop_xmit_queue (struct net_device *dev ) { -struct net_local *nl = (struct net_local *) dev->priv; +struct net_local *nl =netdev_priv (dev);if ( nl->tx_buf_p )dev_kfree_skb_any ( nl->tx_buf_p ), nl->tx_buf_p =NULL , #ifdef CONFIG_SBNI_MULTILINE - ((struct net_local *) nl->master->priv) + ((struct net_local *)netdev_priv (nl->master)) ->stats.tx_errors++, - ((struct net_local *) nl->master->priv) + ((struct net_local *)netdev_priv (nl->master)) ->stats.tx_carrier_errors++;#else nl->stats.tx_errors++,
@@ -903,7 +907,7 @@ drop_xmit_queue( struct net_device *dev )static void send_frame_header (struct net_device *dev,u32 *crc_p ) { -struct net_local *nl = (struct net_local *) dev->priv; +struct net_local *nl =netdev_priv (dev);u32 crc = *crc_p;u32 len_field = nl->framelen +6 ;/* CRC + frameno + reserved */
@@ -1005,7 +1009,7 @@ get_rx_buf( struct net_device *dev )static void indicate_pkt (struct net_device *dev ) { -struct net_local *nl = (struct net_local *) dev->priv; +struct net_local *nl =netdev_priv (dev);struct sk_buff *skb = nl->rx_buf_p;skb_put ( skb, nl->inppos );
@@ -1014,8 +1018,9 @@ indicate_pkt( struct net_device *dev ) skb->protocol =eth_type_trans ( skb, nl->master );netif_rx ( skb ); dev->last_rx = jiffies; - ++((struct net_local *) nl->master->priv)->stats.rx_packets; - ((struct net_local *) nl->master->priv)->stats.rx_bytes += nl->inppos; + ++((struct net_local *)netdev_priv (nl->master))->stats.rx_packets; + ((struct net_local *)netdev_priv (nl->master))->stats.rx_bytes += + nl->inppos;#else skb->protocol =eth_type_trans ( skb, dev );netif_rx ( skb );
@@ -1038,7 +1043,7 @@ static void sbni_watchdog( unsigned long arg ) {struct net_device *dev = (struct net_device *) arg; -struct net_local *nl = (struct net_local *) dev->priv; +struct net_local *nl =netdev_priv (dev);struct timer_list *w = &nl->watchdog;unsigned long flags;unsigned char csr0;
@@ -1091,7 +1096,7 @@ static unsigned char timeout_rxl_tab[] = {static void card_start (struct net_device *dev ) { -struct net_local *nl = (struct net_local *) dev->priv; +struct net_local *nl =netdev_priv (dev); nl->timer_ticks =CHANGE_LEVEL_START_TICKS ; nl->state &= ~(FL_WAIT_ACK |FL_NEED_RESEND );
@@ -1113,7 +1118,7 @@ card_start( struct net_device *dev )static void change_level (struct net_device *dev ) { -struct net_local *nl = (struct net_local *) dev->priv; +struct net_local *nl =netdev_priv (dev);if ( nl->delta_rxl ==0 )/* do not auto-negotiate RxL */ return ;
@@ -1137,7 +1142,7 @@ change_level( struct net_device *dev )static void timeout_change_level (struct net_device *dev ) { -struct net_local *nl = (struct net_local *) dev->priv; +struct net_local *nl =netdev_priv (dev); nl->cur_rxl_index = timeout_rxl_tab[ nl->timeout_rxl ];if ( ++nl->timeout_rxl >=4 )
@@ -1160,7 +1165,7 @@ timeout_change_level( struct net_device *dev )static int sbni_open (struct net_device *dev ) { -struct net_local *nl = (struct net_local *) dev->priv; +struct net_local *nl =netdev_priv (dev);struct timer_list *w = &nl->watchdog;/*
@@ -1176,7 +1181,7 @@ sbni_open( struct net_device *dev ) || (*p)->base_addr == dev->base_addr - 4) && (*p)->flags & IFF_UP ) { - ((struct net_local *) ((*p)->priv)) + ((struct net_local *) (netdev_priv (*p))) ->second = dev;printk (KERN_NOTICE "%s: using shared irq " "with %s\n" , dev->name, (*p)->name );
@@ -1216,7 +1221,7 @@ handler_attached:static int sbni_close (struct net_device *dev ) { -struct net_local *nl = (struct net_local *) dev->priv; +struct net_local *nl =netdev_priv (dev);if ( nl->second && nl->second->flags &IFF_UP ) { printk( KERN_NOTICE "Secondary channel (%s) is active!\n",
@@ -1300,7 +1305,7 @@ sbni_card_probe( unsigned long ioaddr )static int sbni_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd ) { -struct net_local *nl = (struct net_local *) dev->priv; +struct net_local *nl =netdev_priv (dev);struct sbni_flags flags;int error =0 ;
@@ -1390,8 +1395,8 @@ sbni_ioctl( struct net_device *dev, struct ifreq *ifr, int cmd )static int enslave (struct net_device *dev,struct net_device *slave_dev ) { -struct net_local *nl = (struct net_local *) dev->priv; -struct net_local *snl = (struct net_local *) slave_dev->priv; +struct net_local *nl =netdev_priv (dev); +struct net_local *snl =netdev_priv (slave_dev);if ( nl->state &FL_SLAVE )/* This isn't master or free device */ return -EBUSY ;
@@ -1425,9 +1430,9 @@ enslave( struct net_device *dev, struct net_device *slave_dev )static int emancipate (struct net_device *dev ) { -struct net_local *snl = (struct net_local *) dev->priv; +struct net_local *snl =netdev_priv (dev);struct net_device *p = snl->master; -struct net_local *nl = (struct net_local *) p->priv; +struct net_local *nl =netdev_priv (p);if ( !(snl->state &FL_SLAVE ) )return -EINVAL ;
@@ -1438,7 +1443,7 @@ emancipate( struct net_device *dev )/* exclude from list */ for (;;) {/* must be in list */ -struct net_local *t = (struct net_local *) p->priv; +struct net_local *t =netdev_priv (p);if ( t->link == dev ) { t->link = snl->link;break ;
@@ -1465,7 +1470,7 @@ emancipate( struct net_device *dev )static struct net_device_stats *sbni_get_stats (struct net_device *dev ) { -return &((struct net_local *) dev->priv)->stats; +return &((struct net_local *)netdev_priv (dev))->stats; }
Signature · 1 line
1.5.3.4
Wang Chen said the following on 2008-9-5 11:06:
Quoted 11 lines
We have some reasons to kill
netdev->priv:
1.netdev->privis equal tonetdev_priv().
2.netdev_priv()wraps the calculation of netdev->priv's offset, obviouslynetdev_priv()is more flexible thannetdev->priv.
But we cann't killnetdev->privnow, because so many drivers reference to it directly.OK, becasue Dave S. Miller said, "every direct
netdev->privusage is a bug", and I want to killnetdev->privlater, I decided to convert all the direct reference ofnetdev->privfirst.
Quoted 9 lines
- Patch 1-4 are the safe convert which I believe will not make "after converted " worse than "before converted".
Originally, I put this kind of convert in one mail, but it's too big for vger. So I split it to 4 parts and make every part smaller than 100,000 bytes, which is max size allowed by vger.- Patches 5-18 need comments. Since the value of
netdev->privis changed in drivers and I usenetdev->ml_privto replacenetdev->priv.
v1->v2:
- Jeff pointed out some patch's subject is not same as content. fixed.
- Remove sfc driver fix, because it's already merged.
- I split safe convertion to 18 parts in version-1, but I split to 4 parts here.
Wang Chen said the following on 2008-9-5 11:06:
Quoted 20 lines
We have some reasons to kill
netdev->priv:
1.netdev->privis equal tonetdev_priv().
2.netdev_priv()wraps the calculation of netdev->priv's offset, obviouslynetdev_priv()is more flexible thannetdev->priv.
But we cann't killnetdev->privnow, because so many drivers reference to it directly.OK, becasue Dave S. Miller said, "every direct
netdev->privusage is a bug", and I want to killnetdev->privlater, I decided to convert all the direct reference ofnetdev->privfirst.- Patch 1-4 are the safe convert which I believe will not make "after converted " worse than "before converted".
Originally, I put this kind of convert in one mail, but it's too big for vger. So I split it to 4 parts and make every part smaller than 100,000 bytes, which is max size allowed by vger.- Patches 5-18 need comments. Since the value of
netdev->privis changed in drivers and I usenetdev->ml_privto replacenetdev->priv.
Quoted 10 lines · Dave
I'll see what I can do.
I know this is going to create conflicts in a few places, including sparc-next-2.6 where I already made this fix while cleaning up all of the SBUS device drivers.
So I guess I'm saying that I'm being lazy. :)
I'll try to look into this next week as I'm going to be busy and also away for a few days.
Dave, seems nobody give any opposite comments. I know it's a boring job to look into this patch, I hope I can buy you a cup of coffee ;)
But I still hope you can apply it or check it ASAP, because the later you apply it the more conflicts. Thank you.
David Miller
maintainerFrom: Wang Chen <[email protected]>
Date: Sat, 20 Sep 2008 16:17:52 +0800
Quoted 6 lines
Quoted 5 lines · Dave
I'll see what I can do.
I know this is going to create conflicts in a few places, including sparc-next-2.6 where I already made this fix while cleaning up all of the SBUS device drivers.
Quoted 7 lines
Quoted 5 lines
So I guess I'm saying that I'm being lazy. :)
I'll try to look into this next week as I'm going to be busy and also away for a few days.
Dave, seems nobody give any opposite comments.
Actually, I did see such comments which is why I totally dropped this set from my inbox. Besides, it's Jeff's territory technically :-)
David Miller said the following on 2008-9-20 18:37:
Quoted 11 lines
From: Wang Chen <[email protected]>
Date: Sat, 20 Sep 2008 16:17:52 +0800Quoted 8 lines
Quoted 7 lines · Dave
I'll see what I can do.
I know this is going to create conflicts in a few places, including sparc-next-2.6 where I already made this fix while cleaning up all of the SBUS device drivers.
So I guess I'm saying that I'm being lazy. :)
Quoted 8 lines
Quoted 4 lines
Quoted 3 lines
I'll try to look into this next week as I'm going to be busy and also away for a few days.
Dave, seems nobody give any opposite comments.
Actually, I did see such comments which is why I totally dropped this set from my inbox.
Dave, do you mean these comments?
------
John W. Linville:
However, I do not understand why you didn't
simply replace netdev->priv with netdev_priv()? Can you explain?
Dan Williams:
Yeah, that would have been my first choice too...
------
I think I have answered their question as:
------
1. Why I don't use netdev_priv() to replace netdev->priv here? Because, netdev->priv was changed here, but it shouldn't, the memory was allocated when alloc_netdev and netdev->priv should always pointed to that memory.
2. Why I use netdev->ml_priv here to replace netdev->priv?
In this driver, netdev->priv are shared by multi wifidevs, that means wifidevs need mid-layer private data, which are all same as their parent netdev. This usage is same as Dave's commit "syncppp: Fix crashes."
------
After my answer, their didn't give feedback, so I think there is no opposite comments.
Quoted 2 lines
Besides, it's Jeff's territory technically :-)
OK. Jeff, will you look at my patch?