ctcm: netdev->priv vs. netdev->ml_priv

Use netdev->ml_priv instead of netdev->priv

Signed-off-by: Peter Tiedemann <ptiedem@de.ibm.com>
Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

1 files changed, 12 insertions, 12 deletions

diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c
index 126a3ebb8ab2..b11fec24c7d2 100644
--- a/drivers/s390/net/ctcm_main.c
+++ b/drivers/s390/net/ctcm_main.c
@@ -69,7 +69,7 @@ struct channel *channels;
 void ctcm_unpack_skb(struct channel *ch, struct sk_buff *pskb)
 {
         struct net_device *dev = ch->netdev;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
         __u16 len = *((__u16 *) pskb->data);
 
         skb_put(pskb, 2 + LL_HEADER_LENGTH);
@@ -414,7 +414,7 @@ int ctcm_ch_alloc_buffer(struct channel *ch)
  */
 int ctcm_open(struct net_device *dev)
 {
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
 
         CTCMY_DBF_DEV_NAME(SETUP, dev, "");
         if (!IS_MPC(priv))
@@ -432,7 +432,7 @@ int ctcm_open(struct net_device *dev)
  */
 int ctcm_close(struct net_device *dev)
 {
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
 
         CTCMY_DBF_DEV_NAME(SETUP, dev, "");
         if (!IS_MPC(priv))
@@ -573,7 +573,7 @@ static int ctcm_transmit_skb(struct channel *ch, struct sk_buff *skb)
                 skb_pull(skb, LL_HEADER_LENGTH + 2);
         } else if (ccw_idx == 0) {
                 struct net_device *dev = ch->netdev;
-                struct ctcm_priv *priv = dev->priv;
+                struct ctcm_priv *priv = dev->ml_priv;
                 priv->stats.tx_packets++;
                 priv->stats.tx_bytes += skb->len - LL_HEADER_LENGTH;
         }
@@ -592,7 +592,7 @@ static void ctcmpc_send_sweep_req(struct channel *rch)
         struct channel *ch;
         /* int rc = 0; */
 
-        priv = dev->priv;
+        priv = dev->ml_priv;
         grp = priv->mpcg;
         ch = priv->channel[WRITE];
 
@@ -652,7 +652,7 @@ static int ctcmpc_transmit_skb(struct channel *ch, struct sk_buff *skb)
 {
         struct pdu *p_header;
         struct net_device *dev = ch->netdev;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
         struct mpc_group *grp = priv->mpcg;
         struct th_header *header;
         struct sk_buff *nskb;
@@ -867,7 +867,7 @@ done:
 /* first merge version - leaving both functions separated */
 static int ctcm_tx(struct sk_buff *skb, struct net_device *dev)
 {
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
 
         if (skb == NULL) {
                 CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR,
@@ -911,7 +911,7 @@ static int ctcm_tx(struct sk_buff *skb, struct net_device *dev)
 static int ctcmpc_tx(struct sk_buff *skb, struct net_device *dev)
 {
         int len = 0;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
         struct mpc_group *grp  = priv->mpcg;
         struct sk_buff *newskb = NULL;
 
@@ -1025,7 +1025,7 @@ static int ctcm_change_mtu(struct net_device *dev, int new_mtu)
         if (new_mtu < 576 || new_mtu > 65527)
                 return -EINVAL;
 
-        priv = dev->priv;
+        priv = dev->ml_priv;
         max_bufsize = priv->channel[READ]->max_bufsize;
 
         if (IS_MPC(priv)) {
@@ -1050,7 +1050,7 @@ static int ctcm_change_mtu(struct net_device *dev, int new_mtu)
  */
 static struct net_device_stats *ctcm_stats(struct net_device *dev)
 {
-        return &((struct ctcm_priv *)dev->priv)->stats;
+        return &((struct ctcm_priv *)dev->ml_priv)->stats;
 }
 
 static void ctcm_free_netdevice(struct net_device *dev)
@@ -1060,7 +1060,7 @@ static void ctcm_free_netdevice(struct net_device *dev)
 
         CTCM_DBF_TEXT_(SETUP, CTC_DBF_INFO,
                         "%s(%s)", CTCM_FUNTAIL, dev->name);
-        priv = dev->priv;
+        priv = dev->ml_priv;
         if (priv) {
                 grp = priv->mpcg;
                 if (grp) {
@@ -1125,7 +1125,7 @@ static struct net_device *ctcm_init_netdevice(struct ctcm_priv *priv)
                         CTCM_FUNTAIL);
                 return NULL;
         }
-        dev->priv = priv;
+        dev->ml_priv = priv;
         priv->fsm = init_fsm("ctcmdev", dev_state_names, dev_event_names,
                                 CTCM_NR_DEV_STATES, CTCM_NR_DEV_EVENTS,
                                 dev_fsm, dev_fsm_len, GFP_KERNEL);