With the split of include/linux/module.h into two parts, several files in
drivers rtlwifi and rtl8192c need to include the new file.
Signed-off-by: Larry Finger <[email protected]>
---
Paul,
At Randy Dunlap's suggestion, I am sending this to you in hopes that
I can save you some time. I think I found all the routines that will have
a problem, but as these patches do not compile, I cannot be sure.
Larry
---
Index: wireless-testing-new/drivers/net/wireless/rtlwifi/base.c
===================================================================
--- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/base.c
+++ wireless-testing-new/drivers/net/wireless/rtlwifi/base.c
@@ -30,6 +30,7 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/ip.h>
+#include <linux/export.h>
#include "wifi.h"
#include "rc.h"
#include "base.h"
Index: wireless-testing-new/drivers/net/wireless/rtlwifi/cam.c
===================================================================
--- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/cam.c
+++ wireless-testing-new/drivers/net/wireless/rtlwifi/cam.c
@@ -29,6 +29,8 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#include <linux/export.h>
+
#include "wifi.h"
#include "cam.h"
Index: wireless-testing-new/drivers/net/wireless/rtlwifi/efuse.c
===================================================================
--- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/efuse.c
+++ wireless-testing-new/drivers/net/wireless/rtlwifi/efuse.c
@@ -27,6 +27,8 @@
*
*****************************************************************************/
+#include <linux/export.h>
+
#include "wifi.h"
#include "efuse.h"
Index: wireless-testing-new/drivers/net/wireless/rtlwifi/pci.c
===================================================================
--- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/pci.c
+++ wireless-testing-new/drivers/net/wireless/rtlwifi/pci.c
@@ -27,6 +27,8 @@
*
*****************************************************************************/
+#include <linux/export.h>
+
#include "core.h"
#include "wifi.h"
#include "pci.h"
Index: wireless-testing-new/drivers/net/wireless/rtlwifi/ps.c
===================================================================
--- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/ps.c
+++ wireless-testing-new/drivers/net/wireless/rtlwifi/ps.c
@@ -27,6 +27,8 @@
*
*****************************************************************************/
+#include <linux/export.h>
+
#include "wifi.h"
#include "base.h"
#include "ps.h"
Index: wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
===================================================================
--- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
+++ wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
@@ -27,6 +27,8 @@
*
*****************************************************************************/
+#include <linux/export.h>
+
#include "dm_common.h"
#include "phy_common.h"
#include "../pci.h"
Index: wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
===================================================================
--- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
+++ wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
@@ -30,6 +30,8 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/firmware.h>
+#include <linux/export.h>
+
#include "../wifi.h"
#include "../pci.h"
#include "../base.h"
Index: wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
===================================================================
--- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
+++ wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
@@ -27,6 +27,8 @@
*
*****************************************************************************/
+#include <linux/export.h>
+
#include "../wifi.h"
#include "../rtl8192ce/reg.h"
#include "../rtl8192ce/def.h"
Index: wireless-testing-new/drivers/net/wireless/rtlwifi/usb.c
===================================================================
--- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/usb.c
+++ wireless-testing-new/drivers/net/wireless/rtlwifi/usb.c
@@ -28,6 +28,8 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/usb.h>
+#include <linux/export.h>
+
#include "core.h"
#include "wifi.h"
#include "usb.h"
On 11-09-21 06:22 PM, Larry Finger wrote:
> With the split of include/linux/module.h into two parts, several files in
> drivers rtlwifi and rtl8192c need to include the new file.
>
> Signed-off-by: Larry Finger <[email protected]>
> ---
>
> Paul,
>
> At Randy Dunlap's suggestion, I am sending this to you in hopes that
> I can save you some time. I think I found all the routines that will have
> a problem, but as these patches do not compile, I cannot be sure.
Hi Larry -- thanks for the patch, but...
>
> Larry
> ---
>
> Index: wireless-testing-new/drivers/net/wireless/rtlwifi/base.c
> ===================================================================
> --- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/base.c
> +++ wireless-testing-new/drivers/net/wireless/rtlwifi/base.c
> @@ -30,6 +30,7 @@
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> #include <linux/ip.h>
> +#include <linux/export.h>
This one needs module.h (which it has in my current tree) because it
calls module_init and module_exit. All the other ones in your patch
match what I have in tree already though, so that is a good double
check to have. There are some other ones that I found through many
randconfig builds that aren't in your patch. Here is the current list
in my tree:
~/git/module.h/linux-2.6.git$ git diff ^v3.1-rc6 HEAD drivers/net/wireless/rtlwifi |diffstat
base.c | 1 +
cam.c | 1 +
efuse.c | 1 +
pci.c | 1 +
ps.c | 1 +
rtl8192c/dm_common.c | 1 +
rtl8192c/fw_common.c | 1 +
rtl8192c/main.c | 1 +
rtl8192c/phy_common.c | 1 +
rtl8192ce/sw.c | 1 +
rtl8192cu/sw.c | 1 +
rtl8192de/sw.c | 1 +
rtl8192se/sw.c | 1 +
usb.c | 1 +
14 files changed, 14 insertions(+)
Thanks,
Paul.
> #include "wifi.h"
> #include "rc.h"
> #include "base.h"
> Index: wireless-testing-new/drivers/net/wireless/rtlwifi/cam.c
> ===================================================================
> --- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/cam.c
> +++ wireless-testing-new/drivers/net/wireless/rtlwifi/cam.c
> @@ -29,6 +29,8 @@
>
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> +#include <linux/export.h>
Have this already.
> +
> #include "wifi.h"
> #include "cam.h"
>
> Index: wireless-testing-new/drivers/net/wireless/rtlwifi/efuse.c
> ===================================================================
> --- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/efuse.c
> +++ wireless-testing-new/drivers/net/wireless/rtlwifi/efuse.c
> @@ -27,6 +27,8 @@
> *
> *****************************************************************************/
>
> +#include <linux/export.h>
> +
> #include "wifi.h"
> #include "efuse.h"
>
> Index: wireless-testing-new/drivers/net/wireless/rtlwifi/pci.c
> ===================================================================
> --- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/pci.c
> +++ wireless-testing-new/drivers/net/wireless/rtlwifi/pci.c
> @@ -27,6 +27,8 @@
> *
> *****************************************************************************/
>
> +#include <linux/export.h>
> +
> #include "core.h"
> #include "wifi.h"
> #include "pci.h"
> Index: wireless-testing-new/drivers/net/wireless/rtlwifi/ps.c
> ===================================================================
> --- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/ps.c
> +++ wireless-testing-new/drivers/net/wireless/rtlwifi/ps.c
> @@ -27,6 +27,8 @@
> *
> *****************************************************************************/
>
> +#include <linux/export.h>
> +
> #include "wifi.h"
> #include "base.h"
> #include "ps.h"
> Index: wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
> ===================================================================
> --- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
> +++ wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
> @@ -27,6 +27,8 @@
> *
> *****************************************************************************/
>
> +#include <linux/export.h>
> +
> #include "dm_common.h"
> #include "phy_common.h"
> #include "../pci.h"
> Index: wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
> ===================================================================
> --- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
> +++ wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
> @@ -30,6 +30,8 @@
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> #include <linux/firmware.h>
> +#include <linux/export.h>
> +
> #include "../wifi.h"
> #include "../pci.h"
> #include "../base.h"
> Index: wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
> ===================================================================
> --- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
> +++ wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
> @@ -27,6 +27,8 @@
> *
> *****************************************************************************/
>
> +#include <linux/export.h>
> +
> #include "../wifi.h"
> #include "../rtl8192ce/reg.h"
> #include "../rtl8192ce/def.h"
> Index: wireless-testing-new/drivers/net/wireless/rtlwifi/usb.c
> ===================================================================
> --- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/usb.c
> +++ wireless-testing-new/drivers/net/wireless/rtlwifi/usb.c
> @@ -28,6 +28,8 @@
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> #include <linux/usb.h>
> +#include <linux/export.h>
> +
> #include "core.h"
> #include "wifi.h"
> #include "usb.h"