datapath: omit _mod from module names

This renames the datapath modules:

  openvswitch_mod -> openvswitch
  brcompat_mod -> brcompat

The first makes the module name consistent with upstream, and the latter
is just for internal consistency.  This makes tools, and documentation
refer to a common module name regardless if it's coming from upstream
linux or built from datapath/ as part of a local build.

Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Jesse Gross <jesse@nicira.com>

6 files changed, 11 insertions, 11 deletions

diff --git a/datapath/brcompat_main.c b/datapath/brcompat_main.c
index d4a0acad..5d0f0bba 100644
--- a/datapath/brcompat_main.c
+++ b/datapath/brcompat_main.c
@@ -523,7 +523,7 @@ static int __init brc_init(void)
 	/* Set the bridge ioctl handler */
 	brioctl_set(brc_ioctl_deviceless_stub);
 
-	/* Set the openvswitch_mod device ioctl handler */
+	/* Set the openvswitch device ioctl handler */
 	ovs_dp_ioctl_hook = brc_dev_ioctl;
 
 	/* Randomize the initial sequence number.  This is not a security
@@ -572,7 +572,7 @@ MODULE_LICENSE("GPL");
 /*
  * In kernels 2.6.36 and later, Open vSwitch can safely coexist with
  * the Linux bridge module, but it does not make sense to load both bridge and
- * brcompat_mod, so this prevents it.
+ * brcompat, so this prevents it.
  */
 BRIDGE_MUTUAL_EXCLUSION;
 #endif
diff --git a/datapath/compat.h b/datapath/compat.h
index fd757f1a..71fa06c1 100644
--- a/datapath/compat.h
+++ b/datapath/compat.h
@@ -58,12 +58,12 @@ static inline void skb_clear_rxhash(struct sk_buff *skb)
  * exporting br_should_route_hook.  Because the bridge module also exports the
  * same symbol, the module loader will refuse to load both modules at the same
  * time (e.g. "bridge: exports duplicate symbol br_should_route_hook (owned by
- * openvswitch_mod)").
+ * openvswitch)").
  *
  * Before Linux 2.6.36, Open vSwitch cannot safely coexist with the Linux
- * bridge module, so openvswitch_mod uses this macro in those versions.  In
- * Linux 2.6.36 and later, Open vSwitch can coexist with the bridge module, but
- * it makes no sense to load both bridge and brcompat_mod, so brcompat_mod uses
+ * bridge module, so openvswitch uses this macro in those versions.  In
+ * Linux 2.6.36 and later, Open vSwitch can coexist with the bridge module,
+ * but it makes no sense to load both bridge and brcompat, so brcompat uses
  * this macro in those versions.
  *
  * The use of "typeof" here avoids the need to track changes in the type of
diff --git a/datapath/linux/Kbuild.in b/datapath/linux/Kbuild.in
index 07d106dd..d82cb002 100644
--- a/datapath/linux/Kbuild.in
+++ b/datapath/linux/Kbuild.in
@@ -24,10 +24,10 @@ EXTRA_CFLAGS += -include $(builddir)/kcompat.h
 # right place, even though it's conceptually incorrect.
 NOSTDINC_FLAGS += -I$(top_srcdir)/include -I$(srcdir)/compat -I$(srcdir)/compat/include
 
-obj-m := $(patsubst %,%_mod.o,$(build_modules))
+obj-m := $(patsubst %,%.o,$(build_modules))
 
 define module_template
-$(1)_mod-y = $$(notdir $$(patsubst %.c,%.o,$($(1)_sources)))
+$(1)-y = $$(notdir $$(patsubst %.c,%.o,$($(1)_sources)))
 endef
 
 $(foreach module,$(build_modules),$(eval $(call module_template,$(module))))
diff --git a/datapath/linux/Makefile.main.in b/datapath/linux/Makefile.main.in
index 0302fc65..b55fc957 100644
--- a/datapath/linux/Makefile.main.in
+++ b/datapath/linux/Makefile.main.in
@@ -29,7 +29,7 @@ check: all
 installcheck:
 mostlyclean:
 clean:
-	rm -f *.o *.ko *_mod.* Module.symvers *.cmd kcompat.h.new
+	rm -f *.o *.ko *.mod.* Module.symvers *.cmd kcompat.h.new
 	for d in $(build_links); do if test -h $$d; then rm $$d; fi; done
 distclean: clean
 	rm -f kcompat.h
diff --git a/datapath/linux/compat/genetlink-brcompat.c b/datapath/linux/compat/genetlink-brcompat.c
index 31108cda..ed3a4bb8 100644
--- a/datapath/linux/compat/genetlink-brcompat.c
+++ b/datapath/linux/compat/genetlink-brcompat.c
@@ -1,5 +1,5 @@
 /* We fix grp->id to 32 so that it doesn't collide with any of the multicast
- * groups selected by openvswitch_mod, which uses groups 16 through 31.
+ * groups selected by openvswitch, which uses groups 16 through 31.
  * Collision isn't fatal--multicast listeners should check that the family is
  * the one that they want and discard others--but it wastes time and memory to
  * receive unwanted messages. */
diff --git a/datapath/vport-netdev.c b/datapath/vport-netdev.c
index 12a34942..05d7696f 100644
--- a/datapath/vport-netdev.c
+++ b/datapath/vport-netdev.c
@@ -423,7 +423,7 @@ const struct vport_ops ovs_netdev_vport_ops = {
  * In kernels earlier than 2.6.36, Open vSwitch cannot safely coexist with the
  * Linux bridge module, because there is only a single bridge hook function and
  * only a single br_port member in struct net_device, so this prevents loading
- * both bridge and openvswitch_mod at the same time.
+ * both bridge and openvswitch at the same time.
  */
 BRIDGE_MUTUAL_EXCLUSION;
 #endif