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

Commit 8a1343c5 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 's390-qeth-next' 



Julian Wiedmann says:

====================
s390/qeth: updates 2019-02-12

please apply one more round of qeth patches to net-next.
This series targets the driver's control paths. It primarily brings improvements
to the error handling for sent cmds and received responses, along with the
usual cleanup and consolidation efforts.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a263f99c 742d4d40

drivers/s390/net/qeth_core.h

+3 −5
Original line number Diff line number Diff line
@@ -595,8 +595,8 @@ struct qeth_channel; 
struct qeth_cmd_buffer {

	enum qeth_cmd_buffer_state state;

	struct qeth_channel *channel;

	struct qeth_reply *reply;

	unsigned char *data;

	int rc;

	void (*callback)(struct qeth_card *card, struct qeth_channel *channel,

			 struct qeth_cmd_buffer *iob);

};
@@ -1000,13 +1000,11 @@ void qeth_tx_timeout(struct net_device *); 
void qeth_prepare_control_data(struct qeth_card *, int,

				struct qeth_cmd_buffer *);

void qeth_release_buffer(struct qeth_channel *, struct qeth_cmd_buffer *);

void qeth_prepare_ipa_cmd(struct qeth_card *card, struct qeth_cmd_buffer *iob);

void qeth_prepare_ipa_cmd(struct qeth_card *card, struct qeth_cmd_buffer *iob,

			  u16 cmd_length);

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,