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.

Signed-off-by: Shannon Nelson <shannon.nelson@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/sun/Kconfig b/drivers/net/ethernet/sun/Kconfig
index a4b40e3015e57648b47740ecae7ecba1e885c4ba..b2caf5132bd2b2bd74e1895a0a80ddf25321278f 100644 (file)
--- a/drivers/net/ethernet/sun/Kconfig
+++ b/drivers/net/ethernet/sun/Kconfig
@@ -70,19 +70,23 @@ 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 191c8ade6155b20769fb07167e1d770adfb1dbdd..c71f0007ad5b6d52272fc495afdf268fa689c8bf 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);