Skip to content

Update STMMAC VLAN Filtering #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mcarlin-ds merged 3 commits into from
Sep 13, 2024
Merged

Update STMMAC VLAN Filtering #12

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16bf222
Only allow one native vlan. Add some debugging output.
mcarlin-ds Sep 12, 2024
1995131
Add some additional debug output.
mcarlin-ds Sep 12, 2024
7804b21
Remove debugging messages, add an info message for HW VLAN filter.
mcarlin-ds Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6297,9 +6297,13 @@ static int stmmac_vlan_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vid
}

if (priv->hw->num_vlan) {
ret = stmmac_add_hw_vlan_rx_fltr(priv, ndev, priv->hw, proto, vid);
if (ret)
if(priv->hw->vlan_filter[0] & GENMASK(15, 0)) {
goto err_pm_put;
}
else {
stmmac_add_hw_vlan_rx_fltr(priv, ndev, priv->hw, proto, vid);
netdev_info(ndev, "HW VLAN Filter Set To %d\n", vid);
}
}
err_pm_put:
pm_runtime_put(priv->device);
Expand Down