aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorWang Chen <wangchen@cn.fujitsu.com>2008-12-07 02:57:49 -0500
committerDavid S. Miller <davem@davemloft.net>2008-12-07 02:57:49 -0500
commitad660e2f97e7dc9d0f5627456b37e64bde714a5e (patch)
tree065833520144d95ffe944cb135ba21ec6fcf7182 /drivers/s390
parent26aca5ec9e587562ac0f8c5b67d02567d7bf2ffe (diff)
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: Wang Chen <wangchen@cn.fujitsu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/net/lcs.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index 0825be87e5a0..c7a036a5d7a6 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -1290,7 +1290,7 @@ lcs_set_multicast_list(struct net_device *dev)
1290 struct lcs_card *card; 1290 struct lcs_card *card;
1291 1291
1292 LCS_DBF_TEXT(4, trace, "setmulti"); 1292 LCS_DBF_TEXT(4, trace, "setmulti");
1293 card = (struct lcs_card *) dev->priv; 1293 card = (struct lcs_card *) dev->ml_priv;
1294 1294
1295 if (!lcs_set_thread_start_bit(card, LCS_SET_MC_THREAD)) 1295 if (!lcs_set_thread_start_bit(card, LCS_SET_MC_THREAD))
1296 schedule_work(&card->kernel_thread_starter); 1296 schedule_work(&card->kernel_thread_starter);
@@ -1607,7 +1607,7 @@ lcs_start_xmit(struct sk_buff *skb, struct net_device *dev)
1607 int rc; 1607 int rc;
1608 1608
1609 LCS_DBF_TEXT(5, trace, "pktxmit"); 1609 LCS_DBF_TEXT(5, trace, "pktxmit");
1610 card = (struct lcs_card *) dev->priv; 1610 card = (struct lcs_card *) dev->ml_priv;
1611 rc = __lcs_start_xmit(card, skb, dev); 1611 rc = __lcs_start_xmit(card, skb, dev);
1612 return rc; 1612 return rc;
1613} 1613}
@@ -1863,7 +1863,7 @@ lcs_getstats(struct net_device *dev)
1863 struct lcs_card *card; 1863 struct lcs_card *card;
1864 1864
1865 LCS_DBF_TEXT(4, trace, "netstats"); 1865 LCS_DBF_TEXT(4, trace, "netstats");
1866 card = (struct lcs_card *) dev->priv; 1866 card = (struct lcs_card *) dev->ml_priv;
1867 return &card->stats; 1867 return &card->stats;
1868} 1868}
1869 1869
@@ -1878,7 +1878,7 @@ lcs_stop_device(struct net_device *dev)
1878 int rc; 1878 int rc;
1879 1879
1880 LCS_DBF_TEXT(2, trace, "stopdev"); 1880 LCS_DBF_TEXT(2, trace, "stopdev");
1881 card = (struct lcs_card *) dev->priv; 1881 card = (struct lcs_card *) dev->ml_priv;
1882 netif_carrier_off(dev); 1882 netif_carrier_off(dev);
1883 netif_tx_disable(dev); 1883 netif_tx_disable(dev);
1884 dev->flags &= ~IFF_UP; 1884 dev->flags &= ~IFF_UP;
@@ -1901,7 +1901,7 @@ lcs_open_device(struct net_device *dev)
1901 int rc; 1901 int rc;
1902 1902
1903 LCS_DBF_TEXT(2, trace, "opendev"); 1903 LCS_DBF_TEXT(2, trace, "opendev");
1904 card = (struct lcs_card *) dev->priv; 1904 card = (struct lcs_card *) dev->ml_priv;
1905 /* initialize statistics */ 1905 /* initialize statistics */
1906 rc = lcs_detect(card); 1906 rc = lcs_detect(card);
1907 if (rc) { 1907 if (rc) {
@@ -2150,7 +2150,7 @@ lcs_new_device(struct ccwgroup_device *ccwgdev)
2150 if (!dev) 2150 if (!dev)
2151 goto out; 2151 goto out;
2152 card->dev = dev; 2152 card->dev = dev;
2153 card->dev->priv = card; 2153 card->dev->ml_priv = card;
2154 card->dev->open = lcs_open_device; 2154 card->dev->open = lcs_open_device;
2155 card->dev->stop = lcs_stop_device; 2155 card->dev->stop = lcs_stop_device;
2156 card->dev->hard_start_xmit = lcs_start_xmit; 2156 card->dev->hard_start_xmit = lcs_start_xmit;