Skip to content

Commit

Permalink
s390_net: Kill directly reference of netdev->priv
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Wang Chen authored and David S. Miller committed Dec 7, 2008
1 parent 26aca5e commit ad660e2
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/s390/net/lcs.c
Original file line number Diff line number Diff line change
Expand Up @@ -1290,7 +1290,7 @@ lcs_set_multicast_list(struct net_device *dev)
struct lcs_card *card;

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))
schedule_work(&card->kernel_thread_starter);
Expand Down Expand Up @@ -1607,7 +1607,7 @@ lcs_start_xmit(struct sk_buff *skb, struct net_device *dev)
int rc;

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);
return rc;
}
Expand Down Expand Up @@ -1863,7 +1863,7 @@ lcs_getstats(struct net_device *dev)
struct lcs_card *card;

LCS_DBF_TEXT(4, trace, "netstats");
card = (struct lcs_card *) dev->priv;
card = (struct lcs_card *) dev->ml_priv;
return &card->stats;
}

Expand All @@ -1878,7 +1878,7 @@ lcs_stop_device(struct net_device *dev)
int rc;

LCS_DBF_TEXT(2, trace, "stopdev");
card = (struct lcs_card *) dev->priv;
card = (struct lcs_card *) dev->ml_priv;
netif_carrier_off(dev);
netif_tx_disable(dev);
dev->flags &= ~IFF_UP;
Expand All @@ -1901,7 +1901,7 @@ lcs_open_device(struct net_device *dev)
int rc;

LCS_DBF_TEXT(2, trace, "opendev");
card = (struct lcs_card *) dev->priv;
card = (struct lcs_card *) dev->ml_priv;
/* initialize statistics */
rc = lcs_detect(card);
if (rc) {
Expand Down Expand Up @@ -2150,7 +2150,7 @@ lcs_new_device(struct ccwgroup_device *ccwgdev)
if (!dev)
goto out;
card->dev = dev;
card->dev->priv = card;
card->dev->ml_priv = card;
card->dev->open = lcs_open_device;
card->dev->stop = lcs_stop_device;
card->dev->hard_start_xmit = lcs_start_xmit;
Expand Down

0 comments on commit ad660e2

Please sign in to comment.