diff options
| author | Hans Wippel <hwippel@linux.ibm.com> | 2019-02-21 13:00:59 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-21 10:34:37 -0800 |
| commit | 390dde08446ececfaafe63d0db14ceff15f03886 (patch) | |
| tree | 68e9c0c0a9bbb6203e8622dcf9f7b1a85582950a /arch/s390/net | |
| parent | cecc7a317defb1b396630c513cdf2ad2d12c7bd3 (diff) | |
| download | linux-stable-390dde08446ececfaafe63d0db14ceff15f03886.tar.gz linux-stable-390dde08446ececfaafe63d0db14ceff15f03886.tar.bz2 linux-stable-390dde08446ececfaafe63d0db14ceff15f03886.zip | |
s390/net: convert pnetids to ascii
Pnetids are retrieved from the underlying hardware as EBCDIC. This patch
converts pnetids to ASCII.
Signed-off-by: Hans Wippel <hwippel@linux.ibm.com>
Signed-off-by: Ursula Braun <ubraun@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/s390/net')
| -rw-r--r-- | arch/s390/net/pnet.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/s390/net/pnet.c b/arch/s390/net/pnet.c index 9ecdbdf59781..79211bec0fc8 100644 --- a/arch/s390/net/pnet.c +++ b/arch/s390/net/pnet.c @@ -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; |