1 files changed, 15 insertions, 15 deletions

diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 38de31b5570..3e1d1385735 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -1813,7 +1813,7 @@ static void qeth_l3_free_vlan_addresses(struct qeth_card *card,
 static void qeth_l3_vlan_rx_register(struct net_device *dev,
                         struct vlan_group *grp)
 {
-        struct qeth_card *card = netdev_priv(dev);
+        struct qeth_card *card = dev->ml_priv;
         unsigned long flags;
 
         QETH_DBF_TEXT(TRACE, 4, "vlanreg");
@@ -1825,7 +1825,7 @@ static void qeth_l3_vlan_rx_register(struct net_device *dev,
 static void qeth_l3_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
 {
         struct net_device *vlandev;
-        struct qeth_card *card = (struct qeth_card *) dev->priv;
+        struct qeth_card *card = dev->ml_priv;
         struct in_device *in_dev;
 
         if (card->info.type == QETH_CARD_TYPE_IQD)
@@ -1851,7 +1851,7 @@ static void qeth_l3_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
 
 static void qeth_l3_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
 {
-        struct qeth_card *card = netdev_priv(dev);
+        struct qeth_card *card = dev->ml_priv;
         unsigned long flags;
 
         QETH_DBF_TEXT_(TRACE, 4, "kid:%d", vid);
@@ -2013,7 +2013,7 @@ static int qeth_l3_verify_vlan_dev(struct net_device *dev,
                 }
         }
 
-        if (rc && !(netdev_priv(vlan_dev_real_dev(dev)) == (void *)card))
+        if (rc && !(vlan_dev_real_dev(dev)->ml_priv == (void *)card))
                 return 0;
 
         return rc;
@@ -2047,9 +2047,9 @@ static struct qeth_card *qeth_l3_get_card_from_dev(struct net_device *dev)
 
         rc = qeth_l3_verify_dev(dev);
         if (rc == QETH_REAL_CARD)
-                card = netdev_priv(dev);
+                card = dev->ml_priv;
         else if (rc == QETH_VLAN_CARD)
-                card = netdev_priv(vlan_dev_real_dev(dev));
+                card = vlan_dev_real_dev(dev)->ml_priv;
         if (card && card->options.layer2)
                 card = NULL;
         QETH_DBF_TEXT_(TRACE, 4, "%d", rc);
@@ -2110,7 +2110,7 @@ static int qeth_l3_stop_card(struct qeth_card *card, int recovery_mode)
 
 static void qeth_l3_set_multicast_list(struct net_device *dev)
 {
-        struct qeth_card *card = netdev_priv(dev);
+        struct qeth_card *card = dev->ml_priv;
 
         QETH_DBF_TEXT(TRACE, 3, "setmulti");
         qeth_l3_delete_mc_addresses(card);
@@ -2438,7 +2438,7 @@ static int qeth_l3_arp_flush_cache(struct qeth_card *card)
 
 static int qeth_l3_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
-        struct qeth_card *card = netdev_priv(dev);
+        struct qeth_card *card = dev->ml_priv;
         struct qeth_arp_cache_entry arp_entry;
         struct mii_ioctl_data *mii_data;
         int rc = 0;
@@ -2595,7 +2595,7 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
         u16 *tag;
         struct qeth_hdr *hdr = NULL;
         int elements_needed = 0;
-        struct qeth_card *card = netdev_priv(dev);
+        struct qeth_card *card = dev->ml_priv;
         struct sk_buff *new_skb = NULL;
         int ipv = qeth_get_ip_version(skb);
         int cast_type = qeth_get_cast_type(card, skb);
@@ -2763,7 +2763,7 @@ tx_drop:
 
 static int qeth_l3_open(struct net_device *dev)
 {
-        struct qeth_card *card = netdev_priv(dev);
+        struct qeth_card *card = dev->ml_priv;
 
         QETH_DBF_TEXT(TRACE, 4, "qethopen");
         if (card->state != CARD_STATE_SOFTSETUP)
@@ -2780,7 +2780,7 @@ static int qeth_l3_open(struct net_device *dev)
 
 static int qeth_l3_stop(struct net_device *dev)
 {
-        struct qeth_card *card = netdev_priv(dev);
+        struct qeth_card *card = dev->ml_priv;
 
         QETH_DBF_TEXT(TRACE, 4, "qethstop");
         netif_tx_disable(dev);
@@ -2792,14 +2792,14 @@ static int qeth_l3_stop(struct net_device *dev)
 
 static u32 qeth_l3_ethtool_get_rx_csum(struct net_device *dev)
 {
-        struct qeth_card *card = netdev_priv(dev);
+        struct qeth_card *card = dev->ml_priv;
 
         return (card->options.checksum_type == HW_CHECKSUMMING);
 }
 
 static int qeth_l3_ethtool_set_rx_csum(struct net_device *dev, u32 data)
 {
-        struct qeth_card *card = netdev_priv(dev);
+        struct qeth_card *card = dev->ml_priv;
         enum qeth_card_states old_state;
         enum qeth_checksum_types csum_type;
 
@@ -2825,7 +2825,7 @@ static int qeth_l3_ethtool_set_rx_csum(struct net_device *dev, u32 data)
 
 static int qeth_l3_ethtool_set_tso(struct net_device *dev, u32 data)
 {
-        struct qeth_card *card = netdev_priv(dev);
+        struct qeth_card *card = dev->ml_priv;
 
         if (data) {
                 if (card->options.large_send == QETH_LARGE_SEND_NO) {
@@ -2915,7 +2915,7 @@ static int qeth_l3_setup_netdev(struct qeth_card *card)
                 return -ENODEV;
 
         card->dev->hard_start_xmit = qeth_l3_hard_start_xmit;
-        card->dev->priv = card;
+        card->dev->ml_priv = card;
         card->dev->tx_timeout = &qeth_tx_timeout;
         card->dev->watchdog_timeo = QETH_TX_TIMEOUT;
         card->dev->open = qeth_l3_open;