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

Commit 1ca22126 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 's390-next' 



Ursula Braun says:

====================
s390 patches for net-next

here are some cleanup patches for drivers/s390/net.
V2: respin, now patch "s390/qeth: improve endianness handling"
    is supposed to apply cleanly to net-next
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 45e60cb3 6c37c60c

drivers/s390/net/ctcm_fsms.c

+1 −1
Original line number Diff line number Diff line
@@ -1283,7 +1283,7 @@ static void ctcmpc_chx_txdone(fsm_instance *fi, int event, void *arg) 
		p_header = (struct pdu *)

			(skb_tail_pointer(ch->trans_skb) - skb->len);

		p_header->pdu_flag = 0x00;

		if (skb->protocol == ntohs(ETH_P_SNAP))

		if (be16_to_cpu(skb->protocol) == ETH_P_SNAP)

			p_header->pdu_flag |= 0x60;

		else

			p_header->pdu_flag |= 0x20;

drivers/s390/net/ctcm_main.c

+6 −6
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ void ctcm_unpack_skb(struct channel *ch, struct sk_buff *pskb) 
			priv->stats.rx_frame_errors++;

			return;

		}

		pskb->protocol = ntohs(header->type);

		pskb->protocol = cpu_to_be16(header->type);

		if ((header->length <= LL_HEADER_LENGTH) ||

		    (len <= LL_HEADER_LENGTH)) {

			if (!(ch->logflags & LOG_FLAG_ILLEGALSIZE)) {
@@ -485,7 +485,7 @@ static int ctcm_transmit_skb(struct channel *ch, struct sk_buff *skb) 
		} else {

			atomic_inc(&skb->users);

			header.length = l;

			header.type = skb->protocol;

			header.type = be16_to_cpu(skb->protocol);

			header.unused = 0;

			memcpy(skb_push(skb, LL_HEADER_LENGTH), &header,

			       LL_HEADER_LENGTH);
@@ -503,7 +503,7 @@ static int ctcm_transmit_skb(struct channel *ch, struct sk_buff *skb) 
	atomic_inc(&skb->users);

	ch->prof.txlen += skb->len;

	header.length = skb->len + LL_HEADER_LENGTH;

	header.type = skb->protocol;

	header.type = be16_to_cpu(skb->protocol);

	header.unused = 0;

	memcpy(skb_push(skb, LL_HEADER_LENGTH), &header, LL_HEADER_LENGTH);

	block_len = skb->len + 2;
@@ -690,7 +690,7 @@ static int ctcmpc_transmit_skb(struct channel *ch, struct sk_buff *skb) 
		p_header->pdu_offset = skb->len;

		p_header->pdu_proto = 0x01;

		p_header->pdu_flag = 0x00;

		if (skb->protocol == ntohs(ETH_P_SNAP)) {

		if (be16_to_cpu(skb->protocol) == ETH_P_SNAP) {

			p_header->pdu_flag |= PDU_FIRST | PDU_CNTL;

		} else {

			p_header->pdu_flag |= PDU_FIRST;
@@ -745,7 +745,7 @@ static int ctcmpc_transmit_skb(struct channel *ch, struct sk_buff *skb) 
	p_header->pdu_proto = 0x01;

	p_header->pdu_flag = 0x00;

	p_header->pdu_seq = 0;

	if (skb->protocol == ntohs(ETH_P_SNAP)) {

	if (be16_to_cpu(skb->protocol) == ETH_P_SNAP) {

		p_header->pdu_flag |= PDU_FIRST | PDU_CNTL;

	} else {

		p_header->pdu_flag |= PDU_FIRST;

drivers/s390/net/netiucv.c

+1 −1
Original line number Diff line number Diff line
@@ -635,7 +635,7 @@ static void netiucv_unpack_skb(struct iucv_connection *conn, 
	skb_put(pskb, NETIUCV_HDRLEN);

	pskb->dev = dev;

	pskb->ip_summed = CHECKSUM_NONE;

	pskb->protocol = ntohs(ETH_P_IP);

	pskb->protocol = cpu_to_be16(ETH_P_IP);



	while (1) {

		struct sk_buff *skb;

drivers/s390/net/qeth_core.h

+2 −14
Original line number Diff line number Diff line
@@ -503,22 +503,12 @@ struct qeth_qdio_info { 
	int default_out_queue;

};



enum qeth_send_errors {

	QETH_SEND_ERROR_NONE,

	QETH_SEND_ERROR_LINK_FAILURE,

	QETH_SEND_ERROR_RETRY,

	QETH_SEND_ERROR_KICK_IT,

};



#define QETH_ETH_MAC_V4      0x0100 /* like v4 */

#define QETH_ETH_MAC_V6      0x3333 /* like v6 */

/* tr mc mac is longer, but that will be enough to detect mc frames */

#define QETH_TR_MAC_NC       0xc000 /* non-canonical */

#define QETH_TR_MAC_C        0x0300 /* canonical */



#define DEFAULT_ADD_HHLEN 0

#define MAX_ADD_HHLEN 1024



/**

 * buffer stuff for read channel

 */
@@ -644,7 +634,6 @@ struct qeth_reply { 
	atomic_t refcnt;

};





struct qeth_card_blkt {

	int time_total;

	int inter_packet;
@@ -685,7 +674,6 @@ struct qeth_card_options { 
	struct qeth_ipa_info ipa6;

	struct qeth_sbp_info sbp; /* SETBRIDGEPORT options */

	int fake_broadcast;

	int add_hhlen;

	int layer2;

	int performance_stats;

	int rx_sg_cb;
@@ -856,9 +844,9 @@ static inline int qeth_get_ip_version(struct sk_buff *skb) 
{

	__be16 *p = &((struct ethhdr *)skb->data)->h_proto;



	if (*p == ETH_P_8021Q)

	if (be16_to_cpu(*p) == ETH_P_8021Q)

		p += 2;

	switch (*p) {

	switch (be16_to_cpu(*p)) {

	case ETH_P_IPV6:

		return 6;

	case ETH_P_IP:

drivers/s390/net/qeth_core_main.c

+16 −19
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ static struct mutex qeth_mod_mutex; 


static void qeth_send_control_data_cb(struct qeth_channel *,

			struct qeth_cmd_buffer *);

static int qeth_issue_next_read(struct qeth_card *);

static struct qeth_cmd_buffer *qeth_get_buffer(struct qeth_channel *);

static void qeth_setup_ccw(struct qeth_channel *, unsigned char *, __u32);

static void qeth_free_buffer_pool(struct qeth_card *);
@@ -1202,7 +1201,7 @@ static void qeth_notify_skbs(struct qeth_qdio_out_q *q, 
	while (skb) {

		QETH_CARD_TEXT_(q->card, 5, "skbn%d", notification);

		QETH_CARD_TEXT_(q->card, 5, "%lx", (long) skb);

		if (skb->protocol == ETH_P_AF_IUCV) {

		if (be16_to_cpu(skb->protocol) == ETH_P_AF_IUCV) {

			if (skb->sk) {

				struct iucv_sock *iucv = iucv_sk(skb->sk);

				iucv->sk_txnotify(skb, notification);
@@ -1233,7 +1232,8 @@ static void qeth_release_skbs(struct qeth_qdio_out_buffer *buf) 
	while (skb) {

		QETH_CARD_TEXT(buf->q->card, 5, "skbr");

		QETH_CARD_TEXT_(buf->q->card, 5, "%lx", (long) skb);

		if (notify_general_error && skb->protocol == ETH_P_AF_IUCV) {

		if (notify_general_error &&

		    be16_to_cpu(skb->protocol) == ETH_P_AF_IUCV) {

			if (skb->sk) {

				iucv = iucv_sk(skb->sk);

				iucv->sk_txnotify(skb, TX_NOTIFY_GENERALERROR);
@@ -1396,7 +1396,6 @@ static void qeth_set_intial_options(struct qeth_card *card) 
	card->options.route4.type = NO_ROUTER;

	card->options.route6.type = NO_ROUTER;

	card->options.fake_broadcast = 0;

	card->options.add_hhlen = DEFAULT_ADD_HHLEN;

	card->options.performance_stats = 0;

	card->options.rx_sg_cb = QETH_RX_SG_CB;

	card->options.isolation = ISOLATION_MODE_NONE;
@@ -3322,7 +3321,7 @@ void qeth_queue_input_buffer(struct qeth_card *card, int index) 
}

EXPORT_SYMBOL_GPL(qeth_queue_input_buffer);



static int qeth_handle_send_error(struct qeth_card *card,

static void qeth_handle_send_error(struct qeth_card *card,

		struct qeth_qdio_out_buffer *buffer, unsigned int qdio_err)

{

	int sbalf15 = buffer->buffer->element[15].sflags;
@@ -3338,15 +3337,14 @@ static int qeth_handle_send_error(struct qeth_card *card, 
	qeth_check_qdio_errors(card, buffer->buffer, qdio_err, "qouterr");



	if (!qdio_err)

		return QETH_SEND_ERROR_NONE;

		return;



	if ((sbalf15 >= 15) && (sbalf15 <= 31))

		return QETH_SEND_ERROR_RETRY;

		return;



	QETH_CARD_TEXT(card, 1, "lnkfail");

	QETH_CARD_TEXT_(card, 1, "%04x %02x",

		       (u16)qdio_err, (u8)sbalf15);

	return QETH_SEND_ERROR_LINK_FAILURE;

}



/*
@@ -3799,9 +3797,9 @@ int qeth_get_priority_queue(struct qeth_card *card, struct sk_buff *skb, 
		return qeth_cut_iqd_prio(card, ~skb->priority >> 1 & 3);

	case QETH_PRIO_Q_ING_VLAN:

		tci = &((struct ethhdr *)skb->data)->h_proto;

		if (*tci == ETH_P_8021Q)

			return qeth_cut_iqd_prio(card, ~*(tci + 1) >>

			(VLAN_PRIO_SHIFT + 1) & 3);

		if (be16_to_cpu(*tci) == ETH_P_8021Q)

			return qeth_cut_iqd_prio(card,

			~be16_to_cpu(*(tci + 1)) >> (VLAN_PRIO_SHIFT + 1) & 3);

		break;

	default:

		break;
@@ -4775,12 +4773,10 @@ static int qeth_query_card_info(struct qeth_card *card, 


static inline int qeth_get_qdio_q_format(struct qeth_card *card)

{

	switch (card->info.type) {

	case QETH_CARD_TYPE_IQD:

		return 2;

	default:

		return 0;

	}

	if (card->info.type == QETH_CARD_TYPE_IQD)

		return QDIO_IQDIO_QFMT;

	else

		return QDIO_QETH_QFMT;

}



static void qeth_determine_capabilities(struct qeth_card *card)
@@ -4819,8 +4815,9 @@ static void qeth_determine_capabilities(struct qeth_card *card) 
		QETH_DBF_TEXT_(SETUP, 2, "6err%d", rc);



	QETH_DBF_TEXT_(SETUP, 2, "qfmt%d", card->ssqd.qfmt);

	QETH_DBF_TEXT_(SETUP, 2, "%d", card->ssqd.qdioac1);

	QETH_DBF_TEXT_(SETUP, 2, "%d", card->ssqd.qdioac3);

	QETH_DBF_TEXT_(SETUP, 2, "ac1:%02x", card->ssqd.qdioac1);

	QETH_DBF_TEXT_(SETUP, 2, "ac2:%04x", card->ssqd.qdioac2);

	QETH_DBF_TEXT_(SETUP, 2, "ac3:%04x", card->ssqd.qdioac3);

	QETH_DBF_TEXT_(SETUP, 2, "icnt%d", card->ssqd.icnt);

	if (!((card->ssqd.qfmt != QDIO_IQDIO_QFMT) ||

	    ((card->ssqd.qdioac1 & CHSC_AC1_INITIATE_INPUTQ) == 0) ||