diff options
Diffstat (limited to 'drivers/s390')
-rw-r--r-- | drivers/s390/block/dcssblk.c | 5 | ||||
-rw-r--r-- | drivers/s390/cio/chp.c | 7 | ||||
-rw-r--r-- | drivers/s390/cio/cio.c | 4 | ||||
-rw-r--r-- | drivers/s390/cio/css.c | 32 | ||||
-rw-r--r-- | drivers/s390/cio/device_fsm.c | 7 | ||||
-rw-r--r-- | drivers/s390/net/claw.c | 79 | ||||
-rw-r--r-- | drivers/s390/net/ctcm_fsms.c | 56 | ||||
-rw-r--r-- | drivers/s390/net/ctcm_main.c | 24 | ||||
-rw-r--r-- | drivers/s390/net/ctcm_main.h | 9 | ||||
-rw-r--r-- | drivers/s390/net/ctcm_mpc.c | 46 | ||||
-rw-r--r-- | drivers/s390/net/lcs.c | 3 | ||||
-rw-r--r-- | drivers/s390/net/qeth_core.h | 1 | ||||
-rw-r--r-- | drivers/s390/net/qeth_core_main.c | 2 | ||||
-rw-r--r-- | drivers/s390/net/qeth_l2_main.c | 27 | ||||
-rw-r--r-- | drivers/s390/net/qeth_l3_sys.c | 2 | ||||
-rw-r--r-- | drivers/s390/scsi/zfcp_ccw.c | 6 | ||||
-rw-r--r-- | drivers/s390/scsi/zfcp_fc.c | 33 | ||||
-rw-r--r-- | drivers/s390/scsi/zfcp_fsf.c | 88 | ||||
-rw-r--r-- | drivers/s390/scsi/zfcp_qdio.c | 4 |
19 files changed, 227 insertions, 208 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 | |||
384 | * get minor, add to list | 384 | * get minor, add to list |
385 | */ | 385 | */ |
386 | down_write(&dcssblk_devices_sem); | 386 | down_write(&dcssblk_devices_sem); |
387 | if (dcssblk_get_segment_by_name(local_buf)) { | 387 | if (dcssblk_get_device_by_name(local_buf)) { |
388 | up_write(&dcssblk_devices_sem); | ||
388 | rc = -EEXIST; | 389 | rc = -EEXIST; |
389 | goto release_gd; | 390 | goto unload_seg; |
390 | } | 391 | } |
391 | rc = dcssblk_assign_free_minor(dev_info); | 392 | rc = dcssblk_assign_free_minor(dev_info); |
392 | if (rc) { | 393 | if (rc) { |
diff --git a/drivers/s390/cio/chp.c b/drivers/s390/cio/chp.c index db00b0591733..f1216cf6fa8f 100644 --- a/drivers/s390/cio/chp.c +++ b/drivers/s390/cio/chp.c | |||
@@ -423,7 +423,7 @@ int chp_new(struct chp_id chpid) | |||
423 | ret = sysfs_create_group(&chp->dev.kobj, &chp_attr_group); | 423 | ret = sysfs_create_group(&chp->dev.kobj, &chp_attr_group); |
424 | if (ret) { | 424 | if (ret) { |
425 | device_unregister(&chp->dev); | 425 | device_unregister(&chp->dev); |
426 | goto out_free; | 426 | goto out; |
427 | } | 427 | } |
428 | mutex_lock(&channel_subsystems[chpid.cssid]->mutex); | 428 | mutex_lock(&channel_subsystems[chpid.cssid]->mutex); |
429 | if (channel_subsystems[chpid.cssid]->cm_enabled) { | 429 | if (channel_subsystems[chpid.cssid]->cm_enabled) { |
@@ -432,14 +432,15 @@ int chp_new(struct chp_id chpid) | |||
432 | sysfs_remove_group(&chp->dev.kobj, &chp_attr_group); | 432 | sysfs_remove_group(&chp->dev.kobj, &chp_attr_group); |
433 | device_unregister(&chp->dev); | 433 | device_unregister(&chp->dev); |
434 | mutex_unlock(&channel_subsystems[chpid.cssid]->mutex); | 434 | mutex_unlock(&channel_subsystems[chpid.cssid]->mutex); |
435 | goto out_free; | 435 | goto out; |
436 | } | 436 | } |
437 | } | 437 | } |
438 | channel_subsystems[chpid.cssid]->chps[chpid.id] = chp; | 438 | channel_subsystems[chpid.cssid]->chps[chpid.id] = chp; |
439 | mutex_unlock(&channel_subsystems[chpid.cssid]->mutex); | 439 | mutex_unlock(&channel_subsystems[chpid.cssid]->mutex); |
440 | return ret; | 440 | goto out; |
441 | out_free: | 441 | out_free: |
442 | kfree(chp); | 442 | kfree(chp); |
443 | out: | ||
443 | return ret; | 444 | return ret; |
444 | } | 445 | } |
445 | 446 | ||
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c index 33bff8fec7d1..5954b905e3ca 100644 --- a/drivers/s390/cio/cio.c +++ b/drivers/s390/cio/cio.c | |||
@@ -208,8 +208,10 @@ cio_start_key (struct subchannel *sch, /* subchannel structure */ | |||
208 | case 1: /* status pending */ | 208 | case 1: /* status pending */ |
209 | case 2: /* busy */ | 209 | case 2: /* busy */ |
210 | return -EBUSY; | 210 | return -EBUSY; |
211 | default: /* device/path not operational */ | 211 | case 3: /* device/path not operational */ |
212 | return cio_start_handle_notoper(sch, lpm); | 212 | return cio_start_handle_notoper(sch, lpm); |
213 | default: | ||
214 | return ccode; | ||
213 | } | 215 | } |
214 | } | 216 | } |
215 | 217 | ||
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c index 51489eff6b0b..1261e1a9e8cd 100644 --- a/drivers/s390/cio/css.c +++ b/drivers/s390/cio/css.c | |||
@@ -633,6 +633,11 @@ channel_subsystem_release(struct device *dev) | |||
633 | 633 | ||
634 | css = to_css(dev); | 634 | css = to_css(dev); |
635 | mutex_destroy(&css->mutex); | 635 | mutex_destroy(&css->mutex); |
636 | if (css->pseudo_subchannel) { | ||
637 | /* Implies that it has been generated but never registered. */ | ||
638 | css_subchannel_release(&css->pseudo_subchannel->dev); | ||
639 | css->pseudo_subchannel = NULL; | ||
640 | } | ||
636 | kfree(css); | 641 | kfree(css); |
637 | } | 642 | } |
638 | 643 | ||
@@ -785,11 +790,15 @@ init_channel_subsystem (void) | |||
785 | } | 790 | } |
786 | channel_subsystems[i] = css; | 791 | channel_subsystems[i] = css; |
787 | ret = setup_css(i); | 792 | ret = setup_css(i); |
788 | if (ret) | 793 | if (ret) { |
789 | goto out_free; | 794 | kfree(channel_subsystems[i]); |
795 | goto out_unregister; | ||
796 | } | ||
790 | ret = device_register(&css->device); | 797 | ret = device_register(&css->device); |
791 | if (ret) | 798 | if (ret) { |
792 | goto out_free_all; | 799 | put_device(&css->device); |
800 | goto out_unregister; | ||
801 | } | ||
793 | if (css_chsc_characteristics.secm) { | 802 | if (css_chsc_characteristics.secm) { |
794 | ret = device_create_file(&css->device, | 803 | ret = device_create_file(&css->device, |
795 | &dev_attr_cm_enable); | 804 | &dev_attr_cm_enable); |
@@ -802,7 +811,7 @@ init_channel_subsystem (void) | |||
802 | } | 811 | } |
803 | ret = register_reboot_notifier(&css_reboot_notifier); | 812 | ret = register_reboot_notifier(&css_reboot_notifier); |
804 | if (ret) | 813 | if (ret) |
805 | goto out_pseudo; | 814 | goto out_unregister; |
806 | css_init_done = 1; | 815 | css_init_done = 1; |
807 | 816 | ||
808 | /* Enable default isc for I/O subchannels. */ | 817 | /* Enable default isc for I/O subchannels. */ |
@@ -810,18 +819,12 @@ init_channel_subsystem (void) | |||
810 | 819 | ||
811 | for_each_subchannel(__init_channel_subsystem, NULL); | 820 | for_each_subchannel(__init_channel_subsystem, NULL); |
812 | return 0; | 821 | return 0; |
813 | out_pseudo: | ||
814 | device_unregister(&channel_subsystems[i]->pseudo_subchannel->dev); | ||
815 | out_file: | 822 | out_file: |
816 | device_remove_file(&channel_subsystems[i]->device, | 823 | if (css_chsc_characteristics.secm) |
817 | &dev_attr_cm_enable); | 824 | device_remove_file(&channel_subsystems[i]->device, |
825 | &dev_attr_cm_enable); | ||
818 | out_device: | 826 | out_device: |
819 | device_unregister(&channel_subsystems[i]->device); | 827 | device_unregister(&channel_subsystems[i]->device); |
820 | out_free_all: | ||
821 | kfree(channel_subsystems[i]->pseudo_subchannel->lock); | ||
822 | kfree(channel_subsystems[i]->pseudo_subchannel); | ||
823 | out_free: | ||
824 | kfree(channel_subsystems[i]); | ||
825 | out_unregister: | 828 | out_unregister: |
826 | while (i > 0) { | 829 | while (i > 0) { |
827 | struct channel_subsystem *css; | 830 | struct channel_subsystem *css; |
@@ -829,6 +832,7 @@ out_unregister: | |||
829 | i--; | 832 | i--; |
830 | css = channel_subsystems[i]; | 833 | css = channel_subsystems[i]; |
831 | device_unregister(&css->pseudo_subchannel->dev); | 834 | device_unregister(&css->pseudo_subchannel->dev); |
835 | css->pseudo_subchannel = NULL; | ||
832 | if (css_chsc_characteristics.secm) | 836 | if (css_chsc_characteristics.secm) |
833 | device_remove_file(&css->device, | 837 | device_remove_file(&css->device, |
834 | &dev_attr_cm_enable); | 838 | &dev_attr_cm_enable); |
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c index 550508df952b..84cc9ea346db 100644 --- a/drivers/s390/cio/device_fsm.c +++ b/drivers/s390/cio/device_fsm.c | |||
@@ -658,6 +658,13 @@ ccw_device_offline(struct ccw_device *cdev) | |||
658 | { | 658 | { |
659 | struct subchannel *sch; | 659 | struct subchannel *sch; |
660 | 660 | ||
661 | /* Allow ccw_device_offline while disconnected. */ | ||
662 | if (cdev->private->state == DEV_STATE_DISCONNECTED || | ||
663 | cdev->private->state == DEV_STATE_NOT_OPER) { | ||
664 | cdev->private->flags.donotify = 0; | ||
665 | ccw_device_done(cdev, DEV_STATE_NOT_OPER); | ||
666 | return 0; | ||
667 | } | ||
661 | if (ccw_device_is_orphan(cdev)) { | 668 | if (ccw_device_is_orphan(cdev)) { |
662 | ccw_device_done(cdev, DEV_STATE_OFFLINE); | 669 | ccw_device_done(cdev, DEV_STATE_OFFLINE); |
663 | return 0; | 670 | return 0; |
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) | |||
133 | static inline void | 133 | static inline void |
134 | claw_set_busy(struct net_device *dev) | 134 | claw_set_busy(struct net_device *dev) |
135 | { | 135 | { |
136 | ((struct claw_privbk *) dev->priv)->tbusy=1; | 136 | ((struct claw_privbk *)dev->ml_priv)->tbusy = 1; |
137 | eieio(); | 137 | eieio(); |
138 | } | 138 | } |
139 | 139 | ||
140 | static inline void | 140 | static inline void |
141 | claw_clear_busy(struct net_device *dev) | 141 | claw_clear_busy(struct net_device *dev) |
142 | { | 142 | { |
143 | clear_bit(0, &(((struct claw_privbk *) dev->priv)->tbusy)); | 143 | clear_bit(0, &(((struct claw_privbk *) dev->ml_priv)->tbusy)); |
144 | netif_wake_queue(dev); | 144 | netif_wake_queue(dev); |
145 | eieio(); | 145 | eieio(); |
146 | } | 146 | } |
@@ -149,20 +149,20 @@ static inline int | |||
149 | claw_check_busy(struct net_device *dev) | 149 | claw_check_busy(struct net_device *dev) |
150 | { | 150 | { |
151 | eieio(); | 151 | eieio(); |
152 | return ((struct claw_privbk *) dev->priv)->tbusy; | 152 | return ((struct claw_privbk *) dev->ml_priv)->tbusy; |
153 | } | 153 | } |
154 | 154 | ||
155 | static inline void | 155 | static inline void |
156 | claw_setbit_busy(int nr,struct net_device *dev) | 156 | claw_setbit_busy(int nr,struct net_device *dev) |
157 | { | 157 | { |
158 | netif_stop_queue(dev); | 158 | netif_stop_queue(dev); |
159 | set_bit(nr, (void *)&(((struct claw_privbk *)dev->priv)->tbusy)); | 159 | set_bit(nr, (void *)&(((struct claw_privbk *)dev->ml_priv)->tbusy)); |
160 | } | 160 | } |
161 | 161 | ||
162 | static inline void | 162 | static inline void |
163 | claw_clearbit_busy(int nr,struct net_device *dev) | 163 | claw_clearbit_busy(int nr,struct net_device *dev) |
164 | { | 164 | { |
165 | clear_bit(nr,(void *)&(((struct claw_privbk *)dev->priv)->tbusy)); | 165 | clear_bit(nr, (void *)&(((struct claw_privbk *)dev->ml_priv)->tbusy)); |
166 | netif_wake_queue(dev); | 166 | netif_wake_queue(dev); |
167 | } | 167 | } |
168 | 168 | ||
@@ -171,7 +171,7 @@ claw_test_and_setbit_busy(int nr,struct net_device *dev) | |||
171 | { | 171 | { |
172 | netif_stop_queue(dev); | 172 | netif_stop_queue(dev); |
173 | return test_and_set_bit(nr, | 173 | return test_and_set_bit(nr, |
174 | (void *)&(((struct claw_privbk *) dev->priv)->tbusy)); | 174 | (void *)&(((struct claw_privbk *) dev->ml_priv)->tbusy)); |
175 | } | 175 | } |
176 | 176 | ||
177 | 177 | ||
@@ -271,6 +271,7 @@ claw_probe(struct ccwgroup_device *cgdev) | |||
271 | if (!get_device(&cgdev->dev)) | 271 | if (!get_device(&cgdev->dev)) |
272 | return -ENODEV; | 272 | return -ENODEV; |
273 | privptr = kzalloc(sizeof(struct claw_privbk), GFP_KERNEL); | 273 | privptr = kzalloc(sizeof(struct claw_privbk), GFP_KERNEL); |
274 | cgdev->dev.driver_data = privptr; | ||
274 | if (privptr == NULL) { | 275 | if (privptr == NULL) { |
275 | probe_error(cgdev); | 276 | probe_error(cgdev); |
276 | put_device(&cgdev->dev); | 277 | put_device(&cgdev->dev); |
@@ -305,7 +306,6 @@ claw_probe(struct ccwgroup_device *cgdev) | |||
305 | privptr->p_env->p_priv = privptr; | 306 | privptr->p_env->p_priv = privptr; |
306 | cgdev->cdev[0]->handler = claw_irq_handler; | 307 | cgdev->cdev[0]->handler = claw_irq_handler; |
307 | cgdev->cdev[1]->handler = claw_irq_handler; | 308 | cgdev->cdev[1]->handler = claw_irq_handler; |
308 | cgdev->dev.driver_data = privptr; | ||
309 | CLAW_DBF_TEXT(2, setup, "prbext 0"); | 309 | CLAW_DBF_TEXT(2, setup, "prbext 0"); |
310 | 310 | ||
311 | return 0; | 311 | return 0; |
@@ -319,7 +319,7 @@ static int | |||
319 | claw_tx(struct sk_buff *skb, struct net_device *dev) | 319 | claw_tx(struct sk_buff *skb, struct net_device *dev) |
320 | { | 320 | { |
321 | int rc; | 321 | int rc; |
322 | struct claw_privbk *privptr=dev->priv; | 322 | struct claw_privbk *privptr = dev->ml_priv; |
323 | unsigned long saveflags; | 323 | unsigned long saveflags; |
324 | struct chbk *p_ch; | 324 | struct chbk *p_ch; |
325 | 325 | ||
@@ -404,7 +404,7 @@ claw_pack_skb(struct claw_privbk *privptr) | |||
404 | static int | 404 | static int |
405 | claw_change_mtu(struct net_device *dev, int new_mtu) | 405 | claw_change_mtu(struct net_device *dev, int new_mtu) |
406 | { | 406 | { |
407 | struct claw_privbk *privptr=dev->priv; | 407 | struct claw_privbk *privptr = dev->ml_priv; |
408 | int buff_size; | 408 | int buff_size; |
409 | CLAW_DBF_TEXT(4, trace, "setmtu"); | 409 | CLAW_DBF_TEXT(4, trace, "setmtu"); |
410 | buff_size = privptr->p_env->write_size; | 410 | buff_size = privptr->p_env->write_size; |
@@ -434,7 +434,7 @@ claw_open(struct net_device *dev) | |||
434 | struct ccwbk *p_buf; | 434 | struct ccwbk *p_buf; |
435 | 435 | ||
436 | CLAW_DBF_TEXT(4, trace, "open"); | 436 | CLAW_DBF_TEXT(4, trace, "open"); |
437 | privptr = (struct claw_privbk *)dev->priv; | 437 | privptr = (struct claw_privbk *)dev->ml_priv; |
438 | /* allocate and initialize CCW blocks */ | 438 | /* allocate and initialize CCW blocks */ |
439 | if (privptr->buffs_alloc == 0) { | 439 | if (privptr->buffs_alloc == 0) { |
440 | rc=init_ccw_bk(dev); | 440 | rc=init_ccw_bk(dev); |
@@ -780,7 +780,7 @@ claw_irq_tasklet ( unsigned long data ) | |||
780 | p_ch = (struct chbk *) data; | 780 | p_ch = (struct chbk *) data; |
781 | dev = (struct net_device *)p_ch->ndev; | 781 | dev = (struct net_device *)p_ch->ndev; |
782 | CLAW_DBF_TEXT(4, trace, "IRQtask"); | 782 | CLAW_DBF_TEXT(4, trace, "IRQtask"); |
783 | privptr = (struct claw_privbk *) dev->priv; | 783 | privptr = (struct claw_privbk *)dev->ml_priv; |
784 | unpack_read(dev); | 784 | unpack_read(dev); |
785 | clear_bit(CLAW_BH_ACTIVE, (void *)&p_ch->flag_a); | 785 | clear_bit(CLAW_BH_ACTIVE, (void *)&p_ch->flag_a); |
786 | CLAW_DBF_TEXT(4, trace, "TskletXt"); | 786 | CLAW_DBF_TEXT(4, trace, "TskletXt"); |
@@ -805,7 +805,7 @@ claw_release(struct net_device *dev) | |||
805 | 805 | ||
806 | if (!dev) | 806 | if (!dev) |
807 | return 0; | 807 | return 0; |
808 | privptr = (struct claw_privbk *) dev->priv; | 808 | privptr = (struct claw_privbk *)dev->ml_priv; |
809 | if (!privptr) | 809 | if (!privptr) |
810 | return 0; | 810 | return 0; |
811 | CLAW_DBF_TEXT(4, trace, "release"); | 811 | CLAW_DBF_TEXT(4, trace, "release"); |
@@ -960,7 +960,7 @@ claw_write_next ( struct chbk * p_ch ) | |||
960 | if (p_ch->claw_state == CLAW_STOP) | 960 | if (p_ch->claw_state == CLAW_STOP) |
961 | return; | 961 | return; |
962 | dev = (struct net_device *) p_ch->ndev; | 962 | dev = (struct net_device *) p_ch->ndev; |
963 | privptr = (struct claw_privbk *) dev->priv; | 963 | privptr = (struct claw_privbk *) dev->ml_priv; |
964 | claw_free_wrt_buf( dev ); | 964 | claw_free_wrt_buf( dev ); |
965 | if ((privptr->write_free_count > 0) && | 965 | if ((privptr->write_free_count > 0) && |
966 | !skb_queue_empty(&p_ch->collect_queue)) { | 966 | !skb_queue_empty(&p_ch->collect_queue)) { |
@@ -1042,7 +1042,7 @@ add_claw_reads(struct net_device *dev, struct ccwbk* p_first, | |||
1042 | struct ccw1 temp_ccw; | 1042 | struct ccw1 temp_ccw; |
1043 | struct endccw * p_end; | 1043 | struct endccw * p_end; |
1044 | CLAW_DBF_TEXT(4, trace, "addreads"); | 1044 | CLAW_DBF_TEXT(4, trace, "addreads"); |
1045 | privptr = dev->priv; | 1045 | privptr = dev->ml_priv; |
1046 | p_end = privptr->p_end_ccw; | 1046 | p_end = privptr->p_end_ccw; |
1047 | 1047 | ||
1048 | /* first CCW and last CCW contains a new set of read channel programs | 1048 | /* 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 ) | |||
1212 | int rc=0; | 1212 | int rc=0; |
1213 | 1213 | ||
1214 | CLAW_DBF_TEXT(2, setup, "findlink"); | 1214 | CLAW_DBF_TEXT(2, setup, "findlink"); |
1215 | privptr=dev->priv; | 1215 | privptr = dev->ml_priv; |
1216 | p_env=privptr->p_env; | 1216 | p_env=privptr->p_env; |
1217 | switch (p_env->packing) | 1217 | switch (p_env->packing) |
1218 | { | 1218 | { |
@@ -1264,7 +1264,7 @@ claw_hw_tx(struct sk_buff *skb, struct net_device *dev, long linkid) | |||
1264 | struct chbk *ch; | 1264 | struct chbk *ch; |
1265 | 1265 | ||
1266 | CLAW_DBF_TEXT(4, trace, "hw_tx"); | 1266 | CLAW_DBF_TEXT(4, trace, "hw_tx"); |
1267 | privptr = (struct claw_privbk *) (dev->priv); | 1267 | privptr = (struct claw_privbk *)(dev->ml_priv); |
1268 | p_ch=(struct chbk *)&privptr->channel[WRITE]; | 1268 | p_ch=(struct chbk *)&privptr->channel[WRITE]; |
1269 | p_env =privptr->p_env; | 1269 | p_env =privptr->p_env; |
1270 | claw_free_wrt_buf(dev); /* Clean up free chain if posible */ | 1270 | claw_free_wrt_buf(dev); /* Clean up free chain if posible */ |
@@ -1483,8 +1483,8 @@ init_ccw_bk(struct net_device *dev) | |||
1483 | struct ccwbk*p_last_CCWB; | 1483 | struct ccwbk*p_last_CCWB; |
1484 | struct ccwbk*p_first_CCWB; | 1484 | struct ccwbk*p_first_CCWB; |
1485 | struct endccw *p_endccw=NULL; | 1485 | struct endccw *p_endccw=NULL; |
1486 | addr_t real_address; | 1486 | addr_t real_address; |
1487 | struct claw_privbk *privptr=dev->priv; | 1487 | struct claw_privbk *privptr = dev->ml_priv; |
1488 | struct clawh *pClawH=NULL; | 1488 | struct clawh *pClawH=NULL; |
1489 | addr_t real_TIC_address; | 1489 | addr_t real_TIC_address; |
1490 | int i,j; | 1490 | int i,j; |
@@ -1960,19 +1960,16 @@ init_ccw_bk(struct net_device *dev) | |||
1960 | static void | 1960 | static void |
1961 | probe_error( struct ccwgroup_device *cgdev) | 1961 | probe_error( struct ccwgroup_device *cgdev) |
1962 | { | 1962 | { |
1963 | struct claw_privbk *privptr; | 1963 | struct claw_privbk *privptr; |
1964 | 1964 | ||
1965 | CLAW_DBF_TEXT(4, trace, "proberr"); | 1965 | CLAW_DBF_TEXT(4, trace, "proberr"); |
1966 | privptr=(struct claw_privbk *)cgdev->dev.driver_data; | 1966 | privptr = (struct claw_privbk *) cgdev->dev.driver_data; |
1967 | if (privptr!=NULL) { | 1967 | if (privptr != NULL) { |
1968 | cgdev->dev.driver_data = NULL; | ||
1968 | kfree(privptr->p_env); | 1969 | kfree(privptr->p_env); |
1969 | privptr->p_env=NULL; | 1970 | kfree(privptr->p_mtc_envelope); |
1970 | kfree(privptr->p_mtc_envelope); | 1971 | kfree(privptr); |
1971 | privptr->p_mtc_envelope=NULL; | 1972 | } |
1972 | kfree(privptr); | ||
1973 | privptr=NULL; | ||
1974 | } | ||
1975 | return; | ||
1976 | } /* probe_error */ | 1973 | } /* probe_error */ |
1977 | 1974 | ||
1978 | /*-------------------------------------------------------------------* | 1975 | /*-------------------------------------------------------------------* |
@@ -2000,7 +1997,7 @@ claw_process_control( struct net_device *dev, struct ccwbk * p_ccw) | |||
2000 | CLAW_DBF_TEXT(2, setup, "clw_cntl"); | 1997 | CLAW_DBF_TEXT(2, setup, "clw_cntl"); |
2001 | udelay(1000); /* Wait a ms for the control packets to | 1998 | udelay(1000); /* Wait a ms for the control packets to |
2002 | *catch up to each other */ | 1999 | *catch up to each other */ |
2003 | privptr=dev->priv; | 2000 | privptr = dev->ml_priv; |
2004 | p_env=privptr->p_env; | 2001 | p_env=privptr->p_env; |
2005 | tdev = &privptr->channel[READ].cdev->dev; | 2002 | tdev = &privptr->channel[READ].cdev->dev; |
2006 | memcpy( &temp_host_name, p_env->host_name, 8); | 2003 | memcpy( &temp_host_name, p_env->host_name, 8); |
@@ -2278,7 +2275,7 @@ claw_send_control(struct net_device *dev, __u8 type, __u8 link, | |||
2278 | struct sk_buff *skb; | 2275 | struct sk_buff *skb; |
2279 | 2276 | ||
2280 | CLAW_DBF_TEXT(2, setup, "sndcntl"); | 2277 | CLAW_DBF_TEXT(2, setup, "sndcntl"); |
2281 | privptr=dev->priv; | 2278 | privptr = dev->ml_priv; |
2282 | p_ctl=(struct clawctl *)&privptr->ctl_bk; | 2279 | p_ctl=(struct clawctl *)&privptr->ctl_bk; |
2283 | 2280 | ||
2284 | p_ctl->command=type; | 2281 | p_ctl->command=type; |
@@ -2348,7 +2345,7 @@ static int | |||
2348 | claw_snd_conn_req(struct net_device *dev, __u8 link) | 2345 | claw_snd_conn_req(struct net_device *dev, __u8 link) |
2349 | { | 2346 | { |
2350 | int rc; | 2347 | int rc; |
2351 | struct claw_privbk *privptr=dev->priv; | 2348 | struct claw_privbk *privptr = dev->ml_priv; |
2352 | struct clawctl *p_ctl; | 2349 | struct clawctl *p_ctl; |
2353 | 2350 | ||
2354 | CLAW_DBF_TEXT(2, setup, "snd_conn"); | 2351 | CLAW_DBF_TEXT(2, setup, "snd_conn"); |
@@ -2408,7 +2405,7 @@ claw_snd_sys_validate_rsp(struct net_device *dev, | |||
2408 | int rc; | 2405 | int rc; |
2409 | 2406 | ||
2410 | CLAW_DBF_TEXT(2, setup, "chkresp"); | 2407 | CLAW_DBF_TEXT(2, setup, "chkresp"); |
2411 | privptr = dev->priv; | 2408 | privptr = dev->ml_priv; |
2412 | p_env=privptr->p_env; | 2409 | p_env=privptr->p_env; |
2413 | rc=claw_send_control(dev, SYSTEM_VALIDATE_RESPONSE, | 2410 | rc=claw_send_control(dev, SYSTEM_VALIDATE_RESPONSE, |
2414 | p_ctl->linkid, | 2411 | p_ctl->linkid, |
@@ -2446,7 +2443,7 @@ net_device_stats *claw_stats(struct net_device *dev) | |||
2446 | struct claw_privbk *privptr; | 2443 | struct claw_privbk *privptr; |
2447 | 2444 | ||
2448 | CLAW_DBF_TEXT(4, trace, "stats"); | 2445 | CLAW_DBF_TEXT(4, trace, "stats"); |
2449 | privptr = dev->priv; | 2446 | privptr = dev->ml_priv; |
2450 | return &privptr->stats; | 2447 | return &privptr->stats; |
2451 | } /* end of claw_stats */ | 2448 | } /* end of claw_stats */ |
2452 | 2449 | ||
@@ -2482,7 +2479,7 @@ unpack_read(struct net_device *dev ) | |||
2482 | p_last_ccw=NULL; | 2479 | p_last_ccw=NULL; |
2483 | p_packh=NULL; | 2480 | p_packh=NULL; |
2484 | p_packd=NULL; | 2481 | p_packd=NULL; |
2485 | privptr=dev->priv; | 2482 | privptr = dev->ml_priv; |
2486 | 2483 | ||
2487 | p_dev = &privptr->channel[READ].cdev->dev; | 2484 | p_dev = &privptr->channel[READ].cdev->dev; |
2488 | p_env = privptr->p_env; | 2485 | p_env = privptr->p_env; |
@@ -2651,7 +2648,7 @@ claw_strt_read (struct net_device *dev, int lock ) | |||
2651 | int rc = 0; | 2648 | int rc = 0; |
2652 | __u32 parm; | 2649 | __u32 parm; |
2653 | unsigned long saveflags = 0; | 2650 | unsigned long saveflags = 0; |
2654 | struct claw_privbk *privptr=dev->priv; | 2651 | struct claw_privbk *privptr = dev->ml_priv; |
2655 | struct ccwbk*p_ccwbk; | 2652 | struct ccwbk*p_ccwbk; |
2656 | struct chbk *p_ch; | 2653 | struct chbk *p_ch; |
2657 | struct clawh *p_clawh; | 2654 | struct clawh *p_clawh; |
@@ -2708,7 +2705,7 @@ claw_strt_out_IO( struct net_device *dev ) | |||
2708 | if (!dev) { | 2705 | if (!dev) { |
2709 | return; | 2706 | return; |
2710 | } | 2707 | } |
2711 | privptr=(struct claw_privbk *)dev->priv; | 2708 | privptr = (struct claw_privbk *)dev->ml_priv; |
2712 | p_ch=&privptr->channel[WRITE]; | 2709 | p_ch=&privptr->channel[WRITE]; |
2713 | 2710 | ||
2714 | CLAW_DBF_TEXT(4, trace, "strt_io"); | 2711 | CLAW_DBF_TEXT(4, trace, "strt_io"); |
@@ -2741,7 +2738,7 @@ static void | |||
2741 | claw_free_wrt_buf( struct net_device *dev ) | 2738 | claw_free_wrt_buf( struct net_device *dev ) |
2742 | { | 2739 | { |
2743 | 2740 | ||
2744 | struct claw_privbk *privptr=(struct claw_privbk *)dev->priv; | 2741 | struct claw_privbk *privptr = (struct claw_privbk *)dev->ml_priv; |
2745 | struct ccwbk*p_first_ccw; | 2742 | struct ccwbk*p_first_ccw; |
2746 | struct ccwbk*p_last_ccw; | 2743 | struct ccwbk*p_last_ccw; |
2747 | struct ccwbk*p_this_ccw; | 2744 | struct ccwbk*p_this_ccw; |
@@ -2798,13 +2795,13 @@ claw_free_netdevice(struct net_device * dev, int free_dev) | |||
2798 | if (!dev) | 2795 | if (!dev) |
2799 | return; | 2796 | return; |
2800 | CLAW_DBF_TEXT_(2, setup, "%s", dev->name); | 2797 | CLAW_DBF_TEXT_(2, setup, "%s", dev->name); |
2801 | privptr = dev->priv; | 2798 | privptr = dev->ml_priv; |
2802 | if (dev->flags & IFF_RUNNING) | 2799 | if (dev->flags & IFF_RUNNING) |
2803 | claw_release(dev); | 2800 | claw_release(dev); |
2804 | if (privptr) { | 2801 | if (privptr) { |
2805 | privptr->channel[READ].ndev = NULL; /* say it's free */ | 2802 | privptr->channel[READ].ndev = NULL; /* say it's free */ |
2806 | } | 2803 | } |
2807 | dev->priv=NULL; | 2804 | dev->ml_priv = NULL; |
2808 | #ifdef MODULE | 2805 | #ifdef MODULE |
2809 | if (free_dev) { | 2806 | if (free_dev) { |
2810 | free_netdev(dev); | 2807 | free_netdev(dev); |
@@ -2921,7 +2918,7 @@ claw_new_device(struct ccwgroup_device *cgdev) | |||
2921 | printk(KERN_WARNING "%s:alloc_netdev failed\n",__func__); | 2918 | printk(KERN_WARNING "%s:alloc_netdev failed\n",__func__); |
2922 | goto out; | 2919 | goto out; |
2923 | } | 2920 | } |
2924 | dev->priv = privptr; | 2921 | dev->ml_priv = privptr; |
2925 | cgdev->dev.driver_data = privptr; | 2922 | cgdev->dev.driver_data = privptr; |
2926 | cgdev->cdev[READ]->dev.driver_data = privptr; | 2923 | cgdev->cdev[READ]->dev.driver_data = privptr; |
2927 | cgdev->cdev[WRITE]->dev.driver_data = privptr; | 2924 | cgdev->cdev[WRITE]->dev.driver_data = privptr; |
@@ -3002,7 +2999,7 @@ claw_shutdown_device(struct ccwgroup_device *cgdev) | |||
3002 | ret = claw_release(ndev); | 2999 | ret = claw_release(ndev); |
3003 | ndev->flags &=~IFF_RUNNING; | 3000 | ndev->flags &=~IFF_RUNNING; |
3004 | unregister_netdev(ndev); | 3001 | unregister_netdev(ndev); |
3005 | ndev->priv = NULL; /* cgdev data, not ndev's to free */ | 3002 | ndev->ml_priv = NULL; /* cgdev data, not ndev's to free */ |
3006 | claw_free_netdevice(ndev, 1); | 3003 | claw_free_netdevice(ndev, 1); |
3007 | priv->channel[READ].ndev = NULL; | 3004 | priv->channel[READ].ndev = NULL; |
3008 | priv->channel[WRITE].ndev = NULL; | 3005 | 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) | |||
245 | { | 245 | { |
246 | struct channel *ch = arg; | 246 | struct channel *ch = arg; |
247 | struct net_device *dev = ch->netdev; | 247 | struct net_device *dev = ch->netdev; |
248 | struct ctcm_priv *priv = dev->priv; | 248 | struct ctcm_priv *priv = dev->ml_priv; |
249 | struct sk_buff *skb; | 249 | struct sk_buff *skb; |
250 | int first = 1; | 250 | int first = 1; |
251 | int i; | 251 | int i; |
@@ -336,7 +336,7 @@ void ctcm_chx_txidle(fsm_instance *fi, int event, void *arg) | |||
336 | { | 336 | { |
337 | struct channel *ch = arg; | 337 | struct channel *ch = arg; |
338 | struct net_device *dev = ch->netdev; | 338 | struct net_device *dev = ch->netdev; |
339 | struct ctcm_priv *priv = dev->priv; | 339 | struct ctcm_priv *priv = dev->ml_priv; |
340 | 340 | ||
341 | CTCM_PR_DEBUG("%s(%s): %s\n", __func__, ch->id, dev->name); | 341 | CTCM_PR_DEBUG("%s(%s): %s\n", __func__, ch->id, dev->name); |
342 | 342 | ||
@@ -357,7 +357,7 @@ static void chx_rx(fsm_instance *fi, int event, void *arg) | |||
357 | { | 357 | { |
358 | struct channel *ch = arg; | 358 | struct channel *ch = arg; |
359 | struct net_device *dev = ch->netdev; | 359 | struct net_device *dev = ch->netdev; |
360 | struct ctcm_priv *priv = dev->priv; | 360 | struct ctcm_priv *priv = dev->ml_priv; |
361 | int len = ch->max_bufsize - ch->irb->scsw.cmd.count; | 361 | int len = ch->max_bufsize - ch->irb->scsw.cmd.count; |
362 | struct sk_buff *skb = ch->trans_skb; | 362 | struct sk_buff *skb = ch->trans_skb; |
363 | __u16 block_len = *((__u16 *)skb->data); | 363 | __u16 block_len = *((__u16 *)skb->data); |
@@ -459,7 +459,7 @@ static void chx_firstio(fsm_instance *fi, int event, void *arg) | |||
459 | chx_rxidle(fi, event, arg); | 459 | chx_rxidle(fi, event, arg); |
460 | } else { | 460 | } else { |
461 | struct net_device *dev = ch->netdev; | 461 | struct net_device *dev = ch->netdev; |
462 | struct ctcm_priv *priv = dev->priv; | 462 | struct ctcm_priv *priv = dev->ml_priv; |
463 | fsm_newstate(fi, CTC_STATE_TXIDLE); | 463 | fsm_newstate(fi, CTC_STATE_TXIDLE); |
464 | fsm_event(priv->fsm, DEV_EVENT_TXUP, dev); | 464 | fsm_event(priv->fsm, DEV_EVENT_TXUP, dev); |
465 | } | 465 | } |
@@ -496,7 +496,7 @@ static void chx_firstio(fsm_instance *fi, int event, void *arg) | |||
496 | if ((CHANNEL_DIRECTION(ch->flags) == READ) && | 496 | if ((CHANNEL_DIRECTION(ch->flags) == READ) && |
497 | (ch->protocol == CTCM_PROTO_S390)) { | 497 | (ch->protocol == CTCM_PROTO_S390)) { |
498 | struct net_device *dev = ch->netdev; | 498 | struct net_device *dev = ch->netdev; |
499 | struct ctcm_priv *priv = dev->priv; | 499 | struct ctcm_priv *priv = dev->ml_priv; |
500 | fsm_event(priv->fsm, DEV_EVENT_RXUP, dev); | 500 | fsm_event(priv->fsm, DEV_EVENT_RXUP, dev); |
501 | } | 501 | } |
502 | } | 502 | } |
@@ -514,7 +514,7 @@ static void chx_rxidle(fsm_instance *fi, int event, void *arg) | |||
514 | { | 514 | { |
515 | struct channel *ch = arg; | 515 | struct channel *ch = arg; |
516 | struct net_device *dev = ch->netdev; | 516 | struct net_device *dev = ch->netdev; |
517 | struct ctcm_priv *priv = dev->priv; | 517 | struct ctcm_priv *priv = dev->ml_priv; |
518 | __u16 buflen; | 518 | __u16 buflen; |
519 | int rc; | 519 | int rc; |
520 | 520 | ||
@@ -699,7 +699,7 @@ static void ctcm_chx_cleanup(fsm_instance *fi, int state, | |||
699 | struct channel *ch) | 699 | struct channel *ch) |
700 | { | 700 | { |
701 | struct net_device *dev = ch->netdev; | 701 | struct net_device *dev = ch->netdev; |
702 | struct ctcm_priv *priv = dev->priv; | 702 | struct ctcm_priv *priv = dev->ml_priv; |
703 | 703 | ||
704 | CTCM_DBF_TEXT_(SETUP, CTC_DBF_NOTICE, | 704 | CTCM_DBF_TEXT_(SETUP, CTC_DBF_NOTICE, |
705 | "%s(%s): %s[%d]\n", | 705 | "%s(%s): %s[%d]\n", |
@@ -784,7 +784,7 @@ static void ctcm_chx_setuperr(fsm_instance *fi, int event, void *arg) | |||
784 | { | 784 | { |
785 | struct channel *ch = arg; | 785 | struct channel *ch = arg; |
786 | struct net_device *dev = ch->netdev; | 786 | struct net_device *dev = ch->netdev; |
787 | struct ctcm_priv *priv = dev->priv; | 787 | struct ctcm_priv *priv = dev->ml_priv; |
788 | 788 | ||
789 | /* | 789 | /* |
790 | * Special case: Got UC_RCRESET on setmode. | 790 | * Special case: Got UC_RCRESET on setmode. |
@@ -874,7 +874,7 @@ static void ctcm_chx_rxiniterr(fsm_instance *fi, int event, void *arg) | |||
874 | { | 874 | { |
875 | struct channel *ch = arg; | 875 | struct channel *ch = arg; |
876 | struct net_device *dev = ch->netdev; | 876 | struct net_device *dev = ch->netdev; |
877 | struct ctcm_priv *priv = dev->priv; | 877 | struct ctcm_priv *priv = dev->ml_priv; |
878 | 878 | ||
879 | if (event == CTC_EVENT_TIMER) { | 879 | if (event == CTC_EVENT_TIMER) { |
880 | if (!IS_MPCDEV(dev)) | 880 | if (!IS_MPCDEV(dev)) |
@@ -902,7 +902,7 @@ static void ctcm_chx_rxinitfail(fsm_instance *fi, int event, void *arg) | |||
902 | { | 902 | { |
903 | struct channel *ch = arg; | 903 | struct channel *ch = arg; |
904 | struct net_device *dev = ch->netdev; | 904 | struct net_device *dev = ch->netdev; |
905 | struct ctcm_priv *priv = dev->priv; | 905 | struct ctcm_priv *priv = dev->ml_priv; |
906 | 906 | ||
907 | CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR, | 907 | CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR, |
908 | "%s(%s): RX %s busy, init. fail", | 908 | "%s(%s): RX %s busy, init. fail", |
@@ -923,7 +923,7 @@ static void ctcm_chx_rxdisc(fsm_instance *fi, int event, void *arg) | |||
923 | struct channel *ch = arg; | 923 | struct channel *ch = arg; |
924 | struct channel *ch2; | 924 | struct channel *ch2; |
925 | struct net_device *dev = ch->netdev; | 925 | struct net_device *dev = ch->netdev; |
926 | struct ctcm_priv *priv = dev->priv; | 926 | struct ctcm_priv *priv = dev->ml_priv; |
927 | 927 | ||
928 | CTCM_DBF_TEXT_(TRACE, CTC_DBF_NOTICE, | 928 | CTCM_DBF_TEXT_(TRACE, CTC_DBF_NOTICE, |
929 | "%s: %s: remote disconnect - re-init ...", | 929 | "%s: %s: remote disconnect - re-init ...", |
@@ -954,7 +954,7 @@ static void ctcm_chx_txiniterr(fsm_instance *fi, int event, void *arg) | |||
954 | { | 954 | { |
955 | struct channel *ch = arg; | 955 | struct channel *ch = arg; |
956 | struct net_device *dev = ch->netdev; | 956 | struct net_device *dev = ch->netdev; |
957 | struct ctcm_priv *priv = dev->priv; | 957 | struct ctcm_priv *priv = dev->ml_priv; |
958 | 958 | ||
959 | if (event == CTC_EVENT_TIMER) { | 959 | if (event == CTC_EVENT_TIMER) { |
960 | fsm_deltimer(&ch->timer); | 960 | fsm_deltimer(&ch->timer); |
@@ -984,7 +984,7 @@ static void ctcm_chx_txretry(fsm_instance *fi, int event, void *arg) | |||
984 | { | 984 | { |
985 | struct channel *ch = arg; | 985 | struct channel *ch = arg; |
986 | struct net_device *dev = ch->netdev; | 986 | struct net_device *dev = ch->netdev; |
987 | struct ctcm_priv *priv = dev->priv; | 987 | struct ctcm_priv *priv = dev->ml_priv; |
988 | struct sk_buff *skb; | 988 | struct sk_buff *skb; |
989 | 989 | ||
990 | CTCM_PR_DEBUG("Enter: %s: cp=%i ch=0x%p id=%s\n", | 990 | 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) | |||
1057 | { | 1057 | { |
1058 | struct channel *ch = arg; | 1058 | struct channel *ch = arg; |
1059 | struct net_device *dev = ch->netdev; | 1059 | struct net_device *dev = ch->netdev; |
1060 | struct ctcm_priv *priv = dev->priv; | 1060 | struct ctcm_priv *priv = dev->ml_priv; |
1061 | int rd = CHANNEL_DIRECTION(ch->flags); | 1061 | int rd = CHANNEL_DIRECTION(ch->flags); |
1062 | 1062 | ||
1063 | fsm_deltimer(&ch->timer); | 1063 | fsm_deltimer(&ch->timer); |
@@ -1207,7 +1207,7 @@ static void ctcmpc_chx_txdone(fsm_instance *fi, int event, void *arg) | |||
1207 | { | 1207 | { |
1208 | struct channel *ch = arg; | 1208 | struct channel *ch = arg; |
1209 | struct net_device *dev = ch->netdev; | 1209 | struct net_device *dev = ch->netdev; |
1210 | struct ctcm_priv *priv = dev->priv; | 1210 | struct ctcm_priv *priv = dev->ml_priv; |
1211 | struct mpc_group *grp = priv->mpcg; | 1211 | struct mpc_group *grp = priv->mpcg; |
1212 | struct sk_buff *skb; | 1212 | struct sk_buff *skb; |
1213 | int first = 1; | 1213 | int first = 1; |
@@ -1368,7 +1368,7 @@ static void ctcmpc_chx_rx(fsm_instance *fi, int event, void *arg) | |||
1368 | { | 1368 | { |
1369 | struct channel *ch = arg; | 1369 | struct channel *ch = arg; |
1370 | struct net_device *dev = ch->netdev; | 1370 | struct net_device *dev = ch->netdev; |
1371 | struct ctcm_priv *priv = dev->priv; | 1371 | struct ctcm_priv *priv = dev->ml_priv; |
1372 | struct mpc_group *grp = priv->mpcg; | 1372 | struct mpc_group *grp = priv->mpcg; |
1373 | struct sk_buff *skb = ch->trans_skb; | 1373 | struct sk_buff *skb = ch->trans_skb; |
1374 | struct sk_buff *new_skb; | 1374 | struct sk_buff *new_skb; |
@@ -1471,7 +1471,7 @@ static void ctcmpc_chx_firstio(fsm_instance *fi, int event, void *arg) | |||
1471 | { | 1471 | { |
1472 | struct channel *ch = arg; | 1472 | struct channel *ch = arg; |
1473 | struct net_device *dev = ch->netdev; | 1473 | struct net_device *dev = ch->netdev; |
1474 | struct ctcm_priv *priv = dev->priv; | 1474 | struct ctcm_priv *priv = dev->ml_priv; |
1475 | struct mpc_group *gptr = priv->mpcg; | 1475 | struct mpc_group *gptr = priv->mpcg; |
1476 | 1476 | ||
1477 | CTCM_PR_DEBUG("Enter %s: id=%s, ch=0x%p\n", | 1477 | 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) | |||
1525 | { | 1525 | { |
1526 | struct channel *ch = arg; | 1526 | struct channel *ch = arg; |
1527 | struct net_device *dev = ch->netdev; | 1527 | struct net_device *dev = ch->netdev; |
1528 | struct ctcm_priv *priv = dev->priv; | 1528 | struct ctcm_priv *priv = dev->ml_priv; |
1529 | struct mpc_group *grp = priv->mpcg; | 1529 | struct mpc_group *grp = priv->mpcg; |
1530 | int rc; | 1530 | int rc; |
1531 | unsigned long saveflags = 0; /* avoids compiler warning */ | 1531 | unsigned long saveflags = 0; /* avoids compiler warning */ |
@@ -1580,7 +1580,7 @@ static void ctcmpc_chx_attn(fsm_instance *fsm, int event, void *arg) | |||
1580 | { | 1580 | { |
1581 | struct channel *ch = arg; | 1581 | struct channel *ch = arg; |
1582 | struct net_device *dev = ch->netdev; | 1582 | struct net_device *dev = ch->netdev; |
1583 | struct ctcm_priv *priv = dev->priv; | 1583 | struct ctcm_priv *priv = dev->ml_priv; |
1584 | struct mpc_group *grp = priv->mpcg; | 1584 | struct mpc_group *grp = priv->mpcg; |
1585 | 1585 | ||
1586 | CTCM_PR_DEBUG("%s(%s): %s(ch=0x%p), cp=%i, ChStat:%s, GrpStat:%s\n", | 1586 | 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) | |||
1639 | { | 1639 | { |
1640 | struct channel *ch = arg; | 1640 | struct channel *ch = arg; |
1641 | struct net_device *dev = ch->netdev; | 1641 | struct net_device *dev = ch->netdev; |
1642 | struct ctcm_priv *priv = dev->priv; | 1642 | struct ctcm_priv *priv = dev->ml_priv; |
1643 | struct mpc_group *grp = priv->mpcg; | 1643 | struct mpc_group *grp = priv->mpcg; |
1644 | 1644 | ||
1645 | CTCM_PR_DEBUG("%s(%s): %s\n ChState:%s GrpState:%s\n", | 1645 | 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) | |||
1724 | { | 1724 | { |
1725 | struct channel *ch = arg; | 1725 | struct channel *ch = arg; |
1726 | struct net_device *dev = ch->netdev; | 1726 | struct net_device *dev = ch->netdev; |
1727 | struct ctcm_priv *priv = dev->priv; | 1727 | struct ctcm_priv *priv = dev->ml_priv; |
1728 | struct mpc_group *grp = priv->mpcg; | 1728 | struct mpc_group *grp = priv->mpcg; |
1729 | 1729 | ||
1730 | fsm_event(grp->fsm, MPCG_EVENT_XID0DO, ch); | 1730 | 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) | |||
1740 | { | 1740 | { |
1741 | struct channel *ach = arg; | 1741 | struct channel *ach = arg; |
1742 | struct net_device *dev = ach->netdev; | 1742 | struct net_device *dev = ach->netdev; |
1743 | struct ctcm_priv *priv = dev->priv; | 1743 | struct ctcm_priv *priv = dev->ml_priv; |
1744 | struct mpc_group *grp = priv->mpcg; | 1744 | struct mpc_group *grp = priv->mpcg; |
1745 | struct channel *wch = priv->channel[WRITE]; | 1745 | struct channel *wch = priv->channel[WRITE]; |
1746 | struct channel *rch = priv->channel[READ]; | 1746 | struct channel *rch = priv->channel[READ]; |
@@ -2050,7 +2050,7 @@ int mpc_ch_fsm_len = ARRAY_SIZE(ctcmpc_ch_fsm); | |||
2050 | static void dev_action_start(fsm_instance *fi, int event, void *arg) | 2050 | static void dev_action_start(fsm_instance *fi, int event, void *arg) |
2051 | { | 2051 | { |
2052 | struct net_device *dev = arg; | 2052 | struct net_device *dev = arg; |
2053 | struct ctcm_priv *priv = dev->priv; | 2053 | struct ctcm_priv *priv = dev->ml_priv; |
2054 | int direction; | 2054 | int direction; |
2055 | 2055 | ||
2056 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); | 2056 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); |
@@ -2076,7 +2076,7 @@ static void dev_action_stop(fsm_instance *fi, int event, void *arg) | |||
2076 | { | 2076 | { |
2077 | int direction; | 2077 | int direction; |
2078 | struct net_device *dev = arg; | 2078 | struct net_device *dev = arg; |
2079 | struct ctcm_priv *priv = dev->priv; | 2079 | struct ctcm_priv *priv = dev->ml_priv; |
2080 | 2080 | ||
2081 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); | 2081 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); |
2082 | 2082 | ||
@@ -2096,7 +2096,7 @@ static void dev_action_restart(fsm_instance *fi, int event, void *arg) | |||
2096 | { | 2096 | { |
2097 | int restart_timer; | 2097 | int restart_timer; |
2098 | struct net_device *dev = arg; | 2098 | struct net_device *dev = arg; |
2099 | struct ctcm_priv *priv = dev->priv; | 2099 | struct ctcm_priv *priv = dev->ml_priv; |
2100 | 2100 | ||
2101 | CTCMY_DBF_DEV_NAME(TRACE, dev, ""); | 2101 | CTCMY_DBF_DEV_NAME(TRACE, dev, ""); |
2102 | 2102 | ||
@@ -2133,12 +2133,12 @@ static void dev_action_restart(fsm_instance *fi, int event, void *arg) | |||
2133 | static void dev_action_chup(fsm_instance *fi, int event, void *arg) | 2133 | static void dev_action_chup(fsm_instance *fi, int event, void *arg) |
2134 | { | 2134 | { |
2135 | struct net_device *dev = arg; | 2135 | struct net_device *dev = arg; |
2136 | struct ctcm_priv *priv = dev->priv; | 2136 | struct ctcm_priv *priv = dev->ml_priv; |
2137 | int dev_stat = fsm_getstate(fi); | 2137 | int dev_stat = fsm_getstate(fi); |
2138 | 2138 | ||
2139 | CTCM_DBF_TEXT_(SETUP, CTC_DBF_NOTICE, | 2139 | CTCM_DBF_TEXT_(SETUP, CTC_DBF_NOTICE, |
2140 | "%s(%s): priv = %p [%d,%d]\n ", CTCM_FUNTAIL, | 2140 | "%s(%s): priv = %p [%d,%d]\n ", CTCM_FUNTAIL, |
2141 | dev->name, dev->priv, dev_stat, event); | 2141 | dev->name, dev->ml_priv, dev_stat, event); |
2142 | 2142 | ||
2143 | switch (fsm_getstate(fi)) { | 2143 | switch (fsm_getstate(fi)) { |
2144 | case DEV_STATE_STARTWAIT_RXTX: | 2144 | case DEV_STATE_STARTWAIT_RXTX: |
@@ -2195,7 +2195,7 @@ static void dev_action_chdown(fsm_instance *fi, int event, void *arg) | |||
2195 | { | 2195 | { |
2196 | 2196 | ||
2197 | struct net_device *dev = arg; | 2197 | struct net_device *dev = arg; |
2198 | struct ctcm_priv *priv = dev->priv; | 2198 | struct ctcm_priv *priv = dev->ml_priv; |
2199 | 2199 | ||
2200 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); | 2200 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); |
2201 | 2201 | ||
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; | |||
69 | void ctcm_unpack_skb(struct channel *ch, struct sk_buff *pskb) | 69 | void ctcm_unpack_skb(struct channel *ch, struct sk_buff *pskb) |
70 | { | 70 | { |
71 | struct net_device *dev = ch->netdev; | 71 | struct net_device *dev = ch->netdev; |
72 | struct ctcm_priv *priv = dev->priv; | 72 | struct ctcm_priv *priv = dev->ml_priv; |
73 | __u16 len = *((__u16 *) pskb->data); | 73 | __u16 len = *((__u16 *) pskb->data); |
74 | 74 | ||
75 | skb_put(pskb, 2 + LL_HEADER_LENGTH); | 75 | skb_put(pskb, 2 + LL_HEADER_LENGTH); |
@@ -414,7 +414,7 @@ int ctcm_ch_alloc_buffer(struct channel *ch) | |||
414 | */ | 414 | */ |
415 | int ctcm_open(struct net_device *dev) | 415 | int ctcm_open(struct net_device *dev) |
416 | { | 416 | { |
417 | struct ctcm_priv *priv = dev->priv; | 417 | struct ctcm_priv *priv = dev->ml_priv; |
418 | 418 | ||
419 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); | 419 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); |
420 | if (!IS_MPC(priv)) | 420 | if (!IS_MPC(priv)) |
@@ -432,7 +432,7 @@ int ctcm_open(struct net_device *dev) | |||
432 | */ | 432 | */ |
433 | int ctcm_close(struct net_device *dev) | 433 | int ctcm_close(struct net_device *dev) |
434 | { | 434 | { |
435 | struct ctcm_priv *priv = dev->priv; | 435 | struct ctcm_priv *priv = dev->ml_priv; |
436 | 436 | ||
437 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); | 437 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); |
438 | if (!IS_MPC(priv)) | 438 | if (!IS_MPC(priv)) |
@@ -573,7 +573,7 @@ static int ctcm_transmit_skb(struct channel *ch, struct sk_buff *skb) | |||
573 | skb_pull(skb, LL_HEADER_LENGTH + 2); | 573 | skb_pull(skb, LL_HEADER_LENGTH + 2); |
574 | } else if (ccw_idx == 0) { | 574 | } else if (ccw_idx == 0) { |
575 | struct net_device *dev = ch->netdev; | 575 | struct net_device *dev = ch->netdev; |
576 | struct ctcm_priv *priv = dev->priv; | 576 | struct ctcm_priv *priv = dev->ml_priv; |
577 | priv->stats.tx_packets++; | 577 | priv->stats.tx_packets++; |
578 | priv->stats.tx_bytes += skb->len - LL_HEADER_LENGTH; | 578 | priv->stats.tx_bytes += skb->len - LL_HEADER_LENGTH; |
579 | } | 579 | } |
@@ -592,7 +592,7 @@ static void ctcmpc_send_sweep_req(struct channel *rch) | |||
592 | struct channel *ch; | 592 | struct channel *ch; |
593 | /* int rc = 0; */ | 593 | /* int rc = 0; */ |
594 | 594 | ||
595 | priv = dev->priv; | 595 | priv = dev->ml_priv; |
596 | grp = priv->mpcg; | 596 | grp = priv->mpcg; |
597 | ch = priv->channel[WRITE]; | 597 | ch = priv->channel[WRITE]; |
598 | 598 | ||
@@ -652,7 +652,7 @@ static int ctcmpc_transmit_skb(struct channel *ch, struct sk_buff *skb) | |||
652 | { | 652 | { |
653 | struct pdu *p_header; | 653 | struct pdu *p_header; |
654 | struct net_device *dev = ch->netdev; | 654 | struct net_device *dev = ch->netdev; |
655 | struct ctcm_priv *priv = dev->priv; | 655 | struct ctcm_priv *priv = dev->ml_priv; |
656 | struct mpc_group *grp = priv->mpcg; | 656 | struct mpc_group *grp = priv->mpcg; |
657 | struct th_header *header; | 657 | struct th_header *header; |
658 | struct sk_buff *nskb; | 658 | struct sk_buff *nskb; |
@@ -867,7 +867,7 @@ done: | |||
867 | /* first merge version - leaving both functions separated */ | 867 | /* first merge version - leaving both functions separated */ |
868 | static int ctcm_tx(struct sk_buff *skb, struct net_device *dev) | 868 | static int ctcm_tx(struct sk_buff *skb, struct net_device *dev) |
869 | { | 869 | { |
870 | struct ctcm_priv *priv = dev->priv; | 870 | struct ctcm_priv *priv = dev->ml_priv; |
871 | 871 | ||
872 | if (skb == NULL) { | 872 | if (skb == NULL) { |
873 | CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR, | 873 | CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR, |
@@ -911,7 +911,7 @@ static int ctcm_tx(struct sk_buff *skb, struct net_device *dev) | |||
911 | static int ctcmpc_tx(struct sk_buff *skb, struct net_device *dev) | 911 | static int ctcmpc_tx(struct sk_buff *skb, struct net_device *dev) |
912 | { | 912 | { |
913 | int len = 0; | 913 | int len = 0; |
914 | struct ctcm_priv *priv = dev->priv; | 914 | struct ctcm_priv *priv = dev->ml_priv; |
915 | struct mpc_group *grp = priv->mpcg; | 915 | struct mpc_group *grp = priv->mpcg; |
916 | struct sk_buff *newskb = NULL; | 916 | struct sk_buff *newskb = NULL; |
917 | 917 | ||
@@ -1025,7 +1025,7 @@ static int ctcm_change_mtu(struct net_device *dev, int new_mtu) | |||
1025 | if (new_mtu < 576 || new_mtu > 65527) | 1025 | if (new_mtu < 576 || new_mtu > 65527) |
1026 | return -EINVAL; | 1026 | return -EINVAL; |
1027 | 1027 | ||
1028 | priv = dev->priv; | 1028 | priv = dev->ml_priv; |
1029 | max_bufsize = priv->channel[READ]->max_bufsize; | 1029 | max_bufsize = priv->channel[READ]->max_bufsize; |
1030 | 1030 | ||
1031 | if (IS_MPC(priv)) { | 1031 | if (IS_MPC(priv)) { |
@@ -1050,7 +1050,7 @@ static int ctcm_change_mtu(struct net_device *dev, int new_mtu) | |||
1050 | */ | 1050 | */ |
1051 | static struct net_device_stats *ctcm_stats(struct net_device *dev) | 1051 | static struct net_device_stats *ctcm_stats(struct net_device *dev) |
1052 | { | 1052 | { |
1053 | return &((struct ctcm_priv *)dev->priv)->stats; | 1053 | return &((struct ctcm_priv *)dev->ml_priv)->stats; |
1054 | } | 1054 | } |
1055 | 1055 | ||
1056 | static void ctcm_free_netdevice(struct net_device *dev) | 1056 | static void ctcm_free_netdevice(struct net_device *dev) |
@@ -1060,7 +1060,7 @@ static void ctcm_free_netdevice(struct net_device *dev) | |||
1060 | 1060 | ||
1061 | CTCM_DBF_TEXT_(SETUP, CTC_DBF_INFO, | 1061 | CTCM_DBF_TEXT_(SETUP, CTC_DBF_INFO, |
1062 | "%s(%s)", CTCM_FUNTAIL, dev->name); | 1062 | "%s(%s)", CTCM_FUNTAIL, dev->name); |
1063 | priv = dev->priv; | 1063 | priv = dev->ml_priv; |
1064 | if (priv) { | 1064 | if (priv) { |
1065 | grp = priv->mpcg; | 1065 | grp = priv->mpcg; |
1066 | if (grp) { | 1066 | if (grp) { |
@@ -1125,7 +1125,7 @@ static struct net_device *ctcm_init_netdevice(struct ctcm_priv *priv) | |||
1125 | CTCM_FUNTAIL); | 1125 | CTCM_FUNTAIL); |
1126 | return NULL; | 1126 | return NULL; |
1127 | } | 1127 | } |
1128 | dev->priv = priv; | 1128 | dev->ml_priv = priv; |
1129 | priv->fsm = init_fsm("ctcmdev", dev_state_names, dev_event_names, | 1129 | priv->fsm = init_fsm("ctcmdev", dev_state_names, dev_event_names, |
1130 | CTCM_NR_DEV_STATES, CTCM_NR_DEV_EVENTS, | 1130 | CTCM_NR_DEV_STATES, CTCM_NR_DEV_EVENTS, |
1131 | dev_fsm, dev_fsm_len, GFP_KERNEL); | 1131 | 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); | |||
229 | */ | 229 | */ |
230 | static inline void ctcm_clear_busy_do(struct net_device *dev) | 230 | static inline void ctcm_clear_busy_do(struct net_device *dev) |
231 | { | 231 | { |
232 | clear_bit(0, &(((struct ctcm_priv *)dev->priv)->tbusy)); | 232 | clear_bit(0, &(((struct ctcm_priv *)dev->ml_priv)->tbusy)); |
233 | netif_wake_queue(dev); | 233 | netif_wake_queue(dev); |
234 | } | 234 | } |
235 | 235 | ||
236 | static inline void ctcm_clear_busy(struct net_device *dev) | 236 | static inline void ctcm_clear_busy(struct net_device *dev) |
237 | { | 237 | { |
238 | struct mpc_group *grp; | 238 | struct mpc_group *grp; |
239 | grp = ((struct ctcm_priv *)dev->priv)->mpcg; | 239 | grp = ((struct ctcm_priv *)dev->ml_priv)->mpcg; |
240 | 240 | ||
241 | if (!(grp && grp->in_sweep)) | 241 | if (!(grp && grp->in_sweep)) |
242 | ctcm_clear_busy_do(dev); | 242 | ctcm_clear_busy_do(dev); |
@@ -246,7 +246,8 @@ static inline void ctcm_clear_busy(struct net_device *dev) | |||
246 | static inline int ctcm_test_and_set_busy(struct net_device *dev) | 246 | static inline int ctcm_test_and_set_busy(struct net_device *dev) |
247 | { | 247 | { |
248 | netif_stop_queue(dev); | 248 | netif_stop_queue(dev); |
249 | return test_and_set_bit(0, &(((struct ctcm_priv *)dev->priv)->tbusy)); | 249 | return test_and_set_bit(0, |
250 | &(((struct ctcm_priv *)dev->ml_priv)->tbusy)); | ||
250 | } | 251 | } |
251 | 252 | ||
252 | extern int loglevel; | 253 | extern int loglevel; |
@@ -292,7 +293,7 @@ struct mpc_group *ctcmpc_init_mpc_group(struct ctcm_priv *priv); | |||
292 | #define IS_MPC(p) ((p)->protocol == CTCM_PROTO_MPC) | 293 | #define IS_MPC(p) ((p)->protocol == CTCM_PROTO_MPC) |
293 | 294 | ||
294 | /* test if struct ctcm_priv of struct net_device has MPC protocol setting */ | 295 | /* test if struct ctcm_priv of struct net_device has MPC protocol setting */ |
295 | #define IS_MPCDEV(d) IS_MPC((struct ctcm_priv *)d->priv) | 296 | #define IS_MPCDEV(dev) IS_MPC((struct ctcm_priv *)dev->ml_priv) |
296 | 297 | ||
297 | static inline gfp_t gfp_type(void) | 298 | static inline gfp_t gfp_type(void) |
298 | { | 299 | { |
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) | |||
312 | CTCM_FUNTAIL, device); | 312 | CTCM_FUNTAIL, device); |
313 | return NULL; | 313 | return NULL; |
314 | } | 314 | } |
315 | priv = dev->priv; | 315 | priv = dev->ml_priv; |
316 | if (priv == NULL) { | 316 | if (priv == NULL) { |
317 | CTCM_DBF_TEXT_(MPC_ERROR, CTC_DBF_ERROR, | 317 | CTCM_DBF_TEXT_(MPC_ERROR, CTC_DBF_ERROR, |
318 | "%s(%s): dev->priv is NULL", | 318 | "%s(%s): dev->ml_priv is NULL", |
319 | CTCM_FUNTAIL, device); | 319 | CTCM_FUNTAIL, device); |
320 | return NULL; | 320 | return NULL; |
321 | } | 321 | } |
@@ -344,7 +344,7 @@ int ctc_mpc_alloc_channel(int port_num, void (*callback)(int, int)) | |||
344 | dev = ctcmpc_get_dev(port_num); | 344 | dev = ctcmpc_get_dev(port_num); |
345 | if (dev == NULL) | 345 | if (dev == NULL) |
346 | return 1; | 346 | return 1; |
347 | priv = dev->priv; | 347 | priv = dev->ml_priv; |
348 | grp = priv->mpcg; | 348 | grp = priv->mpcg; |
349 | 349 | ||
350 | grp->allochanfunc = callback; | 350 | grp->allochanfunc = callback; |
@@ -416,7 +416,7 @@ void ctc_mpc_establish_connectivity(int port_num, | |||
416 | dev = ctcmpc_get_dev(port_num); | 416 | dev = ctcmpc_get_dev(port_num); |
417 | if (dev == NULL) | 417 | if (dev == NULL) |
418 | return; | 418 | return; |
419 | priv = dev->priv; | 419 | priv = dev->ml_priv; |
420 | grp = priv->mpcg; | 420 | grp = priv->mpcg; |
421 | rch = priv->channel[READ]; | 421 | rch = priv->channel[READ]; |
422 | wch = priv->channel[WRITE]; | 422 | wch = priv->channel[WRITE]; |
@@ -534,7 +534,7 @@ void ctc_mpc_dealloc_ch(int port_num) | |||
534 | dev = ctcmpc_get_dev(port_num); | 534 | dev = ctcmpc_get_dev(port_num); |
535 | if (dev == NULL) | 535 | if (dev == NULL) |
536 | return; | 536 | return; |
537 | priv = dev->priv; | 537 | priv = dev->ml_priv; |
538 | grp = priv->mpcg; | 538 | grp = priv->mpcg; |
539 | 539 | ||
540 | CTCM_DBF_TEXT_(MPC_SETUP, CTC_DBF_DEBUG, | 540 | CTCM_DBF_TEXT_(MPC_SETUP, CTC_DBF_DEBUG, |
@@ -570,7 +570,7 @@ void ctc_mpc_flow_control(int port_num, int flowc) | |||
570 | dev = ctcmpc_get_dev(port_num); | 570 | dev = ctcmpc_get_dev(port_num); |
571 | if (dev == NULL) | 571 | if (dev == NULL) |
572 | return; | 572 | return; |
573 | priv = dev->priv; | 573 | priv = dev->ml_priv; |
574 | grp = priv->mpcg; | 574 | grp = priv->mpcg; |
575 | 575 | ||
576 | CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_DEBUG, | 576 | CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_DEBUG, |
@@ -619,7 +619,7 @@ static void mpc_rcvd_sweep_resp(struct mpcg_info *mpcginfo) | |||
619 | { | 619 | { |
620 | struct channel *rch = mpcginfo->ch; | 620 | struct channel *rch = mpcginfo->ch; |
621 | struct net_device *dev = rch->netdev; | 621 | struct net_device *dev = rch->netdev; |
622 | struct ctcm_priv *priv = dev->priv; | 622 | struct ctcm_priv *priv = dev->ml_priv; |
623 | struct mpc_group *grp = priv->mpcg; | 623 | struct mpc_group *grp = priv->mpcg; |
624 | struct channel *ch = priv->channel[WRITE]; | 624 | struct channel *ch = priv->channel[WRITE]; |
625 | 625 | ||
@@ -650,7 +650,7 @@ static void mpc_rcvd_sweep_resp(struct mpcg_info *mpcginfo) | |||
650 | static void ctcmpc_send_sweep_resp(struct channel *rch) | 650 | static void ctcmpc_send_sweep_resp(struct channel *rch) |
651 | { | 651 | { |
652 | struct net_device *dev = rch->netdev; | 652 | struct net_device *dev = rch->netdev; |
653 | struct ctcm_priv *priv = dev->priv; | 653 | struct ctcm_priv *priv = dev->ml_priv; |
654 | struct mpc_group *grp = priv->mpcg; | 654 | struct mpc_group *grp = priv->mpcg; |
655 | int rc = 0; | 655 | int rc = 0; |
656 | struct th_sweep *header; | 656 | struct th_sweep *header; |
@@ -712,7 +712,7 @@ static void mpc_rcvd_sweep_req(struct mpcg_info *mpcginfo) | |||
712 | { | 712 | { |
713 | struct channel *rch = mpcginfo->ch; | 713 | struct channel *rch = mpcginfo->ch; |
714 | struct net_device *dev = rch->netdev; | 714 | struct net_device *dev = rch->netdev; |
715 | struct ctcm_priv *priv = dev->priv; | 715 | struct ctcm_priv *priv = dev->ml_priv; |
716 | struct mpc_group *grp = priv->mpcg; | 716 | struct mpc_group *grp = priv->mpcg; |
717 | struct channel *ch = priv->channel[WRITE]; | 717 | struct channel *ch = priv->channel[WRITE]; |
718 | 718 | ||
@@ -846,7 +846,7 @@ static int mpcg_fsm_len = ARRAY_SIZE(mpcg_fsm); | |||
846 | static void mpc_action_go_ready(fsm_instance *fsm, int event, void *arg) | 846 | static void mpc_action_go_ready(fsm_instance *fsm, int event, void *arg) |
847 | { | 847 | { |
848 | struct net_device *dev = arg; | 848 | struct net_device *dev = arg; |
849 | struct ctcm_priv *priv = dev->priv; | 849 | struct ctcm_priv *priv = dev->ml_priv; |
850 | struct mpc_group *grp = priv->mpcg; | 850 | struct mpc_group *grp = priv->mpcg; |
851 | 851 | ||
852 | if (grp == NULL) { | 852 | if (grp == NULL) { |
@@ -890,7 +890,7 @@ static void mpc_action_go_ready(fsm_instance *fsm, int event, void *arg) | |||
890 | void mpc_group_ready(unsigned long adev) | 890 | void mpc_group_ready(unsigned long adev) |
891 | { | 891 | { |
892 | struct net_device *dev = (struct net_device *)adev; | 892 | struct net_device *dev = (struct net_device *)adev; |
893 | struct ctcm_priv *priv = dev->priv; | 893 | struct ctcm_priv *priv = dev->ml_priv; |
894 | struct mpc_group *grp = priv->mpcg; | 894 | struct mpc_group *grp = priv->mpcg; |
895 | struct channel *ch = NULL; | 895 | struct channel *ch = NULL; |
896 | 896 | ||
@@ -946,7 +946,7 @@ void mpc_group_ready(unsigned long adev) | |||
946 | void mpc_channel_action(struct channel *ch, int direction, int action) | 946 | void mpc_channel_action(struct channel *ch, int direction, int action) |
947 | { | 947 | { |
948 | struct net_device *dev = ch->netdev; | 948 | struct net_device *dev = ch->netdev; |
949 | struct ctcm_priv *priv = dev->priv; | 949 | struct ctcm_priv *priv = dev->ml_priv; |
950 | struct mpc_group *grp = priv->mpcg; | 950 | struct mpc_group *grp = priv->mpcg; |
951 | 951 | ||
952 | if (grp == NULL) { | 952 | if (grp == NULL) { |
@@ -1056,7 +1056,7 @@ done: | |||
1056 | static void ctcmpc_unpack_skb(struct channel *ch, struct sk_buff *pskb) | 1056 | static void ctcmpc_unpack_skb(struct channel *ch, struct sk_buff *pskb) |
1057 | { | 1057 | { |
1058 | struct net_device *dev = ch->netdev; | 1058 | struct net_device *dev = ch->netdev; |
1059 | struct ctcm_priv *priv = dev->priv; | 1059 | struct ctcm_priv *priv = dev->ml_priv; |
1060 | struct mpc_group *grp = priv->mpcg; | 1060 | struct mpc_group *grp = priv->mpcg; |
1061 | struct pdu *curr_pdu; | 1061 | struct pdu *curr_pdu; |
1062 | struct mpcg_info *mpcginfo; | 1062 | struct mpcg_info *mpcginfo; |
@@ -1254,7 +1254,7 @@ void ctcmpc_bh(unsigned long thischan) | |||
1254 | struct channel *ch = (struct channel *)thischan; | 1254 | struct channel *ch = (struct channel *)thischan; |
1255 | struct sk_buff *skb; | 1255 | struct sk_buff *skb; |
1256 | struct net_device *dev = ch->netdev; | 1256 | struct net_device *dev = ch->netdev; |
1257 | struct ctcm_priv *priv = dev->priv; | 1257 | struct ctcm_priv *priv = dev->ml_priv; |
1258 | struct mpc_group *grp = priv->mpcg; | 1258 | struct mpc_group *grp = priv->mpcg; |
1259 | 1259 | ||
1260 | CTCM_PR_DEBUG("%s cp:%i enter: %s() %s\n", | 1260 | 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) | |||
1376 | BUG_ON(dev == NULL); | 1376 | BUG_ON(dev == NULL); |
1377 | CTCM_PR_DEBUG("Enter %s: %s\n", __func__, dev->name); | 1377 | CTCM_PR_DEBUG("Enter %s: %s\n", __func__, dev->name); |
1378 | 1378 | ||
1379 | priv = dev->priv; | 1379 | priv = dev->ml_priv; |
1380 | grp = priv->mpcg; | 1380 | grp = priv->mpcg; |
1381 | grp->flow_off_called = 0; | 1381 | grp->flow_off_called = 0; |
1382 | fsm_deltimer(&grp->timer); | 1382 | fsm_deltimer(&grp->timer); |
@@ -1482,7 +1482,7 @@ static void mpc_action_timeout(fsm_instance *fi, int event, void *arg) | |||
1482 | 1482 | ||
1483 | BUG_ON(dev == NULL); | 1483 | BUG_ON(dev == NULL); |
1484 | 1484 | ||
1485 | priv = dev->priv; | 1485 | priv = dev->ml_priv; |
1486 | grp = priv->mpcg; | 1486 | grp = priv->mpcg; |
1487 | wch = priv->channel[WRITE]; | 1487 | wch = priv->channel[WRITE]; |
1488 | rch = priv->channel[READ]; | 1488 | rch = priv->channel[READ]; |
@@ -1520,7 +1520,7 @@ void mpc_action_discontact(fsm_instance *fi, int event, void *arg) | |||
1520 | if (ch) { | 1520 | if (ch) { |
1521 | dev = ch->netdev; | 1521 | dev = ch->netdev; |
1522 | if (dev) { | 1522 | if (dev) { |
1523 | priv = dev->priv; | 1523 | priv = dev->ml_priv; |
1524 | if (priv) { | 1524 | if (priv) { |
1525 | CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_NOTICE, | 1525 | CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_NOTICE, |
1526 | "%s: %s: %s\n", | 1526 | "%s: %s: %s\n", |
@@ -1568,7 +1568,7 @@ static int mpc_validate_xid(struct mpcg_info *mpcginfo) | |||
1568 | { | 1568 | { |
1569 | struct channel *ch = mpcginfo->ch; | 1569 | struct channel *ch = mpcginfo->ch; |
1570 | struct net_device *dev = ch->netdev; | 1570 | struct net_device *dev = ch->netdev; |
1571 | struct ctcm_priv *priv = dev->priv; | 1571 | struct ctcm_priv *priv = dev->ml_priv; |
1572 | struct mpc_group *grp = priv->mpcg; | 1572 | struct mpc_group *grp = priv->mpcg; |
1573 | struct xid2 *xid = mpcginfo->xid; | 1573 | struct xid2 *xid = mpcginfo->xid; |
1574 | int rc = 0; | 1574 | int rc = 0; |
@@ -1865,7 +1865,7 @@ static void mpc_action_doxid0(fsm_instance *fsm, int event, void *arg) | |||
1865 | { | 1865 | { |
1866 | struct channel *ch = arg; | 1866 | struct channel *ch = arg; |
1867 | struct net_device *dev = ch->netdev; | 1867 | struct net_device *dev = ch->netdev; |
1868 | struct ctcm_priv *priv = dev->priv; | 1868 | struct ctcm_priv *priv = dev->ml_priv; |
1869 | struct mpc_group *grp = priv->mpcg; | 1869 | struct mpc_group *grp = priv->mpcg; |
1870 | 1870 | ||
1871 | CTCM_PR_DEBUG("Enter %s: cp=%i ch=0x%p id=%s\n", | 1871 | 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) | |||
1905 | static void mpc_action_doxid7(fsm_instance *fsm, int event, void *arg) | 1905 | static void mpc_action_doxid7(fsm_instance *fsm, int event, void *arg) |
1906 | { | 1906 | { |
1907 | struct net_device *dev = arg; | 1907 | struct net_device *dev = arg; |
1908 | struct ctcm_priv *priv = dev->priv; | 1908 | struct ctcm_priv *priv = dev->ml_priv; |
1909 | struct mpc_group *grp = NULL; | 1909 | struct mpc_group *grp = NULL; |
1910 | int direction; | 1910 | int direction; |
1911 | int send = 0; | 1911 | int send = 0; |
@@ -1982,7 +1982,7 @@ static void mpc_action_rcvd_xid0(fsm_instance *fsm, int event, void *arg) | |||
1982 | struct mpcg_info *mpcginfo = arg; | 1982 | struct mpcg_info *mpcginfo = arg; |
1983 | struct channel *ch = mpcginfo->ch; | 1983 | struct channel *ch = mpcginfo->ch; |
1984 | struct net_device *dev = ch->netdev; | 1984 | struct net_device *dev = ch->netdev; |
1985 | struct ctcm_priv *priv = dev->priv; | 1985 | struct ctcm_priv *priv = dev->ml_priv; |
1986 | struct mpc_group *grp = priv->mpcg; | 1986 | struct mpc_group *grp = priv->mpcg; |
1987 | 1987 | ||
1988 | CTCM_PR_DEBUG("%s: ch-id:%s xid2:%i xid7:%i xidt_p2:%i \n", | 1988 | 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) | |||
2044 | struct mpcg_info *mpcginfo = arg; | 2044 | struct mpcg_info *mpcginfo = arg; |
2045 | struct channel *ch = mpcginfo->ch; | 2045 | struct channel *ch = mpcginfo->ch; |
2046 | struct net_device *dev = ch->netdev; | 2046 | struct net_device *dev = ch->netdev; |
2047 | struct ctcm_priv *priv = dev->priv; | 2047 | struct ctcm_priv *priv = dev->ml_priv; |
2048 | struct mpc_group *grp = priv->mpcg; | 2048 | struct mpc_group *grp = priv->mpcg; |
2049 | 2049 | ||
2050 | CTCM_PR_DEBUG("Enter %s: cp=%i ch=0x%p id=%s\n", | 2050 | 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) | |||
2096 | __u32 new_len = 0; | 2096 | __u32 new_len = 0; |
2097 | struct sk_buff *skb; | 2097 | struct sk_buff *skb; |
2098 | struct qllc *qllcptr; | 2098 | struct qllc *qllcptr; |
2099 | struct ctcm_priv *priv = dev->priv; | 2099 | struct ctcm_priv *priv = dev->ml_priv; |
2100 | struct mpc_group *grp = priv->mpcg; | 2100 | struct mpc_group *grp = priv->mpcg; |
2101 | 2101 | ||
2102 | CTCM_PR_DEBUG("%s: GROUP STATE: %s\n", | 2102 | 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) | |||
1412 | } | 1412 | } |
1413 | /* How far in the ccw chain have we processed? */ | 1413 | /* How far in the ccw chain have we processed? */ |
1414 | if ((channel->state != LCS_CH_STATE_INIT) && | 1414 | if ((channel->state != LCS_CH_STATE_INIT) && |
1415 | (irb->scsw.cmd.fctl & SCSW_FCTL_START_FUNC)) { | 1415 | (irb->scsw.cmd.fctl & SCSW_FCTL_START_FUNC) && |
1416 | (irb->scsw.cmd.cpa != 0)) { | ||
1416 | index = (struct ccw1 *) __va((addr_t) irb->scsw.cmd.cpa) | 1417 | index = (struct ccw1 *) __va((addr_t) irb->scsw.cmd.cpa) |
1417 | - channel->ccws; | 1418 | - channel->ccws; |
1418 | if ((irb->scsw.cmd.actl & SCSW_ACTL_SUSPENDED) || | 1419 | 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 { | |||
689 | struct list_head list; | 689 | struct list_head list; |
690 | __u8 mc_addr[MAX_ADDR_LEN]; | 690 | __u8 mc_addr[MAX_ADDR_LEN]; |
691 | unsigned char mc_addrlen; | 691 | unsigned char mc_addrlen; |
692 | int is_vmac; | ||
692 | }; | 693 | }; |
693 | 694 | ||
694 | struct qeth_card { | 695 | 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, | |||
3024 | struct qdio_buffer *buffer, int is_tso, int *next_element_to_fill, | 3024 | struct qdio_buffer *buffer, int is_tso, int *next_element_to_fill, |
3025 | int offset) | 3025 | int offset) |
3026 | { | 3026 | { |
3027 | int length = skb->len; | 3027 | int length = skb->len - offset; |
3028 | int length_here; | 3028 | int length_here; |
3029 | int element; | 3029 | int element; |
3030 | char *data; | 3030 | 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) | |||
177 | qeth_l2_send_delgroupmac_cb); | 177 | qeth_l2_send_delgroupmac_cb); |
178 | } | 178 | } |
179 | 179 | ||
180 | static void qeth_l2_add_mc(struct qeth_card *card, __u8 *mac) | 180 | static void qeth_l2_add_mc(struct qeth_card *card, __u8 *mac, int vmac) |
181 | { | 181 | { |
182 | struct qeth_mc_mac *mc; | 182 | struct qeth_mc_mac *mc; |
183 | int rc; | ||
183 | 184 | ||
184 | mc = kmalloc(sizeof(struct qeth_mc_mac), GFP_ATOMIC); | 185 | mc = kmalloc(sizeof(struct qeth_mc_mac), GFP_ATOMIC); |
185 | 186 | ||
@@ -188,8 +189,16 @@ static void qeth_l2_add_mc(struct qeth_card *card, __u8 *mac) | |||
188 | 189 | ||
189 | memcpy(mc->mc_addr, mac, OSA_ADDR_LEN); | 190 | memcpy(mc->mc_addr, mac, OSA_ADDR_LEN); |
190 | mc->mc_addrlen = OSA_ADDR_LEN; | 191 | mc->mc_addrlen = OSA_ADDR_LEN; |
192 | mc->is_vmac = vmac; | ||
193 | |||
194 | if (vmac) { | ||
195 | rc = qeth_l2_send_setdelmac(card, mac, IPA_CMD_SETVMAC, | ||
196 | NULL); | ||
197 | } else { | ||
198 | rc = qeth_l2_send_setgroupmac(card, mac); | ||
199 | } | ||
191 | 200 | ||
192 | if (!qeth_l2_send_setgroupmac(card, mac)) | 201 | if (!rc) |
193 | list_add_tail(&mc->list, &card->mc_list); | 202 | list_add_tail(&mc->list, &card->mc_list); |
194 | else | 203 | else |
195 | kfree(mc); | 204 | kfree(mc); |
@@ -201,7 +210,11 @@ static void qeth_l2_del_all_mc(struct qeth_card *card) | |||
201 | 210 | ||
202 | spin_lock_bh(&card->mclock); | 211 | spin_lock_bh(&card->mclock); |
203 | list_for_each_entry_safe(mc, tmp, &card->mc_list, list) { | 212 | list_for_each_entry_safe(mc, tmp, &card->mc_list, list) { |
204 | qeth_l2_send_delgroupmac(card, mc->mc_addr); | 213 | if (mc->is_vmac) |
214 | qeth_l2_send_setdelmac(card, mc->mc_addr, | ||
215 | IPA_CMD_DELVMAC, NULL); | ||
216 | else | ||
217 | qeth_l2_send_delgroupmac(card, mc->mc_addr); | ||
205 | list_del(&mc->list); | 218 | list_del(&mc->list); |
206 | kfree(mc); | 219 | kfree(mc); |
207 | } | 220 | } |
@@ -590,7 +603,7 @@ static int qeth_l2_set_mac_address(struct net_device *dev, void *p) | |||
590 | static void qeth_l2_set_multicast_list(struct net_device *dev) | 603 | static void qeth_l2_set_multicast_list(struct net_device *dev) |
591 | { | 604 | { |
592 | struct qeth_card *card = dev->ml_priv; | 605 | struct qeth_card *card = dev->ml_priv; |
593 | struct dev_mc_list *dm; | 606 | struct dev_addr_list *dm; |
594 | 607 | ||
595 | if (card->info.type == QETH_CARD_TYPE_OSN) | 608 | if (card->info.type == QETH_CARD_TYPE_OSN) |
596 | return ; | 609 | return ; |
@@ -599,7 +612,11 @@ static void qeth_l2_set_multicast_list(struct net_device *dev) | |||
599 | qeth_l2_del_all_mc(card); | 612 | qeth_l2_del_all_mc(card); |
600 | spin_lock_bh(&card->mclock); | 613 | spin_lock_bh(&card->mclock); |
601 | for (dm = dev->mc_list; dm; dm = dm->next) | 614 | for (dm = dev->mc_list; dm; dm = dm->next) |
602 | qeth_l2_add_mc(card, dm->dmi_addr); | 615 | qeth_l2_add_mc(card, dm->da_addr, 0); |
616 | |||
617 | for (dm = dev->uc_list; dm; dm = dm->next) | ||
618 | qeth_l2_add_mc(card, dm->da_addr, 1); | ||
619 | |||
603 | spin_unlock_bh(&card->mclock); | 620 | spin_unlock_bh(&card->mclock); |
604 | if (!qeth_adp_supported(card, IPA_SETADP_SET_PROMISC_MODE)) | 621 | if (!qeth_adp_supported(card, IPA_SETADP_SET_PROMISC_MODE)) |
605 | return; | 622 | 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, | |||
136 | return -EINVAL; | 136 | return -EINVAL; |
137 | 137 | ||
138 | if (!qeth_is_supported(card, IPA_IPV6)) { | 138 | if (!qeth_is_supported(card, IPA_IPV6)) { |
139 | return -ENOTSUPP; | 139 | return -EOPNOTSUPP; |
140 | } | 140 | } |
141 | 141 | ||
142 | return qeth_l3_dev_route_store(card, &card->options.route6, | 142 | return qeth_l3_dev_route_store(card, &card->options.route6, |
diff --git a/drivers/s390/scsi/zfcp_ccw.c b/drivers/s390/scsi/zfcp_ccw.c index 391dd29749f8..51b6a05f4d12 100644 --- a/drivers/s390/scsi/zfcp_ccw.c +++ b/drivers/s390/scsi/zfcp_ccw.c | |||
@@ -152,10 +152,8 @@ static int zfcp_ccw_set_offline(struct ccw_device *ccw_device) | |||
152 | */ | 152 | */ |
153 | static int zfcp_ccw_notify(struct ccw_device *ccw_device, int event) | 153 | static int zfcp_ccw_notify(struct ccw_device *ccw_device, int event) |
154 | { | 154 | { |
155 | struct zfcp_adapter *adapter; | 155 | struct zfcp_adapter *adapter = dev_get_drvdata(&ccw_device->dev); |
156 | 156 | ||
157 | down(&zfcp_data.config_sema); | ||
158 | adapter = dev_get_drvdata(&ccw_device->dev); | ||
159 | switch (event) { | 157 | switch (event) { |
160 | case CIO_GONE: | 158 | case CIO_GONE: |
161 | dev_warn(&adapter->ccw_device->dev, "device gone\n"); | 159 | dev_warn(&adapter->ccw_device->dev, "device gone\n"); |
@@ -174,8 +172,6 @@ static int zfcp_ccw_notify(struct ccw_device *ccw_device, int event) | |||
174 | 89, NULL); | 172 | 89, NULL); |
175 | break; | 173 | break; |
176 | } | 174 | } |
177 | zfcp_erp_wait(adapter); | ||
178 | up(&zfcp_data.config_sema); | ||
179 | return 1; | 175 | return 1; |
180 | } | 176 | } |
181 | 177 | ||
diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c index e984469bb98b..56196c98c07b 100644 --- a/drivers/s390/scsi/zfcp_fc.c +++ b/drivers/s390/scsi/zfcp_fc.c | |||
@@ -39,18 +39,6 @@ struct zfcp_gpn_ft { | |||
39 | struct scatterlist sg_resp[ZFCP_GPN_FT_BUFFERS]; | 39 | struct scatterlist sg_resp[ZFCP_GPN_FT_BUFFERS]; |
40 | }; | 40 | }; |
41 | 41 | ||
42 | static struct zfcp_port *zfcp_get_port_by_did(struct zfcp_adapter *adapter, | ||
43 | u32 d_id) | ||
44 | { | ||
45 | struct zfcp_port *port; | ||
46 | |||
47 | list_for_each_entry(port, &adapter->port_list_head, list) | ||
48 | if ((port->d_id == d_id) && | ||
49 | !atomic_test_mask(ZFCP_STATUS_COMMON_REMOVE, &port->status)) | ||
50 | return port; | ||
51 | return NULL; | ||
52 | } | ||
53 | |||
54 | static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range, | 42 | static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range, |
55 | struct fcp_rscn_element *elem) | 43 | struct fcp_rscn_element *elem) |
56 | { | 44 | { |
@@ -341,12 +329,13 @@ void zfcp_test_link(struct zfcp_port *port) | |||
341 | 329 | ||
342 | zfcp_port_get(port); | 330 | zfcp_port_get(port); |
343 | retval = zfcp_fc_adisc(port); | 331 | retval = zfcp_fc_adisc(port); |
344 | if (retval == 0 || retval == -EBUSY) | 332 | if (retval == 0) |
345 | return; | 333 | return; |
346 | 334 | ||
347 | /* send of ADISC was not possible */ | 335 | /* send of ADISC was not possible */ |
348 | zfcp_port_put(port); | 336 | zfcp_port_put(port); |
349 | zfcp_erp_port_forced_reopen(port, 0, 65, NULL); | 337 | if (retval != -EBUSY) |
338 | zfcp_erp_port_forced_reopen(port, 0, 65, NULL); | ||
350 | } | 339 | } |
351 | 340 | ||
352 | static int zfcp_scan_get_nameserver(struct zfcp_adapter *adapter) | 341 | static int zfcp_scan_get_nameserver(struct zfcp_adapter *adapter) |
@@ -363,7 +352,6 @@ static int zfcp_scan_get_nameserver(struct zfcp_adapter *adapter) | |||
363 | if (ret) | 352 | if (ret) |
364 | return ret; | 353 | return ret; |
365 | zfcp_erp_wait(adapter); | 354 | zfcp_erp_wait(adapter); |
366 | zfcp_port_put(adapter->nameserver_port); | ||
367 | } | 355 | } |
368 | return !atomic_test_mask(ZFCP_STATUS_COMMON_UNBLOCKED, | 356 | return !atomic_test_mask(ZFCP_STATUS_COMMON_UNBLOCKED, |
369 | &adapter->nameserver_port->status); | 357 | &adapter->nameserver_port->status); |
@@ -475,7 +463,7 @@ static int zfcp_scan_eval_gpn_ft(struct zfcp_gpn_ft *gpn_ft) | |||
475 | struct zfcp_adapter *adapter = ct->port->adapter; | 463 | struct zfcp_adapter *adapter = ct->port->adapter; |
476 | struct zfcp_port *port, *tmp; | 464 | struct zfcp_port *port, *tmp; |
477 | u32 d_id; | 465 | u32 d_id; |
478 | int ret = 0, x; | 466 | int ret = 0, x, last = 0; |
479 | 467 | ||
480 | if (ct->status) | 468 | if (ct->status) |
481 | return -EIO; | 469 | return -EIO; |
@@ -492,19 +480,24 @@ static int zfcp_scan_eval_gpn_ft(struct zfcp_gpn_ft *gpn_ft) | |||
492 | down(&zfcp_data.config_sema); | 480 | down(&zfcp_data.config_sema); |
493 | 481 | ||
494 | /* first entry is the header */ | 482 | /* first entry is the header */ |
495 | for (x = 1; x < ZFCP_GPN_FT_MAX_ENTRIES; x++) { | 483 | for (x = 1; x < ZFCP_GPN_FT_MAX_ENTRIES && !last; x++) { |
496 | if (x % (ZFCP_GPN_FT_ENTRIES + 1)) | 484 | if (x % (ZFCP_GPN_FT_ENTRIES + 1)) |
497 | acc++; | 485 | acc++; |
498 | else | 486 | else |
499 | acc = sg_virt(++sg); | 487 | acc = sg_virt(++sg); |
500 | 488 | ||
489 | last = acc->control & 0x80; | ||
501 | d_id = acc->port_id[0] << 16 | acc->port_id[1] << 8 | | 490 | d_id = acc->port_id[0] << 16 | acc->port_id[1] << 8 | |
502 | acc->port_id[2]; | 491 | acc->port_id[2]; |
503 | 492 | ||
504 | /* skip the adapter's port and known remote ports */ | 493 | /* skip the adapter's port and known remote ports */ |
505 | if (acc->wwpn == fc_host_port_name(adapter->scsi_host) || | 494 | if (acc->wwpn == fc_host_port_name(adapter->scsi_host)) |
506 | zfcp_get_port_by_did(adapter, d_id)) | 495 | continue; |
496 | port = zfcp_get_port_by_wwpn(adapter, acc->wwpn); | ||
497 | if (port) { | ||
498 | zfcp_port_get(port); | ||
507 | continue; | 499 | continue; |
500 | } | ||
508 | 501 | ||
509 | port = zfcp_port_enqueue(adapter, acc->wwpn, | 502 | port = zfcp_port_enqueue(adapter, acc->wwpn, |
510 | ZFCP_STATUS_PORT_DID_DID | | 503 | ZFCP_STATUS_PORT_DID_DID | |
@@ -513,8 +506,6 @@ static int zfcp_scan_eval_gpn_ft(struct zfcp_gpn_ft *gpn_ft) | |||
513 | ret = PTR_ERR(port); | 506 | ret = PTR_ERR(port); |
514 | else | 507 | else |
515 | zfcp_erp_port_reopen(port, 0, 149, NULL); | 508 | zfcp_erp_port_reopen(port, 0, 149, NULL); |
516 | if (acc->control & 0x80) /* last entry */ | ||
517 | break; | ||
518 | } | 509 | } |
519 | 510 | ||
520 | zfcp_erp_wait(adapter); | 511 | zfcp_erp_wait(adapter); |
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c index 19c1ca913874..49dbeb754e5f 100644 --- a/drivers/s390/scsi/zfcp_fsf.c +++ b/drivers/s390/scsi/zfcp_fsf.c | |||
@@ -710,10 +710,10 @@ static void zfcp_fsf_exchange_port_data_handler(struct zfcp_fsf_req *req) | |||
710 | 710 | ||
711 | static int zfcp_fsf_sbal_check(struct zfcp_qdio_queue *queue) | 711 | static int zfcp_fsf_sbal_check(struct zfcp_qdio_queue *queue) |
712 | { | 712 | { |
713 | spin_lock(&queue->lock); | 713 | spin_lock_bh(&queue->lock); |
714 | if (atomic_read(&queue->count)) | 714 | if (atomic_read(&queue->count)) |
715 | return 1; | 715 | return 1; |
716 | spin_unlock(&queue->lock); | 716 | spin_unlock_bh(&queue->lock); |
717 | return 0; | 717 | return 0; |
718 | } | 718 | } |
719 | 719 | ||
@@ -722,13 +722,13 @@ static int zfcp_fsf_req_sbal_get(struct zfcp_adapter *adapter) | |||
722 | long ret; | 722 | long ret; |
723 | struct zfcp_qdio_queue *req_q = &adapter->req_q; | 723 | struct zfcp_qdio_queue *req_q = &adapter->req_q; |
724 | 724 | ||
725 | spin_unlock(&req_q->lock); | 725 | spin_unlock_bh(&req_q->lock); |
726 | ret = wait_event_interruptible_timeout(adapter->request_wq, | 726 | ret = wait_event_interruptible_timeout(adapter->request_wq, |
727 | zfcp_fsf_sbal_check(req_q), 5 * HZ); | 727 | zfcp_fsf_sbal_check(req_q), 5 * HZ); |
728 | if (ret > 0) | 728 | if (ret > 0) |
729 | return 0; | 729 | return 0; |
730 | 730 | ||
731 | spin_lock(&req_q->lock); | 731 | spin_lock_bh(&req_q->lock); |
732 | return -EIO; | 732 | return -EIO; |
733 | } | 733 | } |
734 | 734 | ||
@@ -870,14 +870,14 @@ int zfcp_fsf_status_read(struct zfcp_adapter *adapter) | |||
870 | volatile struct qdio_buffer_element *sbale; | 870 | volatile struct qdio_buffer_element *sbale; |
871 | int retval = -EIO; | 871 | int retval = -EIO; |
872 | 872 | ||
873 | spin_lock(&adapter->req_q.lock); | 873 | spin_lock_bh(&adapter->req_q.lock); |
874 | if (zfcp_fsf_req_sbal_get(adapter)) | 874 | if (zfcp_fsf_req_sbal_get(adapter)) |
875 | goto out; | 875 | goto out; |
876 | 876 | ||
877 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_UNSOLICITED_STATUS, | 877 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_UNSOLICITED_STATUS, |
878 | ZFCP_REQ_NO_QTCB, | 878 | ZFCP_REQ_NO_QTCB, |
879 | adapter->pool.fsf_req_status_read); | 879 | adapter->pool.fsf_req_status_read); |
880 | if (unlikely(IS_ERR(req))) { | 880 | if (IS_ERR(req)) { |
881 | retval = PTR_ERR(req); | 881 | retval = PTR_ERR(req); |
882 | goto out; | 882 | goto out; |
883 | } | 883 | } |
@@ -910,7 +910,7 @@ failed_buf: | |||
910 | zfcp_fsf_req_free(req); | 910 | zfcp_fsf_req_free(req); |
911 | zfcp_hba_dbf_event_fsf_unsol("fail", adapter, NULL); | 911 | zfcp_hba_dbf_event_fsf_unsol("fail", adapter, NULL); |
912 | out: | 912 | out: |
913 | spin_unlock(&adapter->req_q.lock); | 913 | spin_unlock_bh(&adapter->req_q.lock); |
914 | return retval; | 914 | return retval; |
915 | } | 915 | } |
916 | 916 | ||
@@ -988,7 +988,7 @@ struct zfcp_fsf_req *zfcp_fsf_abort_fcp_command(unsigned long old_req_id, | |||
988 | goto out; | 988 | goto out; |
989 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_ABORT_FCP_CMND, | 989 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_ABORT_FCP_CMND, |
990 | req_flags, adapter->pool.fsf_req_abort); | 990 | req_flags, adapter->pool.fsf_req_abort); |
991 | if (unlikely(IS_ERR(req))) | 991 | if (IS_ERR(req)) |
992 | goto out; | 992 | goto out; |
993 | 993 | ||
994 | if (unlikely(!(atomic_read(&unit->status) & | 994 | if (unlikely(!(atomic_read(&unit->status) & |
@@ -1106,13 +1106,13 @@ int zfcp_fsf_send_ct(struct zfcp_send_ct *ct, mempool_t *pool, | |||
1106 | struct zfcp_fsf_req *req; | 1106 | struct zfcp_fsf_req *req; |
1107 | int ret = -EIO; | 1107 | int ret = -EIO; |
1108 | 1108 | ||
1109 | spin_lock(&adapter->req_q.lock); | 1109 | spin_lock_bh(&adapter->req_q.lock); |
1110 | if (zfcp_fsf_req_sbal_get(adapter)) | 1110 | if (zfcp_fsf_req_sbal_get(adapter)) |
1111 | goto out; | 1111 | goto out; |
1112 | 1112 | ||
1113 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_SEND_GENERIC, | 1113 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_SEND_GENERIC, |
1114 | ZFCP_REQ_AUTO_CLEANUP, pool); | 1114 | ZFCP_REQ_AUTO_CLEANUP, pool); |
1115 | if (unlikely(IS_ERR(req))) { | 1115 | if (IS_ERR(req)) { |
1116 | ret = PTR_ERR(req); | 1116 | ret = PTR_ERR(req); |
1117 | goto out; | 1117 | goto out; |
1118 | } | 1118 | } |
@@ -1148,7 +1148,7 @@ failed_send: | |||
1148 | if (erp_action) | 1148 | if (erp_action) |
1149 | erp_action->fsf_req = NULL; | 1149 | erp_action->fsf_req = NULL; |
1150 | out: | 1150 | out: |
1151 | spin_unlock(&adapter->req_q.lock); | 1151 | spin_unlock_bh(&adapter->req_q.lock); |
1152 | return ret; | 1152 | return ret; |
1153 | } | 1153 | } |
1154 | 1154 | ||
@@ -1223,7 +1223,7 @@ int zfcp_fsf_send_els(struct zfcp_send_els *els) | |||
1223 | goto out; | 1223 | goto out; |
1224 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_SEND_ELS, | 1224 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_SEND_ELS, |
1225 | ZFCP_REQ_AUTO_CLEANUP, NULL); | 1225 | ZFCP_REQ_AUTO_CLEANUP, NULL); |
1226 | if (unlikely(IS_ERR(req))) { | 1226 | if (IS_ERR(req)) { |
1227 | ret = PTR_ERR(req); | 1227 | ret = PTR_ERR(req); |
1228 | goto out; | 1228 | goto out; |
1229 | } | 1229 | } |
@@ -1263,14 +1263,14 @@ int zfcp_fsf_exchange_config_data(struct zfcp_erp_action *erp_action) | |||
1263 | struct zfcp_adapter *adapter = erp_action->adapter; | 1263 | struct zfcp_adapter *adapter = erp_action->adapter; |
1264 | int retval = -EIO; | 1264 | int retval = -EIO; |
1265 | 1265 | ||
1266 | spin_lock(&adapter->req_q.lock); | 1266 | spin_lock_bh(&adapter->req_q.lock); |
1267 | if (!atomic_read(&adapter->req_q.count)) | 1267 | if (!atomic_read(&adapter->req_q.count)) |
1268 | goto out; | 1268 | goto out; |
1269 | req = zfcp_fsf_req_create(adapter, | 1269 | req = zfcp_fsf_req_create(adapter, |
1270 | FSF_QTCB_EXCHANGE_CONFIG_DATA, | 1270 | FSF_QTCB_EXCHANGE_CONFIG_DATA, |
1271 | ZFCP_REQ_AUTO_CLEANUP, | 1271 | ZFCP_REQ_AUTO_CLEANUP, |
1272 | adapter->pool.fsf_req_erp); | 1272 | adapter->pool.fsf_req_erp); |
1273 | if (unlikely(IS_ERR(req))) { | 1273 | if (IS_ERR(req)) { |
1274 | retval = PTR_ERR(req); | 1274 | retval = PTR_ERR(req); |
1275 | goto out; | 1275 | goto out; |
1276 | } | 1276 | } |
@@ -1295,7 +1295,7 @@ int zfcp_fsf_exchange_config_data(struct zfcp_erp_action *erp_action) | |||
1295 | erp_action->fsf_req = NULL; | 1295 | erp_action->fsf_req = NULL; |
1296 | } | 1296 | } |
1297 | out: | 1297 | out: |
1298 | spin_unlock(&adapter->req_q.lock); | 1298 | spin_unlock_bh(&adapter->req_q.lock); |
1299 | return retval; | 1299 | return retval; |
1300 | } | 1300 | } |
1301 | 1301 | ||
@@ -1306,13 +1306,13 @@ int zfcp_fsf_exchange_config_data_sync(struct zfcp_adapter *adapter, | |||
1306 | struct zfcp_fsf_req *req = NULL; | 1306 | struct zfcp_fsf_req *req = NULL; |
1307 | int retval = -EIO; | 1307 | int retval = -EIO; |
1308 | 1308 | ||
1309 | spin_lock(&adapter->req_q.lock); | 1309 | spin_lock_bh(&adapter->req_q.lock); |
1310 | if (zfcp_fsf_req_sbal_get(adapter)) | 1310 | if (zfcp_fsf_req_sbal_get(adapter)) |
1311 | goto out; | 1311 | goto out; |
1312 | 1312 | ||
1313 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_CONFIG_DATA, | 1313 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_CONFIG_DATA, |
1314 | 0, NULL); | 1314 | 0, NULL); |
1315 | if (unlikely(IS_ERR(req))) { | 1315 | if (IS_ERR(req)) { |
1316 | retval = PTR_ERR(req); | 1316 | retval = PTR_ERR(req); |
1317 | goto out; | 1317 | goto out; |
1318 | } | 1318 | } |
@@ -1334,7 +1334,7 @@ int zfcp_fsf_exchange_config_data_sync(struct zfcp_adapter *adapter, | |||
1334 | zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT); | 1334 | zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT); |
1335 | retval = zfcp_fsf_req_send(req); | 1335 | retval = zfcp_fsf_req_send(req); |
1336 | out: | 1336 | out: |
1337 | spin_unlock(&adapter->req_q.lock); | 1337 | spin_unlock_bh(&adapter->req_q.lock); |
1338 | if (!retval) | 1338 | if (!retval) |
1339 | wait_event(req->completion_wq, | 1339 | wait_event(req->completion_wq, |
1340 | req->status & ZFCP_STATUS_FSFREQ_COMPLETED); | 1340 | req->status & ZFCP_STATUS_FSFREQ_COMPLETED); |
@@ -1359,13 +1359,13 @@ int zfcp_fsf_exchange_port_data(struct zfcp_erp_action *erp_action) | |||
1359 | if (!(adapter->adapter_features & FSF_FEATURE_HBAAPI_MANAGEMENT)) | 1359 | if (!(adapter->adapter_features & FSF_FEATURE_HBAAPI_MANAGEMENT)) |
1360 | return -EOPNOTSUPP; | 1360 | return -EOPNOTSUPP; |
1361 | 1361 | ||
1362 | spin_lock(&adapter->req_q.lock); | 1362 | spin_lock_bh(&adapter->req_q.lock); |
1363 | if (!atomic_read(&adapter->req_q.count)) | 1363 | if (!atomic_read(&adapter->req_q.count)) |
1364 | goto out; | 1364 | goto out; |
1365 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_PORT_DATA, | 1365 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_PORT_DATA, |
1366 | ZFCP_REQ_AUTO_CLEANUP, | 1366 | ZFCP_REQ_AUTO_CLEANUP, |
1367 | adapter->pool.fsf_req_erp); | 1367 | adapter->pool.fsf_req_erp); |
1368 | if (unlikely(IS_ERR(req))) { | 1368 | if (IS_ERR(req)) { |
1369 | retval = PTR_ERR(req); | 1369 | retval = PTR_ERR(req); |
1370 | goto out; | 1370 | goto out; |
1371 | } | 1371 | } |
@@ -1385,7 +1385,7 @@ int zfcp_fsf_exchange_port_data(struct zfcp_erp_action *erp_action) | |||
1385 | erp_action->fsf_req = NULL; | 1385 | erp_action->fsf_req = NULL; |
1386 | } | 1386 | } |
1387 | out: | 1387 | out: |
1388 | spin_unlock(&adapter->req_q.lock); | 1388 | spin_unlock_bh(&adapter->req_q.lock); |
1389 | return retval; | 1389 | return retval; |
1390 | } | 1390 | } |
1391 | 1391 | ||
@@ -1405,13 +1405,13 @@ int zfcp_fsf_exchange_port_data_sync(struct zfcp_adapter *adapter, | |||
1405 | if (!(adapter->adapter_features & FSF_FEATURE_HBAAPI_MANAGEMENT)) | 1405 | if (!(adapter->adapter_features & FSF_FEATURE_HBAAPI_MANAGEMENT)) |
1406 | return -EOPNOTSUPP; | 1406 | return -EOPNOTSUPP; |
1407 | 1407 | ||
1408 | spin_lock(&adapter->req_q.lock); | 1408 | spin_lock_bh(&adapter->req_q.lock); |
1409 | if (!atomic_read(&adapter->req_q.count)) | 1409 | if (!atomic_read(&adapter->req_q.count)) |
1410 | goto out; | 1410 | goto out; |
1411 | 1411 | ||
1412 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_PORT_DATA, 0, | 1412 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_PORT_DATA, 0, |
1413 | NULL); | 1413 | NULL); |
1414 | if (unlikely(IS_ERR(req))) { | 1414 | if (IS_ERR(req)) { |
1415 | retval = PTR_ERR(req); | 1415 | retval = PTR_ERR(req); |
1416 | goto out; | 1416 | goto out; |
1417 | } | 1417 | } |
@@ -1427,7 +1427,7 @@ int zfcp_fsf_exchange_port_data_sync(struct zfcp_adapter *adapter, | |||
1427 | zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT); | 1427 | zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT); |
1428 | retval = zfcp_fsf_req_send(req); | 1428 | retval = zfcp_fsf_req_send(req); |
1429 | out: | 1429 | out: |
1430 | spin_unlock(&adapter->req_q.lock); | 1430 | spin_unlock_bh(&adapter->req_q.lock); |
1431 | if (!retval) | 1431 | if (!retval) |
1432 | wait_event(req->completion_wq, | 1432 | wait_event(req->completion_wq, |
1433 | req->status & ZFCP_STATUS_FSFREQ_COMPLETED); | 1433 | req->status & ZFCP_STATUS_FSFREQ_COMPLETED); |
@@ -1531,7 +1531,7 @@ int zfcp_fsf_open_port(struct zfcp_erp_action *erp_action) | |||
1531 | struct zfcp_fsf_req *req; | 1531 | struct zfcp_fsf_req *req; |
1532 | int retval = -EIO; | 1532 | int retval = -EIO; |
1533 | 1533 | ||
1534 | spin_lock(&adapter->req_q.lock); | 1534 | spin_lock_bh(&adapter->req_q.lock); |
1535 | if (zfcp_fsf_req_sbal_get(adapter)) | 1535 | if (zfcp_fsf_req_sbal_get(adapter)) |
1536 | goto out; | 1536 | goto out; |
1537 | 1537 | ||
@@ -1539,7 +1539,7 @@ int zfcp_fsf_open_port(struct zfcp_erp_action *erp_action) | |||
1539 | FSF_QTCB_OPEN_PORT_WITH_DID, | 1539 | FSF_QTCB_OPEN_PORT_WITH_DID, |
1540 | ZFCP_REQ_AUTO_CLEANUP, | 1540 | ZFCP_REQ_AUTO_CLEANUP, |
1541 | adapter->pool.fsf_req_erp); | 1541 | adapter->pool.fsf_req_erp); |
1542 | if (unlikely(IS_ERR(req))) { | 1542 | if (IS_ERR(req)) { |
1543 | retval = PTR_ERR(req); | 1543 | retval = PTR_ERR(req); |
1544 | goto out; | 1544 | goto out; |
1545 | } | 1545 | } |
@@ -1562,7 +1562,7 @@ int zfcp_fsf_open_port(struct zfcp_erp_action *erp_action) | |||
1562 | erp_action->fsf_req = NULL; | 1562 | erp_action->fsf_req = NULL; |
1563 | } | 1563 | } |
1564 | out: | 1564 | out: |
1565 | spin_unlock(&adapter->req_q.lock); | 1565 | spin_unlock_bh(&adapter->req_q.lock); |
1566 | return retval; | 1566 | return retval; |
1567 | } | 1567 | } |
1568 | 1568 | ||
@@ -1603,14 +1603,14 @@ int zfcp_fsf_close_port(struct zfcp_erp_action *erp_action) | |||
1603 | struct zfcp_fsf_req *req; | 1603 | struct zfcp_fsf_req *req; |
1604 | int retval = -EIO; | 1604 | int retval = -EIO; |
1605 | 1605 | ||
1606 | spin_lock(&adapter->req_q.lock); | 1606 | spin_lock_bh(&adapter->req_q.lock); |
1607 | if (zfcp_fsf_req_sbal_get(adapter)) | 1607 | if (zfcp_fsf_req_sbal_get(adapter)) |
1608 | goto out; | 1608 | goto out; |
1609 | 1609 | ||
1610 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_CLOSE_PORT, | 1610 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_CLOSE_PORT, |
1611 | ZFCP_REQ_AUTO_CLEANUP, | 1611 | ZFCP_REQ_AUTO_CLEANUP, |
1612 | adapter->pool.fsf_req_erp); | 1612 | adapter->pool.fsf_req_erp); |
1613 | if (unlikely(IS_ERR(req))) { | 1613 | if (IS_ERR(req)) { |
1614 | retval = PTR_ERR(req); | 1614 | retval = PTR_ERR(req); |
1615 | goto out; | 1615 | goto out; |
1616 | } | 1616 | } |
@@ -1633,7 +1633,7 @@ int zfcp_fsf_close_port(struct zfcp_erp_action *erp_action) | |||
1633 | erp_action->fsf_req = NULL; | 1633 | erp_action->fsf_req = NULL; |
1634 | } | 1634 | } |
1635 | out: | 1635 | out: |
1636 | spin_unlock(&adapter->req_q.lock); | 1636 | spin_unlock_bh(&adapter->req_q.lock); |
1637 | return retval; | 1637 | return retval; |
1638 | } | 1638 | } |
1639 | 1639 | ||
@@ -1700,14 +1700,14 @@ int zfcp_fsf_close_physical_port(struct zfcp_erp_action *erp_action) | |||
1700 | struct zfcp_fsf_req *req; | 1700 | struct zfcp_fsf_req *req; |
1701 | int retval = -EIO; | 1701 | int retval = -EIO; |
1702 | 1702 | ||
1703 | spin_lock(&adapter->req_q.lock); | 1703 | spin_lock_bh(&adapter->req_q.lock); |
1704 | if (zfcp_fsf_req_sbal_get(adapter)) | 1704 | if (zfcp_fsf_req_sbal_get(adapter)) |
1705 | goto out; | 1705 | goto out; |
1706 | 1706 | ||
1707 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_CLOSE_PHYSICAL_PORT, | 1707 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_CLOSE_PHYSICAL_PORT, |
1708 | ZFCP_REQ_AUTO_CLEANUP, | 1708 | ZFCP_REQ_AUTO_CLEANUP, |
1709 | adapter->pool.fsf_req_erp); | 1709 | adapter->pool.fsf_req_erp); |
1710 | if (unlikely(IS_ERR(req))) { | 1710 | if (IS_ERR(req)) { |
1711 | retval = PTR_ERR(req); | 1711 | retval = PTR_ERR(req); |
1712 | goto out; | 1712 | goto out; |
1713 | } | 1713 | } |
@@ -1731,7 +1731,7 @@ int zfcp_fsf_close_physical_port(struct zfcp_erp_action *erp_action) | |||
1731 | erp_action->fsf_req = NULL; | 1731 | erp_action->fsf_req = NULL; |
1732 | } | 1732 | } |
1733 | out: | 1733 | out: |
1734 | spin_unlock(&adapter->req_q.lock); | 1734 | spin_unlock_bh(&adapter->req_q.lock); |
1735 | return retval; | 1735 | return retval; |
1736 | } | 1736 | } |
1737 | 1737 | ||
@@ -1875,14 +1875,14 @@ int zfcp_fsf_open_unit(struct zfcp_erp_action *erp_action) | |||
1875 | struct zfcp_fsf_req *req; | 1875 | struct zfcp_fsf_req *req; |
1876 | int retval = -EIO; | 1876 | int retval = -EIO; |
1877 | 1877 | ||
1878 | spin_lock(&adapter->req_q.lock); | 1878 | spin_lock_bh(&adapter->req_q.lock); |
1879 | if (zfcp_fsf_req_sbal_get(adapter)) | 1879 | if (zfcp_fsf_req_sbal_get(adapter)) |
1880 | goto out; | 1880 | goto out; |
1881 | 1881 | ||
1882 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_OPEN_LUN, | 1882 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_OPEN_LUN, |
1883 | ZFCP_REQ_AUTO_CLEANUP, | 1883 | ZFCP_REQ_AUTO_CLEANUP, |
1884 | adapter->pool.fsf_req_erp); | 1884 | adapter->pool.fsf_req_erp); |
1885 | if (unlikely(IS_ERR(req))) { | 1885 | if (IS_ERR(req)) { |
1886 | retval = PTR_ERR(req); | 1886 | retval = PTR_ERR(req); |
1887 | goto out; | 1887 | goto out; |
1888 | } | 1888 | } |
@@ -1910,7 +1910,7 @@ int zfcp_fsf_open_unit(struct zfcp_erp_action *erp_action) | |||
1910 | erp_action->fsf_req = NULL; | 1910 | erp_action->fsf_req = NULL; |
1911 | } | 1911 | } |
1912 | out: | 1912 | out: |
1913 | spin_unlock(&adapter->req_q.lock); | 1913 | spin_unlock_bh(&adapter->req_q.lock); |
1914 | return retval; | 1914 | return retval; |
1915 | } | 1915 | } |
1916 | 1916 | ||
@@ -1965,13 +1965,13 @@ int zfcp_fsf_close_unit(struct zfcp_erp_action *erp_action) | |||
1965 | struct zfcp_fsf_req *req; | 1965 | struct zfcp_fsf_req *req; |
1966 | int retval = -EIO; | 1966 | int retval = -EIO; |
1967 | 1967 | ||
1968 | spin_lock(&adapter->req_q.lock); | 1968 | spin_lock_bh(&adapter->req_q.lock); |
1969 | if (zfcp_fsf_req_sbal_get(adapter)) | 1969 | if (zfcp_fsf_req_sbal_get(adapter)) |
1970 | goto out; | 1970 | goto out; |
1971 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_CLOSE_LUN, | 1971 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_CLOSE_LUN, |
1972 | ZFCP_REQ_AUTO_CLEANUP, | 1972 | ZFCP_REQ_AUTO_CLEANUP, |
1973 | adapter->pool.fsf_req_erp); | 1973 | adapter->pool.fsf_req_erp); |
1974 | if (unlikely(IS_ERR(req))) { | 1974 | if (IS_ERR(req)) { |
1975 | retval = PTR_ERR(req); | 1975 | retval = PTR_ERR(req); |
1976 | goto out; | 1976 | goto out; |
1977 | } | 1977 | } |
@@ -1995,7 +1995,7 @@ int zfcp_fsf_close_unit(struct zfcp_erp_action *erp_action) | |||
1995 | erp_action->fsf_req = NULL; | 1995 | erp_action->fsf_req = NULL; |
1996 | } | 1996 | } |
1997 | out: | 1997 | out: |
1998 | spin_unlock(&adapter->req_q.lock); | 1998 | spin_unlock_bh(&adapter->req_q.lock); |
1999 | return retval; | 1999 | return retval; |
2000 | } | 2000 | } |
2001 | 2001 | ||
@@ -2228,7 +2228,7 @@ int zfcp_fsf_send_fcp_command_task(struct zfcp_adapter *adapter, | |||
2228 | goto out; | 2228 | goto out; |
2229 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_FCP_CMND, req_flags, | 2229 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_FCP_CMND, req_flags, |
2230 | adapter->pool.fsf_req_scsi); | 2230 | adapter->pool.fsf_req_scsi); |
2231 | if (unlikely(IS_ERR(req))) { | 2231 | if (IS_ERR(req)) { |
2232 | retval = PTR_ERR(req); | 2232 | retval = PTR_ERR(req); |
2233 | goto out; | 2233 | goto out; |
2234 | } | 2234 | } |
@@ -2351,7 +2351,7 @@ struct zfcp_fsf_req *zfcp_fsf_send_fcp_ctm(struct zfcp_adapter *adapter, | |||
2351 | goto out; | 2351 | goto out; |
2352 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_FCP_CMND, req_flags, | 2352 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_FCP_CMND, req_flags, |
2353 | adapter->pool.fsf_req_scsi); | 2353 | adapter->pool.fsf_req_scsi); |
2354 | if (unlikely(IS_ERR(req))) | 2354 | if (IS_ERR(req)) |
2355 | goto out; | 2355 | goto out; |
2356 | 2356 | ||
2357 | req->status |= ZFCP_STATUS_FSFREQ_TASK_MANAGEMENT; | 2357 | req->status |= ZFCP_STATUS_FSFREQ_TASK_MANAGEMENT; |
@@ -2417,12 +2417,12 @@ struct zfcp_fsf_req *zfcp_fsf_control_file(struct zfcp_adapter *adapter, | |||
2417 | return ERR_PTR(-EINVAL); | 2417 | return ERR_PTR(-EINVAL); |
2418 | } | 2418 | } |
2419 | 2419 | ||
2420 | spin_lock(&adapter->req_q.lock); | 2420 | spin_lock_bh(&adapter->req_q.lock); |
2421 | if (zfcp_fsf_req_sbal_get(adapter)) | 2421 | if (zfcp_fsf_req_sbal_get(adapter)) |
2422 | goto out; | 2422 | goto out; |
2423 | 2423 | ||
2424 | req = zfcp_fsf_req_create(adapter, fsf_cfdc->command, 0, NULL); | 2424 | req = zfcp_fsf_req_create(adapter, fsf_cfdc->command, 0, NULL); |
2425 | if (unlikely(IS_ERR(req))) { | 2425 | if (IS_ERR(req)) { |
2426 | retval = -EPERM; | 2426 | retval = -EPERM; |
2427 | goto out; | 2427 | goto out; |
2428 | } | 2428 | } |
@@ -2447,7 +2447,7 @@ struct zfcp_fsf_req *zfcp_fsf_control_file(struct zfcp_adapter *adapter, | |||
2447 | zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT); | 2447 | zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT); |
2448 | retval = zfcp_fsf_req_send(req); | 2448 | retval = zfcp_fsf_req_send(req); |
2449 | out: | 2449 | out: |
2450 | spin_unlock(&adapter->req_q.lock); | 2450 | spin_unlock_bh(&adapter->req_q.lock); |
2451 | 2451 | ||
2452 | if (!retval) { | 2452 | if (!retval) { |
2453 | wait_event(req->completion_wq, | 2453 | wait_event(req->completion_wq, |
diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c index d6dbd653fde9..69d632d851d9 100644 --- a/drivers/s390/scsi/zfcp_qdio.c +++ b/drivers/s390/scsi/zfcp_qdio.c | |||
@@ -423,9 +423,9 @@ void zfcp_qdio_close(struct zfcp_adapter *adapter) | |||
423 | 423 | ||
424 | /* clear QDIOUP flag, thus do_QDIO is not called during qdio_shutdown */ | 424 | /* clear QDIOUP flag, thus do_QDIO is not called during qdio_shutdown */ |
425 | req_q = &adapter->req_q; | 425 | req_q = &adapter->req_q; |
426 | spin_lock(&req_q->lock); | 426 | spin_lock_bh(&req_q->lock); |
427 | atomic_clear_mask(ZFCP_STATUS_ADAPTER_QDIOUP, &adapter->status); | 427 | atomic_clear_mask(ZFCP_STATUS_ADAPTER_QDIOUP, &adapter->status); |
428 | spin_unlock(&req_q->lock); | 428 | spin_unlock_bh(&req_q->lock); |
429 | 429 | ||
430 | qdio_shutdown(adapter->ccw_device, QDIO_FLAG_CLEANUP_USING_CLEAR); | 430 | qdio_shutdown(adapter->ccw_device, QDIO_FLAG_CLEANUP_USING_CLEAR); |
431 | 431 | ||