Commit ad660e2f authored by Wang Chen's avatar Wang Chen Committed by David S. Miller

s390_net: Kill directly reference of netdev->priv

The private data comes from ccwgroup_device.
So just don't allocate private data memory when do alloc_netdev()
and use netdev->ml_priv to reference private data.
Signed-off-by: default avatarWang Chen <wangchen@cn.fujitsu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 26aca5ec
...@@ -1290,7 +1290,7 @@ lcs_set_multicast_list(struct net_device *dev) ...@@ -1290,7 +1290,7 @@ lcs_set_multicast_list(struct net_device *dev)
struct lcs_card *card; struct lcs_card *card;
LCS_DBF_TEXT(4, trace, "setmulti"); LCS_DBF_TEXT(4, trace, "setmulti");
card = (struct lcs_card *) dev->priv; card = (struct lcs_card *) dev->ml_priv;
if (!lcs_set_thread_start_bit(card, LCS_SET_MC_THREAD)) if (!lcs_set_thread_start_bit(card, LCS_SET_MC_THREAD))
schedule_work(&card->kernel_thread_starter); schedule_work(&card->kernel_thread_starter);
...@@ -1607,7 +1607,7 @@ lcs_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -1607,7 +1607,7 @@ lcs_start_xmit(struct sk_buff *skb, struct net_device *dev)
int rc; int rc;
LCS_DBF_TEXT(5, trace, "pktxmit"); LCS_DBF_TEXT(5, trace, "pktxmit");
card = (struct lcs_card *) dev->priv; card = (struct lcs_card *) dev->ml_priv;
rc = __lcs_start_xmit(card, skb, dev); rc = __lcs_start_xmit(card, skb, dev);
return rc; return rc;
} }
...@@ -1863,7 +1863,7 @@ lcs_getstats(struct net_device *dev) ...@@ -1863,7 +1863,7 @@ lcs_getstats(struct net_device *dev)
struct lcs_card *card; struct lcs_card *card;
LCS_DBF_TEXT(4, trace, "netstats"); LCS_DBF_TEXT(4, trace, "netstats");
card = (struct lcs_card *) dev->priv; card = (struct lcs_card *) dev->ml_priv;
return &card->stats; return &card->stats;
} }
...@@ -1878,7 +1878,7 @@ lcs_stop_device(struct net_device *dev) ...@@ -1878,7 +1878,7 @@ lcs_stop_device(struct net_device *dev)
int rc; int rc;
LCS_DBF_TEXT(2, trace, "stopdev"); LCS_DBF_TEXT(2, trace, "stopdev");
card = (struct lcs_card *) dev->priv; card = (struct lcs_card *) dev->ml_priv;
netif_carrier_off(dev); netif_carrier_off(dev);
netif_tx_disable(dev); netif_tx_disable(dev);
dev->flags &= ~IFF_UP; dev->flags &= ~IFF_UP;
...@@ -1901,7 +1901,7 @@ lcs_open_device(struct net_device *dev) ...@@ -1901,7 +1901,7 @@ lcs_open_device(struct net_device *dev)
int rc; int rc;
LCS_DBF_TEXT(2, trace, "opendev"); LCS_DBF_TEXT(2, trace, "opendev");
card = (struct lcs_card *) dev->priv; card = (struct lcs_card *) dev->ml_priv;
/* initialize statistics */ /* initialize statistics */
rc = lcs_detect(card); rc = lcs_detect(card);
if (rc) { if (rc) {
...@@ -2150,7 +2150,7 @@ lcs_new_device(struct ccwgroup_device *ccwgdev) ...@@ -2150,7 +2150,7 @@ lcs_new_device(struct ccwgroup_device *ccwgdev)
if (!dev) if (!dev)
goto out; goto out;
card->dev = dev; card->dev = dev;
card->dev->priv = card; card->dev->ml_priv = card;
card->dev->open = lcs_open_device; card->dev->open = lcs_open_device;
card->dev->stop = lcs_stop_device; card->dev->stop = lcs_stop_device;
card->dev->hard_start_xmit = lcs_start_xmit; card->dev->hard_start_xmit = lcs_start_xmit;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment