qeth: OSA version of SETBRIDGEPORT command

OSA Ethernet hardware is introducing BRIDGEPORT functionality
similar (but not identical) to HiperSockets BRIDGEPORT. This
patch makes HiperSockets BRIDGEPORT related sysfs attributes
and udev events work with OSA hardware too.

Reviewed-by: Thomas Richter <tmricht@linux.vnet.ibm.com>
Signed-off-by: Eugene Crosser <Eugene.Crosser@ru.ibm.com>
Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/Documentation/s390/qeth.txt b/Documentation/s390/qeth.txt
index 74122ad..aa06fcf 100644 (file)
--- a/Documentation/s390/qeth.txt
+++ b/Documentation/s390/qeth.txt
@@ -1,6 +1,6 @@
 IBM s390 QDIO Ethernet Driver
 
-HiperSockets Bridge Port Support
+OSA and HiperSockets Bridge Port Support
 
 Uevents
 
@@ -8,7 +8,7 @@ To generate the events the device must be assigned a role of either
 a primary or a secondary Bridge Port. For more information, see
 "z/VM Connectivity, SC24-6174".
 
-When run on HiperSockets Bridge Capable Port hardware, and the state
+When run on an OSA or HiperSockets Bridge Capable Port hardware, and the state
 of some configured Bridge Port device on the channel changes, a udev
 event with ACTION=CHANGE is emitted on behalf of the corresponding
 ccwgroup device. The event has the following attributes:

diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 3466d3c..5e20fba 100644 (file)
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -645,7 +645,8 @@ static struct qeth_ipa_cmd *qeth_check_ipa_data(struct qeth_card *card,
                                        card->info.hwtrap = 2;
                                qeth_schedule_recovery(card);
                                return NULL;
-                       case IPA_CMD_SETBRIDGEPORT:
+                       case IPA_CMD_SETBRIDGEPORT_IQD:
+                       case IPA_CMD_SETBRIDGEPORT_OSA:
                        case IPA_CMD_ADDRESS_CHANGE_NOTIF:
                                if (card->discipline->control_event_handler
                                                                (card, cmd))

diff --git a/drivers/s390/net/qeth_core_mpc.c b/drivers/s390/net/qeth_core_mpc.c
index 7b55768..beb4bdc 100644 (file)
--- a/drivers/s390/net/qeth_core_mpc.c
+++ b/drivers/s390/net/qeth_core_mpc.c
@@ -237,6 +237,7 @@ static struct ipa_cmd_names qeth_ipa_cmd_names[] = {
        {IPA_CMD_DELGMAC,       "delgmac"},
        {IPA_CMD_SETVLAN,       "setvlan"},
        {IPA_CMD_DELVLAN,       "delvlan"},
+       {IPA_CMD_SETBRIDGEPORT_OSA,     "set_bridge_port(osa)"},
        {IPA_CMD_SETCCID,       "setccid"},
        {IPA_CMD_DELCCID,       "delccid"},
        {IPA_CMD_MODCCID,       "modccid"},
@@ -249,7 +250,7 @@ static struct ipa_cmd_names qeth_ipa_cmd_names[] = {
        {IPA_CMD_DELIP,         "delip"},
        {IPA_CMD_SETADAPTERPARMS, "setadapterparms"},
        {IPA_CMD_SET_DIAG_ASS,  "set_diag_ass"},
-       {IPA_CMD_SETBRIDGEPORT, "set_bridge_port"},
+       {IPA_CMD_SETBRIDGEPORT_IQD,     "set_bridge_port(hs)"},
        {IPA_CMD_CREATE_ADDR,   "create_addr"},
        {IPA_CMD_DESTROY_ADDR,  "destroy_addr"},
        {IPA_CMD_REGISTER_LOCAL_ADDR,   "register_local_addr"},

diff --cc drivers/s390/net/qeth_core_mpc.h
Simple merge

diff --cc drivers/s390/net/qeth_l2_main.c
Simple merge