1 files changed, 23 insertions, 23 deletions

diff --git a/drivers/s390/net/ctcm_mpc.c b/drivers/s390/net/ctcm_mpc.c
index 2de1e2fccbf9..cbe470493bf0 100644
--- a/drivers/s390/net/ctcm_mpc.c
+++ b/drivers/s390/net/ctcm_mpc.c
@@ -312,10 +312,10 @@ static struct net_device *ctcmpc_get_dev(int port_num)
                                         CTCM_FUNTAIL, device);
                 return NULL;
         }
-        priv = dev->priv;
+        priv = dev->ml_priv;
         if (priv == NULL) {
                 CTCM_DBF_TEXT_(MPC_ERROR, CTC_DBF_ERROR,
-                        "%s(%s): dev->priv is NULL",
+                        "%s(%s): dev->ml_priv is NULL",
                                         CTCM_FUNTAIL, device);
                 return NULL;
         }
@@ -344,7 +344,7 @@ int ctc_mpc_alloc_channel(int port_num, void (*callback)(int, int))
         dev = ctcmpc_get_dev(port_num);
         if (dev == NULL)
                 return 1;
-        priv = dev->priv;
+        priv = dev->ml_priv;
         grp = priv->mpcg;
 
         grp->allochanfunc = callback;
@@ -416,7 +416,7 @@ void ctc_mpc_establish_connectivity(int port_num,
         dev = ctcmpc_get_dev(port_num);
         if (dev == NULL)
                 return;
-        priv = dev->priv;
+        priv = dev->ml_priv;
         grp = priv->mpcg;
         rch = priv->channel[READ];
         wch = priv->channel[WRITE];
@@ -534,7 +534,7 @@ void ctc_mpc_dealloc_ch(int port_num)
         dev = ctcmpc_get_dev(port_num);
         if (dev == NULL)
                 return;
-        priv = dev->priv;
+        priv = dev->ml_priv;
         grp = priv->mpcg;
 
         CTCM_DBF_TEXT_(MPC_SETUP, CTC_DBF_DEBUG,
@@ -570,7 +570,7 @@ void ctc_mpc_flow_control(int port_num, int flowc)
         dev = ctcmpc_get_dev(port_num);
         if (dev == NULL)
                 return;
-        priv = dev->priv;
+        priv = dev->ml_priv;
         grp = priv->mpcg;
 
         CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_DEBUG,
@@ -619,7 +619,7 @@ static void mpc_rcvd_sweep_resp(struct mpcg_info *mpcginfo)
 {
         struct channel    *rch = mpcginfo->ch;
         struct net_device *dev = rch->netdev;
-        struct ctcm_priv   *priv = dev->priv;
+        struct ctcm_priv   *priv = dev->ml_priv;
         struct mpc_group  *grp = priv->mpcg;
         struct channel    *ch = priv->channel[WRITE];
 
@@ -650,7 +650,7 @@ static void mpc_rcvd_sweep_resp(struct mpcg_info *mpcginfo)
 static void ctcmpc_send_sweep_resp(struct channel *rch)
 {
         struct net_device *dev = rch->netdev;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
         struct mpc_group *grp = priv->mpcg;
         int rc = 0;
         struct th_sweep *header;
@@ -712,7 +712,7 @@ static void mpc_rcvd_sweep_req(struct mpcg_info *mpcginfo)
 {
         struct channel    *rch     = mpcginfo->ch;
         struct net_device *dev     = rch->netdev;
-        struct ctcm_priv  *priv = dev->priv;
+        struct ctcm_priv  *priv = dev->ml_priv;
         struct mpc_group  *grp  = priv->mpcg;
         struct channel    *ch      = priv->channel[WRITE];
 
@@ -846,7 +846,7 @@ static int mpcg_fsm_len = ARRAY_SIZE(mpcg_fsm);
 static void mpc_action_go_ready(fsm_instance *fsm, int event, void *arg)
 {
         struct net_device *dev = arg;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
         struct mpc_group *grp = priv->mpcg;
 
         if (grp == NULL) {
@@ -890,7 +890,7 @@ static void mpc_action_go_ready(fsm_instance *fsm, int event, void *arg)
 void mpc_group_ready(unsigned long adev)
 {
         struct net_device *dev = (struct net_device *)adev;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
         struct mpc_group *grp = priv->mpcg;
         struct channel *ch = NULL;
 
@@ -946,7 +946,7 @@ void mpc_group_ready(unsigned long adev)
 void mpc_channel_action(struct channel *ch, int direction, int action)
 {
         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;
 
         if (grp == NULL) {
@@ -1056,7 +1056,7 @@ done:
 static void ctcmpc_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;
         struct mpc_group *grp = priv->mpcg;
         struct pdu *curr_pdu;
         struct mpcg_info *mpcginfo;
@@ -1254,7 +1254,7 @@ void ctcmpc_bh(unsigned long thischan)
         struct channel    *ch   = (struct channel *)thischan;
         struct sk_buff    *skb;
         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;
 
         CTCM_PR_DEBUG("%s cp:%i enter:  %s() %s\n",
@@ -1376,7 +1376,7 @@ static void mpc_action_go_inop(fsm_instance *fi, int event, void *arg)
         BUG_ON(dev == NULL);
         CTCM_PR_DEBUG("Enter %s: %s\n", __func__, dev->name);
 
-        priv  = dev->priv;
+        priv  = dev->ml_priv;
         grp =  priv->mpcg;
         grp->flow_off_called = 0;
         fsm_deltimer(&grp->timer);
@@ -1482,7 +1482,7 @@ static void mpc_action_timeout(fsm_instance *fi, int event, void *arg)
 
         BUG_ON(dev == NULL);
 
-        priv = dev->priv;
+        priv = dev->ml_priv;
         grp = priv->mpcg;
         wch = priv->channel[WRITE];
         rch = priv->channel[READ];
@@ -1520,7 +1520,7 @@ void mpc_action_discontact(fsm_instance *fi, int event, void *arg)
         if (ch) {
                 dev = ch->netdev;
                 if (dev) {
-                        priv = dev->priv;
+                        priv = dev->ml_priv;
                         if (priv) {
                                 CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_NOTICE,
                                         "%s: %s: %s\n",
@@ -1568,7 +1568,7 @@ static int mpc_validate_xid(struct mpcg_info *mpcginfo)
 {
         struct channel     *ch   = mpcginfo->ch;
         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 xid2        *xid  = mpcginfo->xid;
         int     rc       = 0;
@@ -1865,7 +1865,7 @@ static void mpc_action_doxid0(fsm_instance *fsm, int event, void *arg)
 {
         struct channel     *ch   = arg;
         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;
 
         CTCM_PR_DEBUG("Enter %s: cp=%i ch=0x%p id=%s\n",
@@ -1905,7 +1905,7 @@ static void mpc_action_doxid0(fsm_instance *fsm, int event, void *arg)
 static void mpc_action_doxid7(fsm_instance *fsm, int event, void *arg)
 {
         struct net_device *dev = arg;
-        struct ctcm_priv  *priv = dev->priv;
+        struct ctcm_priv  *priv = dev->ml_priv;
         struct mpc_group  *grp  = NULL;
         int direction;
         int send = 0;
@@ -1982,7 +1982,7 @@ static void mpc_action_rcvd_xid0(fsm_instance *fsm, int event, void *arg)
         struct mpcg_info   *mpcginfo  = arg;
         struct channel     *ch   = mpcginfo->ch;
         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;
 
         CTCM_PR_DEBUG("%s: ch-id:%s xid2:%i xid7:%i xidt_p2:%i \n",
@@ -2044,7 +2044,7 @@ static void mpc_action_rcvd_xid7(fsm_instance *fsm, int event, void *arg)
         struct mpcg_info   *mpcginfo   = arg;
         struct channel     *ch         = mpcginfo->ch;
         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;
 
         CTCM_PR_DEBUG("Enter %s: cp=%i ch=0x%p id=%s\n",
@@ -2096,7 +2096,7 @@ static int mpc_send_qllc_discontact(struct net_device *dev)
         __u32   new_len = 0;
         struct sk_buff   *skb;
         struct qllc      *qllcptr;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
         struct mpc_group *grp = priv->mpcg;
 
         CTCM_PR_DEBUG("%s: GROUP STATE: %s\n",