sunvnet: make sunvnet common code dynamically loadable

When the sunvnet_common code was split out for use by both sunvnet
and the newer ldmvsw, it was made into a static kernel library, which
limits the usefulness of sunvnet and ldmvsw as loadables, since most
of the real work is being done in the shared code.  Also, this is
simply dead code in kernels that aren't running the LDoms.

This patch makes the sunvnet_common into a dynamically loadable
module and makes sunvnet and ldmvsw dependent on sunvnet_common.

Orabug: 23293104

Signed-off-by: Shannon Nelson <shannon.nelson@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 2493b842f258e14938f278e44ecc26970dfabbf0)
Signed-off-by: Allen Pais <allen.pais@oracle.com>

diff --git a/drivers/net/ethernet/sun/Kconfig b/drivers/net/ethernet/sun/Kconfig
index b499c57db87342ef1e556adfd04be81114bfa723..4f0352e5f424a8cc31d4d7f2d81aebe5ca8f55fb 100644 (file)
--- a/drivers/net/ethernet/sun/Kconfig
+++ b/drivers/net/ethernet/sun/Kconfig
@@ -72,20 +72,24 @@ config CASSINI
          <http://docs.oracle.com/cd/E19113-01/giga.ether.pci/817-4341-10/817-4341-10.pdf>.
 
 config SUNVNET_COMMON
-       bool
+       tristate "Common routines to support Sun Virtual Networking"
        depends on SUN_LDOMS
-       default y if SUN_LDOMS
+       default m
 
 
 config SUNVNET
        tristate "Sun Virtual Network support"
+       default m
        depends on SUN_LDOMS
+       depends on SUNVNET_COMMON
        ---help---
          Support for virtual network devices under Sun Logical Domains.
 
 config LDMVSW
        tristate "Sun4v LDoms Virtual Switch support"
+       default m
        depends on SUN_LDOMS
+       depends on SUNVNET_COMMON
        ---help---
          Support for virtual switch devices under Sun4v Logical Domains.
          This driver adds a network interface for every vsw-port node

diff --git a/drivers/net/ethernet/sun/sunvnet_common.c b/drivers/net/ethernet/sun/sunvnet_common.c
index bceaf2851b76e0b76adbcc60e5571118b691b784..fd2170150ba1242dda3f968dc16235b7afc94365 100644 (file)
--- a/drivers/net/ethernet/sun/sunvnet_common.c
+++ b/drivers/net/ethernet/sun/sunvnet_common.c
@@ -37,6 +37,11 @@
  */
 #define        VNET_MAX_RETRIES        10
 
+MODULE_AUTHOR("David S. Miller (davem@davemloft.net)");
+MODULE_DESCRIPTION("Sun LDOM virtual network support library");
+MODULE_LICENSE("GPL");
+MODULE_VERSION("1.1");
+
 static int __vnet_tx_trigger(struct vnet_port *port, u32 start);
 static void vnet_port_reset(struct vnet_port *port);