Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

s390/qeth: reduce data length for ARP cache query 



qeth_l3_query_arp_cache_info() indicates a data length that's much
larger than the actual length of its request (ie. the value passed to
qeth_get_setassparms_cmd()). The confusion presumably comes from the
fact that the cmd _response_ can be quite large - but that's no concern
for the initial request IO.

Fixing this up allows us to use the generic qeth_send_ipa_cmd()
infrastructure.

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a263f99c

drivers/s390/net/qeth_core.h

+0 −3
Original line number Diff line number Diff line
@@ -1004,9 +1004,6 @@ void qeth_prepare_ipa_cmd(struct qeth_card *card, struct qeth_cmd_buffer *iob); 
struct qeth_cmd_buffer *qeth_wait_for_buffer(struct qeth_channel *);

int qeth_query_switch_attributes(struct qeth_card *card,

				  struct qeth_switch_info *sw_info);

int qeth_send_control_data(struct qeth_card *, int, struct qeth_cmd_buffer *,

	int (*reply_cb)(struct qeth_card *, struct qeth_reply*, unsigned long),

	void *reply_param);

unsigned int qeth_count_elements(struct sk_buff *skb, unsigned int data_offset);

int qeth_do_send_packet(struct qeth_card *card, struct qeth_qdio_out_q *queue,

			struct sk_buff *skb, struct qeth_hdr *hdr,

drivers/s390/net/qeth_core_main.c

+6 −7
Original line number Diff line number Diff line
@@ -2020,7 +2020,7 @@ EXPORT_SYMBOL_GPL(qeth_prepare_control_data); 
 * field 'param' of the structure qeth_reply.

 */



int qeth_send_control_data(struct qeth_card *card, int len,

static int qeth_send_control_data(struct qeth_card *card, int len,

				  struct qeth_cmd_buffer *iob,

				  int (*reply_cb)(struct qeth_card *cb_card,

						  struct qeth_reply *cb_reply,
@@ -2116,7 +2116,6 @@ int qeth_send_control_data(struct qeth_card *card, int len, 
	qeth_put_reply(reply);

	return rc;

}

EXPORT_SYMBOL_GPL(qeth_send_control_data);



static int qeth_cm_enable_cb(struct qeth_card *card, struct qeth_reply *reply,

		unsigned long data)

drivers/s390/net/qeth_core_mpc.h

+0 −5
Original line number Diff line number Diff line
@@ -834,15 +834,10 @@ enum qeth_ipa_arp_return_codes { 
extern const char *qeth_get_ipa_msg(enum qeth_ipa_return_codes rc);

extern const char *qeth_get_ipa_cmd_name(enum qeth_ipa_cmds cmd);



#define QETH_SETASS_BASE_LEN (IPA_PDU_HEADER_SIZE + \

			      sizeof(struct qeth_ipacmd_hdr) + \

			      sizeof(struct qeth_ipacmd_setassparms_hdr))

#define QETH_SETADP_BASE_LEN (sizeof(struct qeth_ipacmd_hdr) + \

			      sizeof(struct qeth_ipacmd_setadpparms_hdr))

#define QETH_SNMP_SETADP_CMDLENGTH 16



#define QETH_ARP_DATA_SIZE 3968

#define QETH_ARP_CMD_LEN (QETH_ARP_DATA_SIZE + 8)

/* Helper functions */

#define IS_IPA_REPLY(cmd) ((cmd->hdr.initiator == IPA_CMD_INITIATOR_HOST) || \

			   (cmd->hdr.initiator == IPA_CMD_INITIATOR_OSA_REPLY))

drivers/s390/net/qeth_l3_main.c

+1 −3
Original line number Diff line number Diff line
@@ -1696,9 +1696,7 @@ static int qeth_l3_query_arp_cache_info(struct qeth_card *card, 
		return -ENOMEM;

	cmd = __ipa_cmd(iob);

	cmd->data.setassparms.data.query_arp.request_bits = 0x000F;

	rc = qeth_send_control_data(card,

				    QETH_SETASS_BASE_LEN + QETH_ARP_CMD_LEN,

				    iob, qeth_l3_arp_query_cb, qinfo);

	rc = qeth_send_ipa_cmd(card, iob, qeth_l3_arp_query_cb, qinfo);

	if (rc)

		QETH_DBF_MESSAGE(2, "Error while querying ARP cache on device %x: %#x\n",

				 CARD_DEVID(card), rc);