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

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

Merge branch 's390-net' 



Ursula Braun says:

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

here are 3 small patches for the s390 network drivers netiucv and lcs.
They are built for the net-tree.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents de1dfeef f7e3a16c

drivers/s390/net/netiucv.c

+8 −9
Original line number Diff line number Diff line
@@ -302,8 +302,7 @@ static char *netiucv_printuser(struct iucv_connection *conn) 
	if (memcmp(conn->userdata, iucvMagic_ebcdic, 16)) {

		tmp_uid[8] = '\0';

		tmp_udat[16] = '\0';

		memcpy(tmp_uid, conn->userid, 8);

		memcpy(tmp_uid, netiucv_printname(tmp_uid, 8), 8);

		memcpy(tmp_uid, netiucv_printname(conn->userid, 8), 8);

		memcpy(tmp_udat, conn->userdata, 16);

		EBCASC(tmp_udat, 16);

		memcpy(tmp_udat, netiucv_printname(tmp_udat, 16), 16);
@@ -1564,21 +1563,21 @@ static ssize_t buffer_write (struct device *dev, struct device_attribute *attr, 
{

	struct netiucv_priv *priv = dev_get_drvdata(dev);

	struct net_device *ndev = priv->conn->netdev;

	char         *e;

	int          bs1;

	unsigned int bs1;

	int rc;



	IUCV_DBF_TEXT(trace, 3, __func__);

	if (count >= 39)

		return -EINVAL;



	bs1 = simple_strtoul(buf, &e, 0);

	rc = kstrtouint(buf, 0, &bs1);



	if (e && (!isspace(*e))) {

		IUCV_DBF_TEXT_(setup, 2, "buffer_write: invalid char %02x\n",

			*e);

	if (rc == -EINVAL) {

		IUCV_DBF_TEXT_(setup, 2, "buffer_write: invalid char %s\n",

			buf);

		return -EINVAL;

	}

	if (bs1 > NETIUCV_BUFSIZE_MAX) {

	if ((rc == -ERANGE) || (bs1 > NETIUCV_BUFSIZE_MAX)) {

		IUCV_DBF_TEXT_(setup, 2,

			"buffer_write: buffer size %d too large\n",

			bs1);

drivers/s390/net/lcs.c

+1 −1

File changed.

Contains only whitespace changes.