staging: r8188eu: Fix build error with random configuration
authorLarry Finger <Larry.Finger@lwfinger.net>
Tue, 27 Aug 2013 22:12:36 +0000 (17:12 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 Aug 2013 00:00:46 +0000 (17:00 -0700)
The kbuild test robot reports the following error:

tree:   git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git master
head:   e4a745f9519ef2bbb9d75212ae1cca7582d76266
commit: b63c05394f3fe9ae547e1fa9df30f1ba0bcdabb4 [7011/7939] staging: r8188eu: Turn on build of new driver
config: x86_64-randconfig-x0-0828 (attached as .config)

All error/warnings:

   drivers/staging/rtl8188eu/core/rtw_p2p.c: In function 'go_add_group_info_attr':
>> drivers/staging/rtl8188eu/core/rtw_p2p.c:70:11: error: 'struct sta_info' has no member named 'is_p2p_device'
      if (psta->is_p2p_device) {

This and the following errors were caused by an incorrect nesting of
conditional compilation directives.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8188eu/include/sta_info.h

index acc632ae5ae0d4ba6613627867c55d969be38516..3ed2a39741adb0c83a61c6a6244847b664e8c6ee 100644 (file)
@@ -180,6 +180,7 @@ struct sta_info {
 
        u8 has_legacy_ac;
        unsigned int sleepq_ac_len;
+#endif /*  CONFIG_88EU_AP_MODE */
 
 #ifdef CONFIG_88EU_P2P
        /* p2p priv data */
@@ -198,7 +199,6 @@ struct sta_info {
 #endif /* CONFIG_88EU_P2P */
        u8 under_exist_checking;
        u8 keep_alive_trycnt;
-#endif /*  CONFIG_88EU_AP_MODE */
 
        /* for DM */
        struct rssi_sta rssi_stat;