diff options
Diffstat (limited to 'drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c')
| -rw-r--r-- | drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c index 90dbda792614..403ea9db6dbd 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | |||
| @@ -1519,6 +1519,7 @@ static void hns_dsaf_set_mac_key( | |||
| 1519 | mac_key->high.bits.mac_3 = addr[3]; | 1519 | mac_key->high.bits.mac_3 = addr[3]; |
| 1520 | mac_key->low.bits.mac_4 = addr[4]; | 1520 | mac_key->low.bits.mac_4 = addr[4]; |
| 1521 | mac_key->low.bits.mac_5 = addr[5]; | 1521 | mac_key->low.bits.mac_5 = addr[5]; |
| 1522 | mac_key->low.bits.port_vlan = 0; | ||
| 1522 | dsaf_set_field(mac_key->low.bits.port_vlan, DSAF_TBL_TCAM_KEY_VLAN_M, | 1523 | dsaf_set_field(mac_key->low.bits.port_vlan, DSAF_TBL_TCAM_KEY_VLAN_M, |
| 1523 | DSAF_TBL_TCAM_KEY_VLAN_S, vlan_id); | 1524 | DSAF_TBL_TCAM_KEY_VLAN_S, vlan_id); |
| 1524 | dsaf_set_field(mac_key->low.bits.port_vlan, DSAF_TBL_TCAM_KEY_PORT_M, | 1525 | dsaf_set_field(mac_key->low.bits.port_vlan, DSAF_TBL_TCAM_KEY_PORT_M, |
| @@ -2924,10 +2925,11 @@ void hns_dsaf_set_promisc_tcam(struct dsaf_device *dsaf_dev, | |||
| 2924 | /* find the tcam entry index for promisc */ | 2925 | /* find the tcam entry index for promisc */ |
| 2925 | entry_index = dsaf_promisc_tcam_entry(port); | 2926 | entry_index = dsaf_promisc_tcam_entry(port); |
| 2926 | 2927 | ||
| 2928 | memset(&tbl_tcam_data, 0, sizeof(tbl_tcam_data)); | ||
| 2929 | memset(&tbl_tcam_mask, 0, sizeof(tbl_tcam_mask)); | ||
| 2930 | |||
| 2927 | /* config key mask */ | 2931 | /* config key mask */ |
| 2928 | if (enable) { | 2932 | if (enable) { |
| 2929 | memset(&tbl_tcam_data, 0, sizeof(tbl_tcam_data)); | ||
| 2930 | memset(&tbl_tcam_mask, 0, sizeof(tbl_tcam_mask)); | ||
| 2931 | dsaf_set_field(tbl_tcam_data.low.bits.port_vlan, | 2933 | dsaf_set_field(tbl_tcam_data.low.bits.port_vlan, |
| 2932 | DSAF_TBL_TCAM_KEY_PORT_M, | 2934 | DSAF_TBL_TCAM_KEY_PORT_M, |
| 2933 | DSAF_TBL_TCAM_KEY_PORT_S, port); | 2935 | DSAF_TBL_TCAM_KEY_PORT_S, port); |
