Page MenuHomeFreeBSD

Unbreak VLANs after r337943.
ClosedPublic

Authored by np on Aug 24 2018, 7:47 PM.
Tags
None
Referenced Files
F168871432: D16887.diff
Sun, Aug 30, 1:22 PM
F168827122: D16887.id.diff
Sun, Aug 30, 8:26 AM
Unknown Object (File)
Sat, Aug 29, 5:33 AM
Unknown Object (File)
Sat, Aug 29, 12:46 AM
Unknown Object (File)
Sat, Aug 29, 12:45 AM
Unknown Object (File)
Sat, Aug 29, 12:44 AM
Unknown Object (File)
Fri, Aug 28, 1:21 PM
Unknown Object (File)
Wed, Aug 26, 4:30 PM
Subscribers

Details

Reviewers
mmacy
kib
Group Reviewers
network
Commits
rS338305: Unbreak VLANs after r337943.
Summary

ether_set_pcp should not be called from ether_output_frame for VLAN
interfaces -- the vid + pcp will be inserted during vlan_transmit in
that case. r337943 sets the VLAN's ifnet's if_pcp to a proper PCP value
and this led to double encapsulation (once with vid 0 and second time
with vid+pcp).

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

This revision is now accepted and ready to land.Aug 24 2018, 8:02 PM
melifaro added inline comments.
sys/net/if_ethersubr.c
464 ↗(On Diff #47258)

Why do we check this in the dataplane part, instead of control plane?

sys/net/if_ethersubr.c
464 ↗(On Diff #47258)

The tag needs to be inserted in the data path, and needs to work for both vid+pcp (ie if_vlan)
and only-pcp case ("real" ifnet). What kind of control plane check did you have in mind? I don't
see a way to avoid data plane changes.

I think kib@ wrote this (or at least worked on it last) and he may have additional insight.

This revision was automatically updated to reflect the committed changes.