Merge branch 'linus' into sched/devel

11 files changed, 136 insertions, 118 deletions

diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index db85f1fb131e..711b3004b3e6 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -384,9 +384,10 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
          * get minor, add to list
          */
         down_write(&dcssblk_devices_sem);
-        if (dcssblk_get_segment_by_name(local_buf)) {
+        if (dcssblk_get_device_by_name(local_buf)) {
+                up_write(&dcssblk_devices_sem);
                 rc = -EEXIST;
-                goto release_gd;
+                goto unload_seg;
         }
         rc = dcssblk_assign_free_minor(dev_info);
         if (rc) {
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index a08b1682c8e8..e10ac9ab2d44 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -133,14 +133,14 @@ claw_register_debug_facility(void)
 static inline void
 claw_set_busy(struct net_device *dev)
 {
- ((struct claw_privbk *) dev->priv)->tbusy=1;
+ ((struct claw_privbk *)dev->ml_priv)->tbusy = 1;
  eieio();
 }
 
 static inline void
 claw_clear_busy(struct net_device *dev)
 {
-        clear_bit(0, &(((struct claw_privbk *) dev->priv)->tbusy));
+        clear_bit(0, &(((struct claw_privbk *) dev->ml_priv)->tbusy));
         netif_wake_queue(dev);
         eieio();
 }
@@ -149,20 +149,20 @@ static inline int
 claw_check_busy(struct net_device *dev)
 {
         eieio();
-        return ((struct claw_privbk *) dev->priv)->tbusy;
+        return ((struct claw_privbk *) dev->ml_priv)->tbusy;
 }
 
 static inline void
 claw_setbit_busy(int nr,struct net_device *dev)
 {
         netif_stop_queue(dev);
-        set_bit(nr, (void *)&(((struct claw_privbk *)dev->priv)->tbusy));
+        set_bit(nr, (void *)&(((struct claw_privbk *)dev->ml_priv)->tbusy));
 }
 
 static inline void
 claw_clearbit_busy(int nr,struct net_device *dev)
 {
-        clear_bit(nr,(void *)&(((struct claw_privbk *)dev->priv)->tbusy));
+        clear_bit(nr, (void *)&(((struct claw_privbk *)dev->ml_priv)->tbusy));
         netif_wake_queue(dev);
 }
 
@@ -171,7 +171,7 @@ claw_test_and_setbit_busy(int nr,struct net_device *dev)
 {
         netif_stop_queue(dev);
         return test_and_set_bit(nr,
-                (void *)&(((struct claw_privbk *) dev->priv)->tbusy));
+                (void *)&(((struct claw_privbk *) dev->ml_priv)->tbusy));
 }
 
 
@@ -271,6 +271,7 @@ claw_probe(struct ccwgroup_device *cgdev)
         if (!get_device(&cgdev->dev))
                 return -ENODEV;
         privptr = kzalloc(sizeof(struct claw_privbk), GFP_KERNEL);
+        cgdev->dev.driver_data = privptr;
         if (privptr == NULL) {
                 probe_error(cgdev);
                 put_device(&cgdev->dev);
@@ -305,7 +306,6 @@ claw_probe(struct ccwgroup_device *cgdev)
         privptr->p_env->p_priv = privptr;
         cgdev->cdev[0]->handler = claw_irq_handler;
         cgdev->cdev[1]->handler = claw_irq_handler;
-        cgdev->dev.driver_data = privptr;
         CLAW_DBF_TEXT(2, setup, "prbext 0");
 
         return 0;
@@ -319,7 +319,7 @@ static int
 claw_tx(struct sk_buff *skb, struct net_device *dev)
 {
         int             rc;
-        struct claw_privbk *privptr=dev->priv;
+        struct claw_privbk *privptr = dev->ml_priv;
         unsigned long saveflags;
         struct chbk *p_ch;
 
@@ -404,7 +404,7 @@ claw_pack_skb(struct claw_privbk *privptr)
 static int
 claw_change_mtu(struct net_device *dev, int new_mtu)
 {
-        struct claw_privbk  *privptr=dev->priv;
+        struct claw_privbk *privptr = dev->ml_priv;
         int buff_size;
         CLAW_DBF_TEXT(4, trace, "setmtu");
         buff_size = privptr->p_env->write_size;
@@ -434,7 +434,7 @@ claw_open(struct net_device *dev)
         struct ccwbk *p_buf;
 
         CLAW_DBF_TEXT(4, trace, "open");
-        privptr = (struct claw_privbk *)dev->priv;
+        privptr = (struct claw_privbk *)dev->ml_priv;
         /*   allocate and initialize CCW blocks */
         if (privptr->buffs_alloc == 0) {
                 rc=init_ccw_bk(dev);
@@ -780,7 +780,7 @@ claw_irq_tasklet ( unsigned long data )
         p_ch = (struct chbk *) data;
         dev = (struct net_device *)p_ch->ndev;
         CLAW_DBF_TEXT(4, trace, "IRQtask");
-        privptr = (struct claw_privbk *) dev->priv;
+        privptr = (struct claw_privbk *)dev->ml_priv;
         unpack_read(dev);
         clear_bit(CLAW_BH_ACTIVE, (void *)&p_ch->flag_a);
         CLAW_DBF_TEXT(4, trace, "TskletXt");
@@ -805,7 +805,7 @@ claw_release(struct net_device *dev)
 
         if (!dev)
                 return 0;
-        privptr = (struct claw_privbk *) dev->priv;
+        privptr = (struct claw_privbk *)dev->ml_priv;
         if (!privptr)
                 return 0;
         CLAW_DBF_TEXT(4, trace, "release");
@@ -960,7 +960,7 @@ claw_write_next ( struct chbk * p_ch )
         if (p_ch->claw_state == CLAW_STOP)
                 return;
         dev = (struct net_device *) p_ch->ndev;
-        privptr = (struct claw_privbk *) dev->priv;
+        privptr = (struct claw_privbk *) dev->ml_priv;
         claw_free_wrt_buf( dev );
         if ((privptr->write_free_count > 0) &&
             !skb_queue_empty(&p_ch->collect_queue)) {
@@ -1042,7 +1042,7 @@ add_claw_reads(struct net_device *dev, struct ccwbk* p_first,
         struct ccw1  temp_ccw;
         struct endccw * p_end;
         CLAW_DBF_TEXT(4, trace, "addreads");
-        privptr = dev->priv;
+        privptr = dev->ml_priv;
         p_end = privptr->p_end_ccw;
 
         /* first CCW and last CCW contains a new set of read channel programs
@@ -1212,7 +1212,7 @@ find_link(struct net_device *dev, char *host_name, char *ws_name )
         int    rc=0;
 
         CLAW_DBF_TEXT(2, setup, "findlink");
-        privptr=dev->priv;
+        privptr = dev->ml_priv;
         p_env=privptr->p_env;
         switch (p_env->packing)
         {
@@ -1264,7 +1264,7 @@ claw_hw_tx(struct sk_buff *skb, struct net_device *dev, long linkid)
         struct chbk                     *ch;
 
         CLAW_DBF_TEXT(4, trace, "hw_tx");
-        privptr = (struct claw_privbk *) (dev->priv);
+        privptr = (struct claw_privbk *)(dev->ml_priv);
         p_ch=(struct chbk *)&privptr->channel[WRITE];
         p_env =privptr->p_env;
         claw_free_wrt_buf(dev); /* Clean up free chain if posible */
@@ -1483,8 +1483,8 @@ init_ccw_bk(struct net_device *dev)
         struct ccwbk*p_last_CCWB;
         struct ccwbk*p_first_CCWB;
         struct endccw *p_endccw=NULL;
-        addr_t  real_address;
-        struct claw_privbk *privptr=dev->priv;
+        addr_t  real_address;
+        struct claw_privbk *privptr = dev->ml_priv;
         struct clawh *pClawH=NULL;
         addr_t   real_TIC_address;
         int i,j;
@@ -1960,19 +1960,16 @@ init_ccw_bk(struct net_device *dev)
 static void
 probe_error( struct ccwgroup_device *cgdev)
 {
-  struct claw_privbk *privptr;
+        struct claw_privbk *privptr;
 
         CLAW_DBF_TEXT(4, trace, "proberr");
-        privptr=(struct claw_privbk *)cgdev->dev.driver_data;
-        if (privptr!=NULL) {
+        privptr = (struct claw_privbk *) cgdev->dev.driver_data;
+        if (privptr != NULL) {
+                cgdev->dev.driver_data = NULL;
                 kfree(privptr->p_env);
-                privptr->p_env=NULL;
-                kfree(privptr->p_mtc_envelope);
-                privptr->p_mtc_envelope=NULL;
-                kfree(privptr);
-                privptr=NULL;
-        }
-        return;
+                kfree(privptr->p_mtc_envelope);
+                kfree(privptr);
+        }
 }    /*    probe_error    */
 
 /*-------------------------------------------------------------------*
@@ -2000,7 +1997,7 @@ claw_process_control( struct net_device *dev, struct ccwbk * p_ccw)
         CLAW_DBF_TEXT(2, setup, "clw_cntl");
         udelay(1000);  /* Wait a ms for the control packets to
                         *catch up to each other */
-        privptr=dev->priv;
+        privptr = dev->ml_priv;
         p_env=privptr->p_env;
         tdev = &privptr->channel[READ].cdev->dev;
         memcpy( &temp_host_name, p_env->host_name, 8);
@@ -2278,7 +2275,7 @@ claw_send_control(struct net_device *dev, __u8 type, __u8 link,
         struct sk_buff                  *skb;
 
         CLAW_DBF_TEXT(2, setup, "sndcntl");
-        privptr=dev->priv;
+        privptr = dev->ml_priv;
         p_ctl=(struct clawctl *)&privptr->ctl_bk;
 
         p_ctl->command=type;
@@ -2348,7 +2345,7 @@ static int
 claw_snd_conn_req(struct net_device *dev, __u8 link)
 {
         int                rc;
-        struct claw_privbk *privptr=dev->priv;
+        struct claw_privbk *privptr = dev->ml_priv;
         struct clawctl     *p_ctl;
 
         CLAW_DBF_TEXT(2, setup, "snd_conn");
@@ -2408,7 +2405,7 @@ claw_snd_sys_validate_rsp(struct net_device *dev,
         int    rc;
 
         CLAW_DBF_TEXT(2, setup, "chkresp");
-        privptr = dev->priv;
+        privptr = dev->ml_priv;
         p_env=privptr->p_env;
         rc=claw_send_control(dev, SYSTEM_VALIDATE_RESPONSE,
                 p_ctl->linkid,
@@ -2446,7 +2443,7 @@ net_device_stats *claw_stats(struct net_device *dev)
         struct claw_privbk *privptr;
 
         CLAW_DBF_TEXT(4, trace, "stats");
-        privptr = dev->priv;
+        privptr = dev->ml_priv;
         return &privptr->stats;
 }     /*   end of claw_stats   */
 
@@ -2482,7 +2479,7 @@ unpack_read(struct net_device *dev )
         p_last_ccw=NULL;
         p_packh=NULL;
         p_packd=NULL;
-        privptr=dev->priv;
+        privptr = dev->ml_priv;
 
         p_dev = &privptr->channel[READ].cdev->dev;
         p_env = privptr->p_env;
@@ -2651,7 +2648,7 @@ claw_strt_read (struct net_device *dev, int lock )
         int        rc = 0;
         __u32      parm;
         unsigned long  saveflags = 0;
-        struct claw_privbk *privptr=dev->priv;
+        struct claw_privbk *privptr = dev->ml_priv;
         struct ccwbk*p_ccwbk;
         struct chbk *p_ch;
         struct clawh *p_clawh;
@@ -2708,7 +2705,7 @@ claw_strt_out_IO( struct net_device *dev )
         if (!dev) {
                 return;
         }
-        privptr=(struct claw_privbk *)dev->priv;
+        privptr = (struct claw_privbk *)dev->ml_priv;
         p_ch=&privptr->channel[WRITE];
 
         CLAW_DBF_TEXT(4, trace, "strt_io");
@@ -2741,7 +2738,7 @@ static void
 claw_free_wrt_buf( struct net_device *dev )
 {
 
-        struct claw_privbk *privptr=(struct claw_privbk *)dev->priv;
+        struct claw_privbk *privptr = (struct claw_privbk *)dev->ml_priv;
         struct ccwbk*p_first_ccw;
         struct ccwbk*p_last_ccw;
         struct ccwbk*p_this_ccw;
@@ -2798,13 +2795,13 @@ claw_free_netdevice(struct net_device * dev, int free_dev)
         if (!dev)
                 return;
         CLAW_DBF_TEXT_(2, setup, "%s", dev->name);
-        privptr = dev->priv;
+        privptr = dev->ml_priv;
         if (dev->flags & IFF_RUNNING)
                 claw_release(dev);
         if (privptr) {
                 privptr->channel[READ].ndev = NULL;  /* say it's free */
         }
-        dev->priv=NULL;
+        dev->ml_priv = NULL;
 #ifdef MODULE
         if (free_dev) {
                 free_netdev(dev);
@@ -2921,7 +2918,7 @@ claw_new_device(struct ccwgroup_device *cgdev)
                 printk(KERN_WARNING "%s:alloc_netdev failed\n",__func__);
                 goto out;
         }
-        dev->priv = privptr;
+        dev->ml_priv = privptr;
         cgdev->dev.driver_data = privptr;
         cgdev->cdev[READ]->dev.driver_data = privptr;
         cgdev->cdev[WRITE]->dev.driver_data = privptr;
@@ -3002,7 +2999,7 @@ claw_shutdown_device(struct ccwgroup_device *cgdev)
                         ret = claw_release(ndev);
                 ndev->flags &=~IFF_RUNNING;
                 unregister_netdev(ndev);
-                ndev->priv = NULL;  /* cgdev data, not ndev's to free */
+                ndev->ml_priv = NULL;  /* cgdev data, not ndev's to free */
                 claw_free_netdevice(ndev, 1);
                 priv->channel[READ].ndev = NULL;
                 priv->channel[WRITE].ndev = NULL;
diff --git a/drivers/s390/net/ctcm_fsms.c b/drivers/s390/net/ctcm_fsms.c
index 0b4e6253abe4..42776550acfd 100644
--- a/drivers/s390/net/ctcm_fsms.c
+++ b/drivers/s390/net/ctcm_fsms.c
@@ -245,7 +245,7 @@ static void chx_txdone(fsm_instance *fi, 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 sk_buff *skb;
         int first = 1;
         int i;
@@ -336,7 +336,7 @@ void ctcm_chx_txidle(fsm_instance *fi, 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;
 
         CTCM_PR_DEBUG("%s(%s): %s\n", __func__, ch->id, dev->name);
 
@@ -357,7 +357,7 @@ static void chx_rx(fsm_instance *fi, 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;
         int len = ch->max_bufsize - ch->irb->scsw.cmd.count;
         struct sk_buff *skb = ch->trans_skb;
         __u16 block_len = *((__u16 *)skb->data);
@@ -459,7 +459,7 @@ static void chx_firstio(fsm_instance *fi, int event, void *arg)
                         chx_rxidle(fi, event, arg);
                 } else {
                         struct net_device *dev = ch->netdev;
-                        struct ctcm_priv *priv = dev->priv;
+                        struct ctcm_priv *priv = dev->ml_priv;
                         fsm_newstate(fi, CTC_STATE_TXIDLE);
                         fsm_event(priv->fsm, DEV_EVENT_TXUP, dev);
                 }
@@ -496,7 +496,7 @@ static void chx_firstio(fsm_instance *fi, int event, void *arg)
         if ((CHANNEL_DIRECTION(ch->flags) == READ) &&
             (ch->protocol == CTCM_PROTO_S390)) {
                 struct net_device *dev = ch->netdev;
-                struct ctcm_priv *priv = dev->priv;
+                struct ctcm_priv *priv = dev->ml_priv;
                 fsm_event(priv->fsm, DEV_EVENT_RXUP, dev);
         }
 }
@@ -514,7 +514,7 @@ static void chx_rxidle(fsm_instance *fi, 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;
         __u16 buflen;
         int rc;
 
@@ -699,7 +699,7 @@ static void ctcm_chx_cleanup(fsm_instance *fi, int state,
                 struct channel *ch)
 {
         struct net_device *dev = ch->netdev;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
 
         CTCM_DBF_TEXT_(SETUP, CTC_DBF_NOTICE,
                         "%s(%s): %s[%d]\n",
@@ -784,7 +784,7 @@ static void ctcm_chx_setuperr(fsm_instance *fi, 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;
 
         /*
          * Special case: Got UC_RCRESET on setmode.
@@ -874,7 +874,7 @@ static void ctcm_chx_rxiniterr(fsm_instance *fi, 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;
 
         if (event == CTC_EVENT_TIMER) {
                 if (!IS_MPCDEV(dev))
@@ -902,7 +902,7 @@ static void ctcm_chx_rxinitfail(fsm_instance *fi, 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;
 
         CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR,
                         "%s(%s): RX %s busy, init. fail",
@@ -923,7 +923,7 @@ static void ctcm_chx_rxdisc(fsm_instance *fi, int event, void *arg)
         struct channel *ch = arg;
         struct channel *ch2;
         struct net_device *dev = ch->netdev;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
 
         CTCM_DBF_TEXT_(TRACE, CTC_DBF_NOTICE,
                         "%s: %s: remote disconnect - re-init ...",
@@ -954,7 +954,7 @@ static void ctcm_chx_txiniterr(fsm_instance *fi, 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;
 
         if (event == CTC_EVENT_TIMER) {
                 fsm_deltimer(&ch->timer);
@@ -984,7 +984,7 @@ static void ctcm_chx_txretry(fsm_instance *fi, 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 sk_buff *skb;
 
         CTCM_PR_DEBUG("Enter: %s: cp=%i ch=0x%p id=%s\n",
@@ -1057,7 +1057,7 @@ static void ctcm_chx_iofatal(fsm_instance *fi, 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;
         int rd = CHANNEL_DIRECTION(ch->flags);
 
         fsm_deltimer(&ch->timer);
@@ -1207,7 +1207,7 @@ static void ctcmpc_chx_txdone(fsm_instance *fi, 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;
         struct sk_buff          *skb;
         int             first = 1;
@@ -1368,7 +1368,7 @@ static void ctcmpc_chx_rx(fsm_instance *fi, 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;
         struct sk_buff          *skb = ch->trans_skb;
         struct sk_buff          *new_skb;
@@ -1471,7 +1471,7 @@ static void ctcmpc_chx_firstio(fsm_instance *fi, 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        *gptr = priv->mpcg;
 
         CTCM_PR_DEBUG("Enter %s: id=%s, ch=0x%p\n",
@@ -1525,7 +1525,7 @@ void ctcmpc_chx_rxidle(fsm_instance *fi, 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;
         int rc;
         unsigned long saveflags = 0;    /* avoids compiler warning */
@@ -1580,7 +1580,7 @@ static void ctcmpc_chx_attn(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("%s(%s): %s(ch=0x%p), cp=%i, ChStat:%s, GrpStat:%s\n",
@@ -1639,7 +1639,7 @@ static void ctcmpc_chx_attnbusy(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("%s(%s): %s\n  ChState:%s GrpState:%s\n",
@@ -1724,7 +1724,7 @@ static void ctcmpc_chx_resend(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;
 
         fsm_event(grp->fsm, MPCG_EVENT_XID0DO, ch);
@@ -1740,7 +1740,7 @@ static void ctcmpc_chx_send_sweep(fsm_instance *fsm, int event, void *arg)
 {
         struct channel *ach = arg;
         struct net_device *dev = ach->netdev;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
         struct mpc_group *grp = priv->mpcg;
         struct channel *wch = priv->channel[WRITE];
         struct channel *rch = priv->channel[READ];
@@ -2050,7 +2050,7 @@ int mpc_ch_fsm_len = ARRAY_SIZE(ctcmpc_ch_fsm);
 static void dev_action_start(fsm_instance *fi, int event, void *arg)
 {
         struct net_device *dev = arg;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
         int direction;
 
         CTCMY_DBF_DEV_NAME(SETUP, dev, "");
@@ -2076,7 +2076,7 @@ static void dev_action_stop(fsm_instance *fi, int event, void *arg)
 {
         int direction;
         struct net_device *dev = arg;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
 
         CTCMY_DBF_DEV_NAME(SETUP, dev, "");
 
@@ -2096,7 +2096,7 @@ static void dev_action_restart(fsm_instance *fi, int event, void *arg)
 {
         int restart_timer;
         struct net_device *dev = arg;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
 
         CTCMY_DBF_DEV_NAME(TRACE, dev, "");
 
@@ -2133,12 +2133,12 @@ static void dev_action_restart(fsm_instance *fi, int event, void *arg)
 static void dev_action_chup(fsm_instance *fi, int event, void *arg)
 {
         struct net_device *dev = arg;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
         int dev_stat = fsm_getstate(fi);
 
         CTCM_DBF_TEXT_(SETUP, CTC_DBF_NOTICE,
                         "%s(%s): priv = %p [%d,%d]\n ", CTCM_FUNTAIL,
-                                dev->name, dev->priv, dev_stat, event);
+                                dev->name, dev->ml_priv, dev_stat, event);
 
         switch (fsm_getstate(fi)) {
         case DEV_STATE_STARTWAIT_RXTX:
@@ -2195,7 +2195,7 @@ static void dev_action_chdown(fsm_instance *fi, int event, void *arg)
 {
 
         struct net_device *dev = arg;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
 
         CTCMY_DBF_DEV_NAME(SETUP, dev, "");
 
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);
diff --git a/drivers/s390/net/ctcm_main.h b/drivers/s390/net/ctcm_main.h
index a72e0feeb27f..8e10ee86a5ee 100644
--- a/drivers/s390/net/ctcm_main.h
+++ b/drivers/s390/net/ctcm_main.h
@@ -229,14 +229,14 @@ void ctcm_remove_files(struct device *dev);
  */
 static inline void ctcm_clear_busy_do(struct net_device *dev)
 {
-        clear_bit(0, &(((struct ctcm_priv *)dev->priv)->tbusy));
+        clear_bit(0, &(((struct ctcm_priv *)dev->ml_priv)->tbusy));
         netif_wake_queue(dev);
 }
 
 static inline void ctcm_clear_busy(struct net_device *dev)
 {
         struct mpc_group *grp;
-        grp = ((struct ctcm_priv *)dev->priv)->mpcg;
+        grp = ((struct ctcm_priv *)dev->ml_priv)->mpcg;
 
         if (!(grp && grp->in_sweep))
                 ctcm_clear_busy_do(dev);
@@ -246,7 +246,8 @@ static inline void ctcm_clear_busy(struct net_device *dev)
 static inline int ctcm_test_and_set_busy(struct net_device *dev)
 {
         netif_stop_queue(dev);
-        return test_and_set_bit(0, &(((struct ctcm_priv *)dev->priv)->tbusy));
+        return test_and_set_bit(0,
+                        &(((struct ctcm_priv *)dev->ml_priv)->tbusy));
 }
 
 extern int loglevel;
@@ -292,7 +293,7 @@ struct mpc_group *ctcmpc_init_mpc_group(struct ctcm_priv *priv);
 #define IS_MPC(p) ((p)->protocol == CTCM_PROTO_MPC)
 
 /* test if struct ctcm_priv of struct net_device has MPC protocol setting */
-#define IS_MPCDEV(d) IS_MPC((struct ctcm_priv *)d->priv)
+#define IS_MPCDEV(dev) IS_MPC((struct ctcm_priv *)dev->ml_priv)
 
 static inline gfp_t gfp_type(void)
 {
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",
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index 6de28385b354..9bcfa04d863b 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -1412,7 +1412,8 @@ lcs_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
         }
         /* How far in the ccw chain have we processed? */
         if ((channel->state != LCS_CH_STATE_INIT) &&
-            (irb->scsw.cmd.fctl & SCSW_FCTL_START_FUNC)) {
+            (irb->scsw.cmd.fctl & SCSW_FCTL_START_FUNC) &&
+            (irb->scsw.cmd.cpa != 0)) {
                 index = (struct ccw1 *) __va((addr_t) irb->scsw.cmd.cpa)
                         - channel->ccws;
                 if ((irb->scsw.cmd.actl & SCSW_ACTL_SUSPENDED) ||
diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
index 80971c21ea1a..bf8a75c92f28 100644
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -689,6 +689,7 @@ struct qeth_mc_mac {
         struct list_head list;
         __u8 mc_addr[MAX_ADDR_LEN];
         unsigned char mc_addrlen;
+        int is_vmac;
 };
 
 struct qeth_card {
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index bd420d1b9a0d..c7ab1b864516 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -3024,7 +3024,7 @@ static inline void __qeth_fill_buffer(struct sk_buff *skb,
         struct qdio_buffer *buffer, int is_tso, int *next_element_to_fill,
         int offset)
 {
-        int length = skb->len;
+        int length = skb->len - offset;
         int length_here;
         int element;
         char *data;
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index b3cee032f578..3ac3cc1e03cc 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -177,9 +177,10 @@ static int qeth_l2_send_delgroupmac(struct qeth_card *card, __u8 *mac)
                                           qeth_l2_send_delgroupmac_cb);
 }
 
-static void qeth_l2_add_mc(struct qeth_card *card, __u8 *mac)
+static void qeth_l2_add_mc(struct qeth_card *card, __u8 *mac, int vmac)
 {
         struct qeth_mc_mac *mc;
+        int rc;
 
         mc = kmalloc(sizeof(struct qeth_mc_mac), GFP_ATOMIC);
 
@@ -188,8 +189,16 @@ static void qeth_l2_add_mc(struct qeth_card *card, __u8 *mac)
 
         memcpy(mc->mc_addr, mac, OSA_ADDR_LEN);
         mc->mc_addrlen = OSA_ADDR_LEN;
+        mc->is_vmac = vmac;
+
+        if (vmac) {
+                rc = qeth_l2_send_setdelmac(card, mac, IPA_CMD_SETVMAC,
+                                        NULL);
+        } else {
+                rc = qeth_l2_send_setgroupmac(card, mac);
+        }
 
-        if (!qeth_l2_send_setgroupmac(card, mac))
+        if (!rc)
                 list_add_tail(&mc->list, &card->mc_list);
         else
                 kfree(mc);
@@ -201,7 +210,11 @@ static void qeth_l2_del_all_mc(struct qeth_card *card)
 
         spin_lock_bh(&card->mclock);
         list_for_each_entry_safe(mc, tmp, &card->mc_list, list) {
-                qeth_l2_send_delgroupmac(card, mc->mc_addr);
+                if (mc->is_vmac)
+                        qeth_l2_send_setdelmac(card, mc->mc_addr,
+                                        IPA_CMD_DELVMAC, NULL);
+                else
+                        qeth_l2_send_delgroupmac(card, mc->mc_addr);
                 list_del(&mc->list);
                 kfree(mc);
         }
@@ -590,7 +603,7 @@ static int qeth_l2_set_mac_address(struct net_device *dev, void *p)
 static void qeth_l2_set_multicast_list(struct net_device *dev)
 {
         struct qeth_card *card = dev->ml_priv;
-        struct dev_mc_list *dm;
+        struct dev_addr_list *dm;
 
         if (card->info.type == QETH_CARD_TYPE_OSN)
                 return ;
@@ -599,7 +612,11 @@ static void qeth_l2_set_multicast_list(struct net_device *dev)
         qeth_l2_del_all_mc(card);
         spin_lock_bh(&card->mclock);
         for (dm = dev->mc_list; dm; dm = dm->next)
-                qeth_l2_add_mc(card, dm->dmi_addr);
+                qeth_l2_add_mc(card, dm->da_addr, 0);
+
+        for (dm = dev->uc_list; dm; dm = dm->next)
+                qeth_l2_add_mc(card, dm->da_addr, 1);
+
         spin_unlock_bh(&card->mclock);
         if (!qeth_adp_supported(card, IPA_SETADP_SET_PROMISC_MODE))
                 return;
diff --git a/drivers/s390/net/qeth_l3_sys.c b/drivers/s390/net/qeth_l3_sys.c
index ac1993708ae9..210ddb639748 100644
--- a/drivers/s390/net/qeth_l3_sys.c
+++ b/drivers/s390/net/qeth_l3_sys.c
@@ -136,7 +136,7 @@ static ssize_t qeth_l3_dev_route6_store(struct device *dev,
                 return -EINVAL;
 
         if (!qeth_is_supported(card, IPA_IPV6)) {
-                return -ENOTSUPP;
+                return -EOPNOTSUPP;
         }
 
         return qeth_l3_dev_route_store(card, &card->options.route6,