diff options
Diffstat (limited to 'drivers/net/ethernet/mscc')
| -rw-r--r-- | drivers/net/ethernet/mscc/ocelot_ace.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/net/ethernet/mscc/ocelot_ace.c b/drivers/net/ethernet/mscc/ocelot_ace.c index afbeb837a372..34d8260b8cb8 100644 --- a/drivers/net/ethernet/mscc/ocelot_ace.c +++ b/drivers/net/ethernet/mscc/ocelot_ace.c @@ -332,10 +332,13 @@ static void is2_entry_set(struct ocelot *ocelot, int ix, { u32 val, msk, type, type_mask = 0xf, i, count; struct ocelot_ace_vlan *tag = &ace->vlan; - struct ocelot_vcap_u64 payload = { 0 }; - struct vcap_data data = { 0 }; + struct ocelot_vcap_u64 payload; + struct vcap_data data; int row = (ix / 2); + memset(&payload, 0, sizeof(payload)); + memset(&data, 0, sizeof(data)); + /* Read row */ vcap_row_cmd(ocelot, row, VCAP_CMD_READ, VCAP_SEL_ALL); vcap_cache2entry(ocelot, &data); @@ -680,10 +683,12 @@ static void ocelot_ace_rule_del(struct ocelot_acl_block *block, int ocelot_ace_rule_offload_del(struct ocelot_ace_rule *rule) { - struct ocelot_ace_rule del_ace = { 0 }; + struct ocelot_ace_rule del_ace; struct ocelot_ace_rule *ace; int i, index; + memset(&del_ace, 0, sizeof(del_ace)); + /* Gets index of the rule */ index = ocelot_ace_rule_get_index_id(acl_block, rule); @@ -740,8 +745,9 @@ static void ocelot_acl_block_destroy(struct ocelot_acl_block *block) int ocelot_ace_init(struct ocelot *ocelot) { - struct vcap_data data = { 0 }; + struct vcap_data data; + memset(&data, 0, sizeof(data)); vcap_entry2cache(ocelot, &data); ocelot_write(ocelot, vcap_is2.entry_count, S2_CORE_MV_CFG); vcap_cmd(ocelot, 0, VCAP_CMD_INITIALIZE, VCAP_SEL_ENTRY); |