Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17c324fa authored by Wang Chen's avatar Wang Chen Committed by David S. Miller
Browse files

um: Kill directly reference of netdev->priv 



Simply replace netdev->priv with netdev_priv().

Signed-off-by: default avatarWang Chen <wangchen@cn.fujitsu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6cbeba55

arch/um/drivers/daemon_kern.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ static void daemon_init(struct net_device *dev, void *data) 
	struct daemon_data *dpri;

	struct daemon_init *init = data;



	pri = dev->priv;

	pri = netdev_priv(dev);

	dpri = (struct daemon_data *) pri->user;

	dpri->sock_type = init->sock_type;

	dpri->ctl_sock = init->ctl_sock;

arch/um/drivers/mcast_kern.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static void mcast_init(struct net_device *dev, void *data) 
	struct mcast_data *dpri;

	struct mcast_init *init = data;



	pri = dev->priv;

	pri = netdev_priv(dev);

	dpri = (struct mcast_data *) pri->user;

	dpri->addr = init->addr;

	dpri->port = init->port;

arch/um/drivers/net_kern.c

+11 −11
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ out: 


static int uml_net_rx(struct net_device *dev)

{

	struct uml_net_private *lp = dev->priv;

	struct uml_net_private *lp = netdev_priv(dev);

	int pkt_len;

	struct sk_buff *skb;
@@ -119,7 +119,7 @@ static void uml_dev_close(struct work_struct *work) 
static irqreturn_t uml_net_interrupt(int irq, void *dev_id)

{

	struct net_device *dev = dev_id;

	struct uml_net_private *lp = dev->priv;

	struct uml_net_private *lp = netdev_priv(dev);

	int err;



	if (!netif_running(dev))
@@ -150,7 +150,7 @@ out: 


static int uml_net_open(struct net_device *dev)

{

	struct uml_net_private *lp = dev->priv;

	struct uml_net_private *lp = netdev_priv(dev);

	int err;



	if (lp->fd >= 0) {
@@ -195,7 +195,7 @@ out: 


static int uml_net_close(struct net_device *dev)

{

	struct uml_net_private *lp = dev->priv;

	struct uml_net_private *lp = netdev_priv(dev);



	netif_stop_queue(dev);
@@ -213,7 +213,7 @@ static int uml_net_close(struct net_device *dev) 


static int uml_net_start_xmit(struct sk_buff *skb, struct net_device *dev)

{

	struct uml_net_private *lp = dev->priv;

	struct uml_net_private *lp = netdev_priv(dev);

	unsigned long flags;

	int len;
@@ -250,7 +250,7 @@ static int uml_net_start_xmit(struct sk_buff *skb, struct net_device *dev) 


static struct net_device_stats *uml_net_get_stats(struct net_device *dev)

{

	struct uml_net_private *lp = dev->priv;

	struct uml_net_private *lp = netdev_priv(dev);

	return &lp->stats;

}
@@ -267,7 +267,7 @@ static void uml_net_tx_timeout(struct net_device *dev) 


static int uml_net_set_mac(struct net_device *dev, void *addr)

{

	struct uml_net_private *lp = dev->priv;

	struct uml_net_private *lp = netdev_priv(dev);

	struct sockaddr *hwaddr = addr;



	spin_lock_irq(&lp->lock);
@@ -368,7 +368,7 @@ static void net_device_release(struct device *dev) 
{

	struct uml_net *device = dev->driver_data;

	struct net_device *netdev = device->dev;

	struct uml_net_private *lp = netdev->priv;

	struct uml_net_private *lp = netdev_priv(netdev);



	if (lp->remove != NULL)

		(*lp->remove)(&lp->user);
@@ -420,7 +420,7 @@ static void eth_configure(int n, void *init, char *mac, 


	printk(KERN_INFO "Netdevice %d (%pM) : ", n, device->mac);



	lp = dev->priv;

	lp = netdev_priv(dev);

	/* This points to the transport private data. It's still clear, but we

	 * must memset it to 0 *now*. Let's help the drivers. */

	memset(lp, 0, size);
@@ -730,7 +730,7 @@ static int net_remove(int n, char **error_out) 
		return -ENODEV;



	dev = device->dev;

	lp = dev->priv;

	lp = netdev_priv(dev);

	if (lp->fd > 0)

		return -EBUSY;

	unregister_netdev(dev);
@@ -761,7 +761,7 @@ static int uml_inetaddr_event(struct notifier_block *this, unsigned long event, 
	if (dev->open != uml_net_open)

		return NOTIFY_DONE;



	lp = dev->priv;

	lp = netdev_priv(dev);



	proc = NULL;

	switch (event) {

arch/um/drivers/pcap_kern.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ void pcap_init(struct net_device *dev, void *data) 
	struct pcap_data *ppri;

	struct pcap_init *init = data;



	pri = dev->priv;

	pri = netdev_priv(dev);

	ppri = (struct pcap_data *) pri->user;

	ppri->host_if = init->host_if;

	ppri->promisc = init->promisc;

arch/um/drivers/slip_kern.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ static void slip_init(struct net_device *dev, void *data) 
	struct slip_data *spri;

	struct slip_init *init = data;



	private = dev->priv;

	private = netdev_priv(dev);

	spri = (struct slip_data *) private->user;



	memset(spri->name, 0, sizeof(spri->name));