Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Julian Wiedmann and committed by
David S. Miller
a37cfa28 a8c7629c

+4 -4
+1 -1
drivers/s390/net/qeth_core_main.c
··· 2422 2422 2423 2423 static u8 qeth_mpc_select_prot_type(struct qeth_card *card) 2424 2424 { 2425 - return IS_LAYER2(card) ? QETH_PROT_LAYER2 : QETH_PROT_TCPIP; 2425 + return IS_LAYER2(card) ? QETH_MPC_PROT_L2 : QETH_MPC_PROT_L3; 2426 2426 } 2427 2427 2428 2428 static int qeth_ulp_enable(struct qeth_card *card)
+3 -3
drivers/s390/net/qeth_core_mpc.h
··· 905 905 (PDU_ENCAPSULATION(buffer) + 0x17) 906 906 #define QETH_ULP_ENABLE_RESP_LINK_TYPE(buffer) \ 907 907 (PDU_ENCAPSULATION(buffer) + 0x2b) 908 - /* Layer 2 definitions */ 909 - #define QETH_PROT_LAYER2 0x08 910 - #define QETH_PROT_TCPIP 0x03 908 + 909 + #define QETH_MPC_PROT_L2 0x08 910 + #define QETH_MPC_PROT_L3 0x03 911 911 #define QETH_ULP_ENABLE_PROT_TYPE(buffer) (buffer + 0x50) 912 912 #define QETH_IPA_CMD_PROT_TYPE(buffer) (buffer + 0x19) 913 913