rtlwifi: remove duplicate rx_packet_type definition

Move duplicate definitions from def.h of ic folder to wifi.h

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h
index 0532b98..32492d6 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h
@@ -137,13 +137,6 @@ enum version_8188e {
        VERSION_UNKNOWN = 0xFF,
 };
 
-enum rx_packet_type {
-       NORMAL_RX,
-       TX_REPORT1,
-       TX_REPORT2,
-       HIS_REPORT,
-};
-
 enum rtl819x_loopback_e {
        RTL819X_NO_LOOPBACK = 0,
        RTL819X_MAC_LOOPBACK = 1,

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/def.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/def.h
index 60f5728..9f7e7bb 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/def.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/def.h
@@ -47,14 +47,6 @@ enum version_8192e {
        VERSION_UNKNOWN = 0xFF,
 };
 
-enum rx_packet_type {
-       NORMAL_RX,
-       TX_REPORT1,
-       TX_REPORT2,
-       HIS_REPORT,
-       C2H_PACKET,
-};
-
 enum rtl_desc_qsel {
        QSLT_BK = 0x2,
        QSLT_BE = 0x0,

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/def.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/def.h
index 025ea5c..5e5403d 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/def.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/def.h
@@ -38,14 +38,6 @@
 /* Currently only for RTL8723B */
 #define EXT_VENDOR_ID                          (BIT(18) | BIT(19))
 
-enum rx_packet_type {
-       NORMAL_RX,
-       TX_REPORT1,
-       TX_REPORT2,
-       HIS_REPORT,
-       C2H_PACKET,
-};
-
 enum rtl_desc_qsel {
        QSLT_BK = 0x2,
        QSLT_BE = 0x0,

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/def.h b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/def.h
index dfbdf53..498f716 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/def.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/def.h
@@ -332,14 +332,6 @@ enum rtl_desc_qsel {
        QSLT_CMD = 0x13,
 };
 
-enum rx_packet_type {
-       NORMAL_RX,
-       TX_REPORT1,
-       TX_REPORT2,
-       HIS_REPORT,
-       C2H_PACKET,
-};
-
 struct phy_sts_cck_8821ae_t {
        u8 adc_pwdb_X[4];
        u8 sq_rpt;

diff --git a/drivers/net/wireless/realtek/rtlwifi/wifi.h b/drivers/net/wireless/realtek/rtlwifi/wifi.h
index 1259d2b..81ac036 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/wifi.h
+++ b/drivers/net/wireless/realtek/rtlwifi/wifi.h
@@ -1010,6 +1010,14 @@ enum dm_info_query {
        DM_INFO_SIZE,
 };
 
+enum rx_packet_type {
+       NORMAL_RX,
+       TX_REPORT1,
+       TX_REPORT2,
+       HIS_REPORT,
+       C2H_PACKET,
+};
+
 struct rtlwifi_tx_info {
        int sn;
        unsigned long send_time;