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

Commit 390dde08 authored by Hans Wippel's avatar Hans Wippel Committed by David S. Miller
Browse files

s390/net: convert pnetids to ascii 



Pnetids are retrieved from the underlying hardware as EBCDIC. This patch
converts pnetids to ASCII.

Signed-off-by: default avatarHans Wippel <hwippel@linux.ibm.com>
Signed-off-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cecc7a31

arch/s390/net/pnet.c

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <asm/ccwgroup.h>

#include <asm/ccwdev.h>

#include <asm/pnet.h>

#include <asm/ebcdic.h>



#define PNETIDS_LEN		64	/* Total utility string length in bytes

					 * to cover up to 4 PNETIDs of 16 bytes
@@ -48,6 +49,7 @@ static int pnet_ids_by_device(struct device *dev, u8 *pnetids) 
		if (!util_str)

			return -ENOMEM;

		memcpy(pnetids, util_str, PNETIDS_LEN);

		EBCASC(pnetids, PNETIDS_LEN);

		kfree(util_str);

		return 0;

	}
@@ -55,6 +57,7 @@ static int pnet_ids_by_device(struct device *dev, u8 *pnetids) 
		struct zpci_dev *zdev = to_zpci(to_pci_dev(dev));



		memcpy(pnetids, zdev->util_str, sizeof(zdev->util_str));

		EBCASC(pnetids, sizeof(zdev->util_str));

		return 0;

	}

	return -EOPNOTSUPP;