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

openwrt-23.05: batman-adv: compat: Fix skb_vlan_eth_hdr conflict in stable kernels #1039

Merged
merged 1 commit into from
Dec 23, 2023

Conversation

ecsv
Copy link
Contributor

@ecsv ecsv commented Dec 23, 2023

Maintainer: @simonwunderlich
Compile tested: ramips / mipsel_24kc (mt76x8)
Run tested: -

Description:

The newest Linux stable kernel releases:

  • v5.10.205
  • v5.15.144
  • v6.1.69

received a backported version of commit 1f5020acb33f ("net: vlan: introduce skb_vlan_eth_hdr()"). batman-adv must therefore not provide this function any longer for these kernel versions.

Closes: #1036

The newest Linux stable kernel releases:

* v5.10.205
* v5.15.144
* v6.1.69

received a backported version of commit 1f5020acb33f ("net: vlan: introduce
skb_vlan_eth_hdr()"). batman-adv must therefore not provide this function
any longer for these kernel versions.

Signed-off-by: Sven Eckelmann <[email protected]>
@simonwunderlich simonwunderlich merged commit 2a3bad8 into openwrt:openwrt-23.05 Dec 23, 2023
11 checks passed
@herbetom
Copy link

From what i can tell is openwrt-23.05 still on 5.15.139:

https://github.com/openwrt/openwrt/blob/59fd8f08cf544a7f0fcaf700ca9af9292de3adcc/include/kernel-5.15

And the commit as mentioned in the PR description only backported since v5.15.144.

https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/include/linux/if_vlan.h?h=v5.15.144&id=3c4dcfbff15bae6a4da8ef5682d94e849612b47c

But I don't want to rule out the possibility that I'm missing something.

@ecsv
Copy link
Contributor Author

ecsv commented Dec 26, 2023

From what i can tell is openwrt-23.05 still on 5.15.139:

https://github.com/openwrt/openwrt/blob/59fd8f08cf544a7f0fcaf700ca9af9292de3adcc/include/kernel-5.15

And the commit as mentioned in the PR description only backported since v5.15.144.

https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/include/linux/if_vlan.h?h=v5.15.144&id=3c4dcfbff15bae6a4da8ef5682d94e849612b47c

But I don't want to rule out the possibility that I'm missing something.

What are you trying to tell us with this information? Do you assume that openwrt-23.05.x will always stay on a kernel < v5.15.144 and that we should there now remove this modification again? And even if OpenWrt is really neglecting 23.05.x, don't you think that at least some downstream projects should (and will) update to a newer v5.15.x bugfix release?

Or did you find a bug because of this change and we should therefore remove it again?

Or?

@herbetom
Copy link

sorry, while trying to figure out if this change is relevant i mixed up the change here and the upstream change as i didn't look closely enough what the actual change beeing made here was and assumed something. So everyhing should be fine.

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.

3 participants