Skip to content
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.

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

Vlan fix #11

Merged
merged 2 commits into from
Nov 2, 2013
Merged

Vlan fix #11

merged 2 commits into from
Nov 2, 2013

Conversation

reitblatt
Copy link
Collaborator

Splits rules that pop_vlan and don't match on VLAN into two rules: one that matches on vlan_any and pops, and one that matches on vlan_none and doesn't pop. Uses VLAN_VID = -1 to encode "vlan_any" to 0x04 backend.

@ghost ghost assigned jnfoster Oct 29, 2013
@arjunguha
Copy link
Member

Is this something to be merged in? @jnfoster is apparently assigned.

@arjunguha
Copy link
Member

I lightly read this commit. It looks legit. I approve the merge. Anyone else want to hit the green button?

@reitblatt
Copy link
Collaborator Author

Yes. We nominally started assigning people to pull reqs, and Nate and I spoke about this fix last week. Feel free to merge it in yourself.

@arjunguha arjunguha merged commit 01caef3 into master Nov 2, 2013
@arjunguha arjunguha deleted the vlan_fix branch November 2, 2013 18:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants