Merge "[qca-ssdk]:remove MODULE_AUTHOR"
diff --git a/include/fal/fal_misc.h b/include/fal/fal_misc.h
index 914f897..c741865 100755
--- a/include/fal/fal_misc.h
+++ b/include/fal/fal_misc.h
@@ -102,6 +102,9 @@
fal_cpu_port_status_set(a_uint32_t dev_id, a_bool_t enable);
+sw_error_t
+fal_pppoe_status_set(a_uint32_t dev_id, a_bool_t enable);
+
#ifndef IN_MISC_MINI
sw_error_t
fal_cpu_port_status_get(a_uint32_t dev_id, a_bool_t * enable);
@@ -129,11 +132,6 @@
sw_error_t
- fal_pppoe_status_set(a_uint32_t dev_id, a_bool_t enable);
-
-
-
- sw_error_t
fal_pppoe_status_get(a_uint32_t dev_id, a_bool_t * enable);
diff --git a/src/fal/fal_misc.c b/src/fal/fal_misc.c
index 20f31fa..0725510 100755
--- a/src/fal/fal_misc.c
+++ b/src/fal/fal_misc.c
@@ -166,6 +166,21 @@
return rv;
}
+static sw_error_t
+_fal_pppoe_status_set(a_uint32_t dev_id, a_bool_t enable)
+{
+ sw_error_t rv;
+ hsl_api_t *p_api;
+
+ SW_RTN_ON_NULL(p_api = hsl_api_ptr_get(dev_id));
+
+ if (NULL == p_api->pppoe_status_set)
+ return SW_NOT_SUPPORTED;
+
+ rv = p_api->pppoe_status_set(dev_id, enable);
+ return rv;
+}
+
#ifndef IN_MISC_MINI
static sw_error_t
_fal_port_unk_sa_cmd_get(a_uint32_t dev_id, fal_port_t port_id,
@@ -313,22 +328,6 @@
return rv;
}
-
-static sw_error_t
-_fal_pppoe_status_set(a_uint32_t dev_id, a_bool_t enable)
-{
- sw_error_t rv;
- hsl_api_t *p_api;
-
- SW_RTN_ON_NULL(p_api = hsl_api_ptr_get(dev_id));
-
- if (NULL == p_api->pppoe_status_set)
- return SW_NOT_SUPPORTED;
-
- rv = p_api->pppoe_status_set(dev_id, enable);
- return rv;
-}
-
static sw_error_t
_fal_pppoe_status_get(a_uint32_t dev_id, a_bool_t * enable)
{
@@ -1188,6 +1187,25 @@
return rv;
}
+/**
+ * @brief Set pppoe packets hardware acknowledgement status on particular device.
+ * @details comments:
+ * Particular device may only support parts of pppoe packets.
+ * @param[in] dev_id device id
+ * @param[in] enable A_TRUE or A_FALSE
+ * @return SW_OK or error code
+ */
+sw_error_t
+fal_pppoe_status_set(a_uint32_t dev_id, a_bool_t enable)
+{
+ sw_error_t rv;
+
+ FAL_API_LOCK;
+ rv = _fal_pppoe_status_set(dev_id, enable);
+ FAL_API_UNLOCK;
+ return rv;
+}
+
#ifndef IN_MISC_MINI
/**
* @brief Get forwarding command for packets which source address is unknown on a particular port.
@@ -1359,25 +1377,6 @@
}
/**
- * @brief Set pppoe packets hardware acknowledgement status on particular device.
- * @details comments:
- * Particular device may only support parts of pppoe packets.
- * @param[in] dev_id device id
- * @param[in] enable A_TRUE or A_FALSE
- * @return SW_OK or error code
- */
-sw_error_t
-fal_pppoe_status_set(a_uint32_t dev_id, a_bool_t enable)
-{
- sw_error_t rv;
-
- FAL_API_LOCK;
- rv = _fal_pppoe_status_set(dev_id, enable);
- FAL_API_UNLOCK;
- return rv;
-}
-
-/**
* @brief Get pppoe packets hardware acknowledgement status on a particular device.
* @param[in] dev_id device id
* @param[out] enable A_TRUE or A_FALSE
diff --git a/src/hsl/dess/dess_reg_access.c b/src/hsl/dess/dess_reg_access.c
index 8233327..34fa72d 100755
--- a/src/hsl/dess/dess_reg_access.c
+++ b/src/hsl/dess/dess_reg_access.c
@@ -623,8 +623,10 @@
p_api->reg_set = dess_reg_set;
p_api->reg_field_get = dess_reg_field_get;
p_api->reg_field_set = dess_reg_field_set;
+ #ifdef IN_INTERFACECONTROL
p_api->psgmii_reg_get = dess_psgmii_reg_get;
p_api->psgmii_reg_set = dess_psgmii_reg_set;
+ #endif
p_api->register_dump = dess_regsiter_dump;
p_api->debug_register_dump = dess_debug_regsiter_dump;
p_api->debug_psgmii_self_test = dess_debug_psgmii_self_test;
diff --git a/src/hsl/isisc/isisc_fdb.c b/src/hsl/isisc/isisc_fdb.c
index 0dd8c54..82155da 100755
--- a/src/hsl/isisc/isisc_fdb.c
+++ b/src/hsl/isisc/isisc_fdb.c
@@ -25,6 +25,7 @@
#include "isisc_reg.h"
#include "isisc_fdb_prv.h"
+#ifndef IN_FDB_MINI
static sw_error_t
_isisc_wl_feature_check(a_uint32_t dev_id)
{
@@ -44,6 +45,7 @@
return SW_NOT_SUPPORTED;
}
}
+#endif
static a_bool_t
_isisc_fdb_is_zeroaddr(fal_mac_addr_t addr)
@@ -75,6 +77,7 @@
return;
}
+#ifndef IN_FDB_MINI
static sw_error_t
_isisc_atu_sw_to_hw(a_uint32_t dev_id, const fal_fdb_entry_t * entry,
a_uint32_t reg[])
@@ -195,6 +198,7 @@
_isisc_fdb_fill_addr(entry->addr, ®[0], ®[1]);
return SW_OK;
}
+#endif
static void
_isisc_atu_hw_to_sw(const a_uint32_t reg[], fal_fdb_entry_t * entry)
@@ -541,6 +545,7 @@
return SW_OK;
}
+#ifndef IN_FDB_MINI
static sw_error_t
_isisc_fdb_add(a_uint32_t dev_id, const fal_fdb_entry_t * entry)
{
@@ -558,6 +563,7 @@
rv = _isisc_fdb_commit(dev_id, ARL_LOAD_ENTRY);
return rv;
}
+#endif
static sw_error_t
_isisc_fdb_del_all(a_uint32_t dev_id, a_uint32_t flag)
diff --git a/src/hsl/isisc/isisc_misc.c b/src/hsl/isisc/isisc_misc.c
index 46ed16d..7b5c0fd 100755
--- a/src/hsl/isisc/isisc_misc.c
+++ b/src/hsl/isisc/isisc_misc.c
@@ -90,6 +90,7 @@
return rv;
}
+#ifndef IN_MISC_MINI
static sw_error_t
_isisc_port_misc_property_get(a_uint32_t dev_id, fal_port_t port_id,
a_bool_t * enable, a_uint32_t item)
@@ -132,6 +133,7 @@
return SW_OK;
}
+#endif
static sw_error_t
_isisc_frame_max_size_set(a_uint32_t dev_id, a_uint32_t size)
diff --git a/src/hsl/isisc/isisc_qos.c b/src/hsl/isisc/isisc_qos.c
index 310a847..16b0854 100755
--- a/src/hsl/isisc/isisc_qos.c
+++ b/src/hsl/isisc/isisc_qos.c
@@ -441,6 +441,7 @@
return rv;
}
+#ifndef IN_QOS_MINI
static sw_error_t
_isisc_qos_port_mode_get(a_uint32_t dev_id, fal_port_t port_id,
fal_qos_mode_t mode, a_bool_t * enable)
@@ -487,7 +488,7 @@
return SW_OK;
}
-#ifndef IN_QOS_MINI
+
static sw_error_t
_isisc_qos_port_mode_pri_set(a_uint32_t dev_id, fal_port_t port_id,
fal_qos_mode_t mode, a_uint32_t pri)
diff --git a/src/init/ssdk_init.c b/src/init/ssdk_init.c
index 04eac00..0645622 100755
--- a/src/init/ssdk_init.c
+++ b/src/init/ssdk_init.c
@@ -1296,6 +1296,7 @@
struct qca_phy_priv *qca_phy_priv_global;
+#ifdef DESS
static int ssdk_switch_register(void)
{
struct switch_dev *sw_dev;
@@ -1377,6 +1378,7 @@
kfree(qca_phy_priv_global);
return 0;
}
+#endif
static int
qca_phy_read_status(struct phy_device *pdev)
@@ -2601,6 +2603,7 @@
return rv;
}
+#ifdef DESS
static int ssdk_flow_default_act_init(void)
{
a_uint32_t vrf_id = 0;
@@ -2643,6 +2646,8 @@
}
return 0;
}
+#endif
+
#ifdef DESS
static int ssdk_dess_led_init(ssdk_init_cfg *cfg)
{
@@ -3087,6 +3092,7 @@
}
+#ifdef DESS
static int ssdk_inet_event(struct notifier_block *this, unsigned long event, void *ptr)
{
struct net_device *dev = ((struct in_ifaddr *)ptr)->ifa_dev->dev;
@@ -3105,6 +3111,7 @@
return NOTIFY_DONE;
}
#endif
+#endif
//#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
static int ssdk_dev_event(struct notifier_block *this, unsigned long event, void *ptr)
@@ -3144,7 +3151,9 @@
ssdk_init_cfg cfg;
int rv = 0;
garuda_init_spec_cfg chip_spec_cfg;
+ #ifdef DESS
a_uint32_t psgmii_result = 0;
+ #endif
ssdk_dt_global.switch_reg_access_mode = HSL_REG_MDIO;
ssdk_dt_global.psgmii_reg_access_mode = HSL_REG_MDIO;
diff --git a/src/ref/ref_uci.c b/src/ref/ref_uci.c
old mode 100644
new mode 100755
index 474ea99..fd7cec7
--- a/src/ref/ref_uci.c
+++ b/src/ref/ref_uci.c
@@ -79,11 +79,13 @@
char whole_command_line[COMMAND_LINE_MAX_LEN] = {0};
char *val_ptr[SWITCH_CFG_LEN_MAX] = {0};
static unsigned int parameter_length = 0;
+#ifdef IN_NAT
static char *vrf_dflt_str = "0";
static char *lb_dflt_str = "0";
static char *cookie_dflt_str = "0";
static char *priority_dflt_str = "no";
static char *param_dflt_str = " ";
+#endif
#ifdef IN_QOS
#ifndef IN_QOS_MINI