Commit a37cfa28 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller
Browse files

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: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Reviewed-by: default avatarAlexandra Winter <wintera@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a8c7629c

drivers/s390/net/qeth_core_main.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/s390/net/qeth_core_mpc.h

+3 −3
Original line number Diff line number Diff line
@@ -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)