diff options
author | David S. Miller <davem@davemloft.net> | 2019-02-07 18:06:19 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-02-07 18:06:19 -0800 |
commit | f06f095f3294f8e6357bd2ec30844f125981bc6a (patch) | |
tree | 4789334e9cd775ba44fc17f163f450d279b72a87 /arch | |
parent | net: vxlan: Free a leaked vetoed multicast rdst (diff) | |
parent | net/smc: original socket family in inet_sock_diag (diff) | |
download | linux-dev-f06f095f3294f8e6357bd2ec30844f125981bc6a.tar.xz linux-dev-f06f095f3294f8e6357bd2ec30844f125981bc6a.zip |
Merge branch 'smc-next'
Ursula Braun says:
====================
net/smc: patches 2019-02-07
here are patches for SMC:
* patches 1, 3, and 6 are cleanups without functional change
* patch 2 postpones closing of internal clcsock
* patches 4 and 5 improve link group creation locking
* patch 7 restores AF_SMC as diag_family field
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/s390/include/asm/pnet.h | 8 | ||||
-rw-r--r-- | arch/s390/net/pnet.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/s390/include/asm/pnet.h b/arch/s390/include/asm/pnet.h index 6e278584f8f1..5739276b458d 100644 --- a/arch/s390/include/asm/pnet.h +++ b/arch/s390/include/asm/pnet.h @@ -11,13 +11,5 @@ #include <linux/device.h> #include <linux/types.h> -#define PNETIDS_LEN 64 /* Total utility string length in bytes - * to cover up to 4 PNETIDs of 16 bytes - * for up to 4 device ports - */ -#define MAX_PNETID_LEN 16 /* Max.length of a single port PNETID */ -#define MAX_PNETID_PORTS (PNETIDS_LEN / MAX_PNETID_LEN) - /* Max. # of ports with a PNETID */ - int pnet_id_by_dev_port(struct device *dev, unsigned short port, u8 *pnetid); #endif /* _ASM_S390_PNET_H */ diff --git a/arch/s390/net/pnet.c b/arch/s390/net/pnet.c index e22f1b10a6c7..9ecdbdf59781 100644 --- a/arch/s390/net/pnet.c +++ b/arch/s390/net/pnet.c @@ -13,6 +13,14 @@ #include <asm/ccwdev.h> #include <asm/pnet.h> +#define PNETIDS_LEN 64 /* Total utility string length in bytes + * to cover up to 4 PNETIDs of 16 bytes + * for up to 4 device ports + */ +#define MAX_PNETID_LEN 16 /* Max.length of a single port PNETID */ +#define MAX_PNETID_PORTS (PNETIDS_LEN / MAX_PNETID_LEN) + /* Max. # of ports with a PNETID */ + /* * Get the PNETIDs from a device. * s390 hardware supports the definition of a so-called Physical Network |