michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: dsa: ksz8794: Use CONFIG_DSA_KSZ_TAIL_TAGGING in preprocessor macros

Browse source 
The name of macro to enable tail tagging support in DSA KSZ driver is
CONFIG_DSA_KSZ_TAIL_TAGGING, not DSA_KSZ_TAIL_TAGGING.

Signed-off-by: Lukasz Majewski <lukma@denx.de>
This commit is contained in:
Lukasz Majewski 2021-11-10 15:05:46 +01:00 • committed by Maureen Helm
commit ab1f0b55d5
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/ethernet/dsa_ksz8xxx.c
View file

@ -320,7 +320,7 @@ static int dsa_ksz8xxx_switch_setup(struct ksz8xxx_data *pdev)
dsa_ksz8xxx_write_reg(pdev, KSZ8794_CTRL2_PORTn(i), tmp); dsa_ksz8xxx_write_reg(pdev, KSZ8794_CTRL2_PORTn(i), tmp);
} }
#if defined(DSA_KSZ_TAIL_TAGGING) #if defined(CONFIG_DSA_KSZ_TAIL_TAGGING)
/* Enable tail tag feature */ /* Enable tail tag feature */
dsa_ksz8xxx_read_reg(pdev, KSZ8794_GLOBAL_CTRL10, &tmp); dsa_ksz8xxx_read_reg(pdev, KSZ8794_GLOBAL_CTRL10, &tmp);
tmp |= KSZ8794_GLOBAL_CTRL10_TAIL_TAG_EN; tmp |= KSZ8794_GLOBAL_CTRL10_TAIL_TAG_EN;
@ -854,7 +854,7 @@ static int dsa_ksz8xxx_get_mac_table_entry(const struct device *dev,
return 0; return 0;
} }
#if defined(DSA_KSZ_TAIL_TAGGING) #if defined(CONFIG_DSA_KSZ_TAIL_TAGGING)
#define DSA_KSZ8795_TAIL_TAG_OVRD BIT(6) #define DSA_KSZ8795_TAIL_TAG_OVRD BIT(6)
#define DSA_KSZ8795_TAIL_TAG_LOOKUP BIT(7) #define DSA_KSZ8795_TAIL_TAG_LOOKUP BIT(7)
@ -1066,7 +1066,7 @@ static struct dsa_api dsa_api_f = {
.switch_write = dsa_ksz8xxx_sw_write_reg, .switch_write = dsa_ksz8xxx_sw_write_reg,
.switch_set_mac_table_entry = dsa_ksz8xxx_set_mac_table_entry, .switch_set_mac_table_entry = dsa_ksz8xxx_set_mac_table_entry,
.switch_get_mac_table_entry = dsa_ksz8xxx_get_mac_table_entry, .switch_get_mac_table_entry = dsa_ksz8xxx_get_mac_table_entry,
#if defined(DSA_KSZ_TAIL_TAGGING) #if defined(CONFIG_DSA_KSZ_TAIL_TAGGING)
.dsa_xmit_pkt = dsa_ksz8xxx_xmit_pkt, .dsa_xmit_pkt = dsa_ksz8xxx_xmit_pkt,
.dsa_get_iface = dsa_ksz8xxx_get_iface, .dsa_get_iface = dsa_ksz8xxx_get_iface,
#endif #endif

2
include/net/dsa.h
View file

@ -28,7 +28,7 @@
* Size of the DSA TAG: * Size of the DSA TAG:
* - KSZ8794 - 1 byte * - KSZ8794 - 1 byte
*/ */
#if defined(CONFIG_DSA_KSZ8794) && defined(DSA_KSZ_TAIL_TAGGING) #if defined(CONFIG_DSA_KSZ8794) && defined(CONFIG_DSA_KSZ_TAIL_TAGGING)
#define DSA_TAG_SIZE 1 #define DSA_TAG_SIZE 1
#else #else
#define DSA_TAG_SIZE 0 #define DSA_TAG_SIZE 0