Merge branch 'smc-next' (9311defc) · Commits · 戴 / test

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;

+1 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,7 @@ struct smcd_dev {
		struct list_head vlan;
		struct workqueue_struct *event_wq;
		u8 pnetid[SMC_MAX_PNETID_LEN];
		bool pnetid_by_user;
		};

		struct smcd_dev smcd_alloc_dev(struct device parent, const char *name,

+28 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,10 @@
		#include <net/smc.h>
		#include <asm/ioctls.h>

		#include <net/net_namespace.h>
		#include <net/netns/generic.h>
		#include "smc_netns.h"

		#include "smc.h"
		#include "smc_clc.h"
		#include "smc_llc.h"
		@@ -1966,10 +1970,33 @@ static const struct net_proto_family smc_sock_family_ops = {
		.create = smc_create,
		};

		unsigned int smc_net_id;

		static __net_init int smc_net_init(struct net *net)
		{
		return smc_pnet_net_init(net);
		}

		static void __net_exit smc_net_exit(struct net *net)
		{
		smc_pnet_net_exit(net);
		}

		static struct pernet_operations smc_net_ops = {
		.init = smc_net_init,
		.exit = smc_net_exit,
		.id = &smc_net_id,
		.size = sizeof(struct smc_net),
		};

		static int __init smc_init(void)
		{
		int rc;

		rc = register_pernet_subsys(&smc_net_ops);
		if (rc)
		return rc;

		rc = smc_pnet_init();
		if (rc)
		return rc;
		@@ -2035,6 +2062,7 @@ static void __exit smc_exit(void)
		proto_unregister(&smc_proto6);
		proto_unregister(&smc_proto);
		smc_pnet_exit();
		unregister_pernet_subsys(&smc_net_ops);
		}

		module_init(smc_init);

+0 −1

Original line number	Diff line number	Diff line
		@@ -564,7 +564,6 @@ static void smc_ib_remove_dev(struct ib_device ibdev, void client_data)
		spin_lock(&smc_ib_devices.lock);
		list_del_init(&smcibdev->list); /* remove from smc_ib_devices */
		spin_unlock(&smc_ib_devices.lock);
		smc_pnet_remove_by_ibdev(smcibdev);
		smc_ib_cleanup_per_ibdev(smcibdev);
		ib_unregister_event_handler(&smcibdev->event_handler);
		kfree(smcibdev);

+2 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,8 @@ struct smc_ib_device { /* ib-device infos for smc */
		/* mac address per port*/
		u8 pnetid[SMC_MAX_PORTS][SMC_MAX_PNETID_LEN];
		/* pnetid per port */
		bool pnetid_by_user[SMC_MAX_PORTS];
		/* pnetid defined by user? */
		u8 initialized : 1; /* ib dev CQ, evthdl done */
		struct work_struct port_event_work;
		unsigned long port_event_mask;