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

Missing one commit for BASE-BX media type #243

Open
toreamun opened this issue Feb 22, 2025 · 6 comments
Open

Missing one commit for BASE-BX media type #243

toreamun opened this issue Feb 22, 2025 · 6 comments
Labels
support Community support

Comments

@toreamun
Copy link

Media types 100BASE-BX and 1000BASE-BX has been added to FreeBSD in a series of commits (freebsd/freebsd-src@78c63ed, freebsd/freebsd-src@d82c3e8 and freebsd/freebsd-src@7835a4a) that are related to each other. Only the last two of those three commits have been added to Opnsense in 6e76039, and parts of the content for 1000BASE-BX is now missing.

Please add the missing commit freebsd/freebsd-src@78c63ed to have 1000BASE-BX media type fully added. This media type will be required by this ixgbe patch: freebsd/freebsd-src@89d4096

@fichtner
Copy link
Member

fichtner commented Feb 22, 2025

@toreamun I'm doubting the process a bit. The stable/14 FreeBSD cherry-pick was two commits in one: 6e76039 but apparently it's all three?

edit: corrected hash for our stable/25.1

@fichtner fichtner added the support Community support label Feb 22, 2025
@toreamun
Copy link
Author

@fichtner Commit freebsd/freebsd-src@d82c3e8 changes the value of IFM_1000_BX from IFM_X(120) to IFM_X(121). IFM_1000_BX was added by commit freebsd/freebsd-src@78c63ed, and that commit has not been cherry-picked, so the rest of the commit is missing.

@toreamun toreamun changed the title Missing one commit for BASE-BX media type typort Missing one commit for BASE-BX media type Feb 22, 2025
@fichtner
Copy link
Member

ok... FreeBSD stable/14:

% git grep IFM_1000_BX
sys/dev/ixgbe/if_ix.c:          ifmedia_add(sc->media, IFM_ETHER | IFM_1000_BX, 0, NULL);
sys/dev/ixgbe/if_ix.c:  case IFM_1000_BX:
sys/net/if_media.h:#define      IFM_1000_BX     IFM_X(121)      /* 1000Base-BX */

OPNsense stable/25.1:

% git grep IFM_1000_BX    
sys/net/if_media.h:#define      IFM_1000_BX     IFM_X(121)      /* 1000Base-BX */

This looks like exactly the state that I would it expect to be minus the newer ixgbe changes...

@toreamun
Copy link
Author

IFM_1000_BX is correct, but other related code is missing. No IFM_* additions should be done without also changing ieee8023ad_lacp.c, ref this comment. In addition IFM_SUBTYPE_ETHERNET_DESCRIPTIONS and IFM_BAUDRATE_DESCRIPTIONS should be updated.

You find all these missing related changes mentioned above in this commit: freebsd/freebsd-src@78c63ed

@fichtner
Copy link
Member

I think you are barking up the wrong source tree to be honest... I'm following stable/14 and stable/14 is what it is.

@toreamun
Copy link
Author

Thanks. You are correct.

The problem is in Freebsd.

Sorry.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
support Community support
Development

No branches or pull requests

2 participants