diff options
| author | Julian Wiedmann <jwi@linux.ibm.com> | 2021-07-20 08:38:48 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-07-20 06:17:06 -0700 |
| commit | a37cfa28ebdc6a2286569ef783c4ba5c719f4902 (patch) | |
| tree | 7af534a28d6df7a149307c6a69b58648074bb09e /drivers/s390 | |
| parent | a8c7629c622b7cfa219c9edddd4f30833c330997 (diff) | |
| download | linux-stable-a37cfa28ebdc6a2286569ef783c4ba5c719f4902.tar.gz linux-stable-a37cfa28ebdc6a2286569ef783c4ba5c719f4902.tar.bz2 linux-stable-a37cfa28ebdc6a2286569ef783c4ba5c719f4902.zip | |
s390/qeth: clean up QETH_PROT_* naming
The QETH_PROT_* naming is shared among two unrelated areas - one is
the MPC-level protocol identifiers, the other is the qeth_prot_version
enum.
Rename the MPC definitions to use QETH_MPC_PROT_*.
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Reviewed-by: Alexandra Winter <wintera@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/net/qeth_core_main.c | 2 | ||||
| -rw-r--r-- | drivers/s390/net/qeth_core_mpc.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c index 19a4bf25bd75..02a12f984ce2 100644 --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c @@ -2422,7 +2422,7 @@ static int qeth_ulp_enable_cb(struct qeth_card *card, struct qeth_reply *reply, static u8 qeth_mpc_select_prot_type(struct qeth_card *card) { - return IS_LAYER2(card) ? QETH_PROT_LAYER2 : QETH_PROT_TCPIP; + return IS_LAYER2(card) ? QETH_MPC_PROT_L2 : QETH_MPC_PROT_L3; } static int qeth_ulp_enable(struct qeth_card *card) diff --git a/drivers/s390/net/qeth_core_mpc.h b/drivers/s390/net/qeth_core_mpc.h index a0dbe8b77924..6257f00786b3 100644 --- a/drivers/s390/net/qeth_core_mpc.h +++ b/drivers/s390/net/qeth_core_mpc.h @@ -905,9 +905,9 @@ extern const unsigned char ULP_ENABLE[]; (PDU_ENCAPSULATION(buffer) + 0x17) #define QETH_ULP_ENABLE_RESP_LINK_TYPE(buffer) \ (PDU_ENCAPSULATION(buffer) + 0x2b) -/* Layer 2 definitions */ -#define QETH_PROT_LAYER2 0x08 -#define QETH_PROT_TCPIP 0x03 + +#define QETH_MPC_PROT_L2 0x08 +#define QETH_MPC_PROT_L3 0x03 #define QETH_ULP_ENABLE_PROT_TYPE(buffer) (buffer + 0x50) #define QETH_IPA_CMD_PROT_TYPE(buffer) (buffer + 0x19) |