netdevice: safe convert to netdev_priv() #part-2
Subsystems (3)
PATCH 2/4 netdevice: safe convert to netdev_priv() #part-2
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.
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/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/mvme147.c | 4 +- drivers/net/myri_sbus.c | 10 ++-- 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 +++++++++++++++++----------------- 32 files changed, 256 insertions(+), 258 deletions(-)
drivers/net/declance.c +1 -1
@@ -1033,7 +1033,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
@@ -600,7 +600,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)
@@ -820,7 +820,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 ;
@@ -865,7 +865,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;
@@ -923,7 +923,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 ;
@@ -971,7 +971,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);
@@ -1009,7 +1009,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;
@@ -1106,7 +1106,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;
@@ -1147,7 +1147,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;
@@ -1183,7 +1183,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 */
@@ -1200,7 +1200,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 ;
@@ -1232,7 +1232,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);
@@ -1261,7 +1261,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;
@@ -1429,7 +1429,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;
@@ -1532,7 +1532,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;
@@ -1578,7 +1578,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;
@@ -1603,7 +1603,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);
@@ -1745,7 +1745,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;
@@ -1780,7 +1780,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. */
@@ -1835,7 +1835,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;
@@ -1906,7 +1906,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
@@ -137,7 +137,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 ---------------------------- */
@@ -626,7 +626,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;
@@ -677,7 +677,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__);
@@ -723,7 +723,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;
@@ -751,7 +751,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__);
@@ -831,7 +831,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;
@@ -928,7 +928,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;
@@ -996,7 +996,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))
@@ -1046,7 +1046,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;
@@ -1093,7 +1093,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;
@@ -1134,7 +1134,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 */
@@ -1150,7 +1150,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);
@@ -1197,7 +1197,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;
@@ -1408,7 +1408,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)) {
@@ -1423,7 +1423,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) {
@@ -1447,7 +1447,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
@@ -3786,8 +3786,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
@@ -4782,7 +4781,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);
@@ -4804,7 +4803,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;
@@ -4838,7 +4837,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
@@ -1988,8 +1988,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);if (adapter->msix_entries && !(adapter->rx_ring->ims_val & adapter->tx_ring->ims_val))
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;
@@ -1674,7 +1674,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
@@ -1465,7 +1465,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;
@@ -1044,7 +1044,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)) {
@@ -1058,7 +1058,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)) {
@@ -1106,7 +1106,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;
@@ -1158,7 +1158,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
@@ -1240,7 +1240,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;
@@ -1336,7 +1336,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++)
@@ -1470,7 +1470,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);
@@ -1959,7 +1959,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;
@@ -2027,7 +2027,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;);
@@ -2113,7 +2113,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 */
@@ -1174,7 +1174,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);
@@ -1256,7 +1256,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*
@@ -1305,7 +1305,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);
@@ -1347,7 +1347,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; }
@@ -1640,7 +1640,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);
@@ -2084,7 +2084,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);
@@ -2165,7 +2165,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;);
@@ -2228,7 +2228,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 */
@@ -2274,7 +2274,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;);
@@ -2309,7 +2309,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;
@@ -532,7 +532,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
@@ -580,7 +580,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);
@@ -593,7 +593,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 ;
@@ -647,7 +647,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);/*
@@ -722,7 +722,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) {
@@ -764,13 +764,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 ;
@@ -833,7 +833,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);
@@ -906,7 +906,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;
@@ -985,7 +985,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 */
@@ -637,7 +637,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;
@@ -855,7 +855,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;
@@ -1062,7 +1062,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;
@@ -1261,7 +1261,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;
@@ -1375,14 +1375,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__);
@@ -1407,7 +1407,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;
@@ -1457,7 +1457,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 ;
@@ -1498,7 +1498,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 ];
@@ -1557,7 +1557,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);
@@ -1580,7 +1580,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;
@@ -1655,7 +1655,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);
@@ -1712,7 +1712,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);
@@ -1747,7 +1747,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 */
@@ -1786,7 +1786,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;
@@ -1118,7 +1118,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;
@@ -1191,7 +1191,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;);
@@ -1255,7 +1255,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;);
@@ -1302,7 +1302,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;);
@@ -1338,7 +1338,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/mvme147.c +2 -2
@@ -105,7 +105,7 @@ struct net_device * __init mvme147lance_probe(int unit) dev->name, dev->base_addr,MVME147_LANCE_IRQ , 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) {
@@ -189,7 +189,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 +5 -5
@@ -536,7 +536,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;
@@ -575,14 +575,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 ;
@@ -590,7 +590,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);
@@ -601,7 +601,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;
drivers/net/ne2k-pci.c +1 -1
@@ -625,7 +625,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
@@ -541,7 +541,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;
@@ -986,7 +986,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
@@ -328,7 +328,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" );
@@ -1039,7 +1039,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++;
@@ -1064,7 +1064,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" );
@@ -1112,7 +1112,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);
@@ -1125,7 +1125,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);
@@ -1176,7 +1176,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);
@@ -1273,7 +1273,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 */
@@ -1336,7 +1336,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; }
@@ -455,7 +455,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
From: Wang Chen <[email protected]>
Date: Thu, 13 Nov 2008 10:43:41 +0800
Quoted 7 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.
Quoted 7 lines
This patch is a safe convert for
netdev->privtonetdev_priv(netdev). Since all of thenetdev->privis 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]>
Applied.