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

Fix for the case where kernel doesn't have CONFIG_BRIDGE_VLAN_FILTERING #434

Merged
merged 1 commit into from
Jan 15, 2020
Merged

Conversation

carlosedp
Copy link
Contributor

@carlosedp carlosedp commented Jan 9, 2020

If the Linux kernel is not built with the parameter CONFIG_BRIDGE_VLAN_FILTERING, passing vlanFiltering in the Bridge struct returns an error creating the bridge interface. This happens even when no parameter is set on Vlan in the CNI config.

This change fixes the case where no Vlan parameter is configured on CNI config file so the flag doesn't need to be included in the struct.

Addresses problems related in issue #370 seen on the Raspberry Pi kernel.

Cc. @alexellis

Copy link
Member

@mars1024 mars1024 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

If the Linux kernel is not built with the parameter
CONFIG_BRIDGE_VLAN_FILTERING, passing vlanFiltering in
the Bridge struct returns an error creating the bridge interface.
This happens even when no parameter is set on Vlan in the CNI config.

This change fixes the case where no Vlan parameter is configured on
CNI config file so the flag doesn't need to be included in the struct.

Signed-off-by: Carlos de Paula <[email protected]>
@alexellis
Copy link

The forced push was to update the commit message. Thank you for looking at this quickly for us.

@bboreham
Copy link
Contributor

This change fixes the case where no Vlan parameter is configured on CNI config file

Nitpick: also if Vlan is configured as 0. Which is fine AFAIK, I just like to be precise.

@bboreham bboreham merged commit 0edf8a4 into containernetworking:master Jan 15, 2020
@alexellis
Copy link

alexellis commented Jan 15, 2020

Thanks @bboreham

What needs to happen to get a patch release made up with binaries? We can keep maintaining a fork, but it would be nice to switch over to upstream again as soon as we can.

@jellonek
Copy link
Member

We plan to do release "quickly" but I can not guarantee if that will be in a week or two.

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.

5 participants