rename hostap.c to hostap_main.c

I wanted to remove the #include "hostap_ioctl.c" from hostap.c and build hostap_ioctl.c separately, but this doesn't work since hostap.c has the same name as the module.

After renaming hostap.c this will be possible.

---

 drivers/net/wireless/hostap/Makefile      |   10 
 drivers/net/wireless/hostap/hostap.c      | 1192 ----------------------
 drivers/net/wireless/hostap/hostap_main.c | 1192 ++++++++++++++++++++++
 3 files changed, 1198 insertions(+), 1196 deletions(-)

@@ -1,5 +1,7 @@
-obj-$(CONFIG_HOSTAP) += hostap.o
+hostap-y			:= hostap_main.o
 
-obj-$(CONFIG_HOSTAP_CS) += hostap_cs.o
-obj-$(CONFIG_HOSTAP_PLX) += hostap_plx.o
-obj-$(CONFIG_HOSTAP_PCI) += hostap_pci.o
+obj-$(CONFIG_HOSTAP)		+= hostap.o
+
+obj-$(CONFIG_HOSTAP_CS)		+= hostap_cs.o
+obj-$(CONFIG_HOSTAP_PLX)	+= hostap_plx.o
+obj-$(CONFIG_HOSTAP_PCI)	+= hostap_pci.o

Is this patch changing anything in hostap.c or is it just a rename of the file? Patch file is not exactly ideal for this kind of changes and I hope git has a better way of storing this kind of rename.

I would rather not rename the file, but if this is the only way of getting the module built in pieces, I'm okay with the change (assuming nothing else changed in hostap.c in this changeset).

Jouni Malinen                                            PGP id EFC895FA

There's no other change.

If you agree, Jeff might be able to do the

  mv drivers/net/wireless/hostap/hostap.c \
    drivers/net/wireless/hostap/hostap_main.c

plus applying the patch below.

AFAIK you can't build a module hostap.o consisting of multiple objects with the source files of one of them named hostap.c (Sam Cc'ed for this).

cu
Adrian

<-- snip -->

I wanted to remove the #include "hostap_ioctl.c" from hostap.c and build hostap_ioctl.c separately, but this doesn't work since hostap.c has the same name as the module.

After renaming hostap.c this will be possible.

@@ -1,3 +1,4 @@
+hostap-y := hostap_main.o
 obj-$(CONFIG_HOSTAP) += hostap.o
 
 obj-$(CONFIG_HOSTAP_CS) += hostap_cs.o

OK, I'm okay with that change.

Jouni Malinen                                            PGP id EFC895FA

Correct.

Sam