Merge tag 'mvebu-fixes-3.13-2' of git://git.infradead.org/linux-mvebu into fixes

[~andy/linux] / drivers / s390 / net / qeth_core_main.c

diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index c05dacbf4e23563eb73eafb6687080b9bad58faf..c3a83df07894e51195d914111c15be2c615f09c1 100644 (file)
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -69,6 +69,7 @@ static void qeth_clear_output_buffer(struct qeth_qdio_out_q *queue,
 static int qeth_init_qdio_out_buf(struct qeth_qdio_out_q *, int);
 
 struct workqueue_struct *qeth_wq;
+EXPORT_SYMBOL_GPL(qeth_wq);
 
 static void qeth_close_dev_handler(struct work_struct *work)
 {
@@ -616,15 +617,12 @@ static struct qeth_ipa_cmd *qeth_check_ipa_data(struct qeth_card *card,
                                qeth_schedule_recovery(card);
                                return NULL;
                        case IPA_CMD_SETBRIDGEPORT:
-                               if (cmd->data.sbp.hdr.command_code ==
-                                       IPA_SBP_BRIDGE_PORT_STATE_CHANGE) {
-                                       qeth_bridge_state_change(card, cmd);
-                                       return NULL;
-                               } else
-                                       return cmd;
                        case IPA_CMD_ADDRESS_CHANGE_NOTIF:
-                               qeth_bridge_host_event(card, cmd);
-                               return NULL;
+                               if (card->discipline->control_event_handler
+                                                               (card, cmd))
+                                       return cmd;
+                               else
+                                       return NULL;
                        case IPA_CMD_MODCCID:
                                return cmd;
                        case IPA_CMD_REGISTER_LOCAL_ADDR:
@@ -4973,10 +4971,6 @@ retriable:
                qeth_query_setadapterparms(card);
        if (qeth_adp_supported(card, IPA_SETADP_SET_DIAG_ASSIST))
                qeth_query_setdiagass(card);
-       qeth_bridgeport_query_support(card);
-       if (card->options.sbp.supported_funcs)
-               dev_info(&card->gdev->dev,
-               "The device represents a HiperSockets Bridge Capable Port\n");
        return 0;
 out:
        dev_warn(&card->gdev->dev, "The qeth device driver failed to recover "