Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78d55054 authored by Michal Schmidt's avatar Michal Schmidt Committed by David S. Miller
Browse files

bnx2x: do not rollback VF MAC/VLAN filters we did not configure 



On failure to configure a VF MAC/VLAN filter we should not attempt to
rollback filters that we failed to configure with -EEXIST.

Signed-off-by: default avatarMichal Schmidt <mschmidt@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 83bd9eb8

drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c

+7 −1
Original line number Diff line number Diff line
@@ -434,7 +434,9 @@ static int bnx2x_vf_mac_vlan_config(struct bnx2x *bp, 


	/* Add/Remove the filter */

	rc = bnx2x_config_vlan_mac(bp, &ramrod);

	if (rc && rc != -EEXIST) {

	if (rc == -EEXIST)

		return 0;

	if (rc) {

		BNX2X_ERR("Failed to %s %s\n",

			  filter->add ? "add" : "delete",

			  (filter->type == BNX2X_VF_FILTER_VLAN_MAC) ?
@@ -444,6 +446,8 @@ static int bnx2x_vf_mac_vlan_config(struct bnx2x *bp, 
		return rc;

	}



	filter->applied = true;



	return 0;

}
@@ -471,6 +475,8 @@ int bnx2x_vf_mac_vlan_config_list(struct bnx2x *bp, struct bnx2x_virtf *vf, 
		BNX2X_ERR("Managed only %d/%d filters - rolling back\n",

			  i, filters->count + 1);

		while (--i >= 0) {

			if (!filters->filters[i].applied)

				continue;

			filters->filters[i].add = !filters->filters[i].add;

			bnx2x_vf_mac_vlan_config(bp, vf, qid,

						 &filters->filters[i],

drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ struct bnx2x_vf_mac_vlan_filter { 
	(BNX2X_VF_FILTER_MAC | BNX2X_VF_FILTER_VLAN) /*shortcut*/



	bool add;

	bool applied;

	u8 *mac;

	u16 vid;

};