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

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

Merge branch 's390-next' 



Ursula Braun says:

====================
s390 network patches

here are some s390 related patches for net-next. Most important is
the skb_linearize af_iucv patch from Eugene solving traffic problems
in certain scenarios. The remaining patches are minor improvements.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5241c2d7 476933ce

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -9125,7 +9125,7 @@ F: drivers/s390/block/dasd* 
F:	block/partitions/ibm.c



S390 NETWORK DRIVERS

M:	Ursula Braun <ursula.braun@de.ibm.com>

M:	Ursula Braun <ubraun@linux.vnet.ibm.com>

L:	linux-s390@vger.kernel.org

W:	http://www.ibm.com/developerworks/linux/linux390/

S:	Supported
@@ -9155,7 +9155,7 @@ S: Supported 
F:	drivers/s390/scsi/zfcp_*



S390 IUCV NETWORK LAYER

M:	Ursula Braun <ursula.braun@de.ibm.com>

M:	Ursula Braun <ubraun@linux.vnet.ibm.com>

L:	linux-s390@vger.kernel.org

W:	http://www.ibm.com/developerworks/linux/linux390/

S:	Supported

drivers/s390/net/ctcm_main.c

+2 −5
Original line number Diff line number Diff line
@@ -1677,10 +1677,7 @@ static int ctcm_shutdown_device(struct ccwgroup_device *cgdev) 


	ccw_device_set_offline(cgdev->cdev[1]);

	ccw_device_set_offline(cgdev->cdev[0]);



	if (priv->channel[CTCM_READ])

	channel_remove(priv->channel[CTCM_READ]);

	if (priv->channel[CTCM_WRITE])

	channel_remove(priv->channel[CTCM_WRITE]);

	priv->channel[CTCM_READ] = priv->channel[CTCM_WRITE] = NULL;

drivers/s390/net/qeth_core.h

+4 −0
Original line number Diff line number Diff line
@@ -981,6 +981,10 @@ int qeth_send_setassparms(struct qeth_card *, struct qeth_cmd_buffer *, __u16, 
			  int (*reply_cb)(struct qeth_card *,

					  struct qeth_reply *, unsigned long),

			  void *);

struct qeth_cmd_buffer *qeth_get_setassparms_cmd(struct qeth_card *,

						 enum qeth_ipa_funcs,

						 __u16, __u16,

						 enum qeth_prot_versions);

int qeth_start_ipa_tx_checksum(struct qeth_card *);

int qeth_set_rx_csum(struct qeth_card *, int);

drivers/s390/net/qeth_core_main.c

+5 −6
Original line number Diff line number Diff line
@@ -2684,8 +2684,6 @@ void qeth_print_status_message(struct qeth_card *card) 
			sprintf(card->info.mcl_level, "%02x%02x",

				card->info.mcl_level[2],

				card->info.mcl_level[3]);



			card->info.mcl_level[QETH_MCL_LENGTH] = 0;

			break;

		}

		/* fallthrough */
@@ -5297,7 +5295,7 @@ static int qeth_setassparms_cb(struct qeth_card *card, 
	return 0;

}



static struct qeth_cmd_buffer *qeth_get_setassparms_cmd(struct qeth_card *card,

struct qeth_cmd_buffer *qeth_get_setassparms_cmd(struct qeth_card *card,

						 enum qeth_ipa_funcs ipa_func,

						 __u16 cmd_code, __u16 len,

						 enum qeth_prot_versions prot)
@@ -5319,6 +5317,7 @@ static struct qeth_cmd_buffer *qeth_get_setassparms_cmd(struct qeth_card *card, 


	return iob;

}

EXPORT_SYMBOL_GPL(qeth_get_setassparms_cmd);



int qeth_send_setassparms(struct qeth_card *card,

			  struct qeth_cmd_buffer *iob, __u16 len, long data,

drivers/s390/net/qeth_l2_main.c

+1 −0
Original line number Diff line number Diff line
@@ -1126,6 +1126,7 @@ static int qeth_l2_setup_netdev(struct qeth_card *card) 
	qeth_l2_request_initial_mac(card);

	SET_NETDEV_DEV(card->dev, &card->gdev->dev);

	netif_napi_add(card->dev, &card->napi, qeth_l2_poll, QETH_NAPI_WEIGHT);

	netif_carrier_off(card->dev);

	return register_netdev(card->dev);

}