| Message ID | 059524e2-59a8-eca0-0261-29fd7f8ba603@powerneth.ro |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | ramips: mt7621: HW-NAT typo fix | expand |
On Fri, Apr 16, 2021 at 03:44:06PM +0300, Lucian Cristian wrote: > This fixes Hardware Offload on MT7621 I have already applied the fix for it in pending-5.10: https://git.openwrt.org/?p=openwrt/openwrt.git;a=commit;h=7f703716ae0e4cb4810eff37605b7594cef1edb8 For the future, and to still give you review: You shouldn't modify patches in backport-* as they represent commits in linux.git and for sake of maintainability it's good to keep them exactly as present in linux.git history so we can easily spot and remove them once they trickly down into linux-stable). Cheers Daniel > > Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com> > diff --git a/target/linux/generic/backport-5.10/610-v5.13-33-net-ethernet-mtk_eth_soc-add-flow-offloading-support.patch b/target/linux/generic/backport-5.10/610-v5.13-33-net-ethernet-mtk_eth_soc-add-flow-offloading-support.patch > index 82e3ddec3f..660ac77dce 100644 > --- a/target/linux/generic/backport-5.10/610-v5.13-33-net-ethernet-mtk_eth_soc-add-flow-offloading-support.patch > +++ b/target/linux/generic/backport-5.10/610-v5.13-33-net-ethernet-mtk_eth_soc-add-flow-offloading-support.patch > @@ -127,7 +127,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> > + > +static const struct rhashtable_params mtk_flow_ht_params = { > + .head_offset = offsetof(struct mtk_flow_entry, node), > -+ .head_offset = offsetof(struct mtk_flow_entry, cookie), > ++ .key_offset = offsetof(struct mtk_flow_entry, cookie), > + .key_len = sizeof(unsigned long), > + .automatic_shrinking = true, > +}; > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel
On Fri, Apr 16, 2021 at 6:06 AM Daniel Golle <daniel@makrotopia.org> wrote: > > On Fri, Apr 16, 2021 at 03:44:06PM +0300, Lucian Cristian wrote: > > This fixes Hardware Offload on MT7621 > > I have already applied the fix for it in pending-5.10: > > https://git.openwrt.org/?p=openwrt/openwrt.git;a=commit;h=7f703716ae0e4cb4810eff37605b7594cef1edb8 > > For the future, and to still give you review: > You shouldn't modify patches in backport-* as they represent commits in > linux.git and for sake of maintainability it's good to keep them > exactly as present in linux.git history so we can easily spot and > remove them once they trickly down into linux-stable). Not to nitpick, but if you mean torvalds/linux.git, then lots of patches in backport-5.10 are breaking this rule. For instance, all the recent mediatek offload work is still only in netdev/net-next.git, to be (hopefully) merged into torvalds/linux.git when the next merge window opens. Also, this particular fix has been submitted and will likely also be in net-next.git imminently: https://lore.kernel.org/linux-arm-kernel/20210417072905.207032-1-dqfext@gmail.com/. In addition to that, I would like to submit another fix to OpenWrt that is already in net-next.git, but now I'm confused - do I put it in pending-5.10 or backports-5.10? Please advise. Ilya
On Sat, Apr 17, 2021 at 11:58:12AM -0700, Ilya Lipnitskiy wrote: > On Fri, Apr 16, 2021 at 6:06 AM Daniel Golle <daniel@makrotopia.org> wrote: > > > > On Fri, Apr 16, 2021 at 03:44:06PM +0300, Lucian Cristian wrote: > > > This fixes Hardware Offload on MT7621 > > > > I have already applied the fix for it in pending-5.10: > > > > https://git.openwrt.org/?p=openwrt/openwrt.git;a=commit;h=7f703716ae0e4cb4810eff37605b7594cef1edb8 > > > > For the future, and to still give you review: > > You shouldn't modify patches in backport-* as they represent commits in > > linux.git and for sake of maintainability it's good to keep them > > exactly as present in linux.git history so we can easily spot and > > remove them once they trickly down into linux-stable). > Not to nitpick, but if you mean torvalds/linux.git, then lots of > patches in backport-5.10 are breaking this rule. For instance, all the > recent mediatek offload work is still only in netdev/net-next.git, to > be (hopefully) merged into torvalds/linux.git when the next merge > window opens. Also, this particular fix has been submitted and will > likely also be in net-next.git imminently: > https://lore.kernel.org/linux-arm-kernel/20210417072905.207032-1-dqfext@gmail.com/. > > In addition to that, I would like to submit another fix to OpenWrt > that is already in net-next.git, but now I'm confused - do I put it in > pending-5.10 or backports-5.10? Please advise. If it already made it to net-next chances are 99% that it will be in linux.git soon and then make it's way to linux-stable. Hence I'd put the patch in backports-5.10. Only stuff you grab from upstream lists/patchwork or submitted yourself but hasn't been accepted yet should go into pending-5.10.
diff --git a/target/linux/generic/backport-5.10/610-v5.13-33-net-ethernet-mtk_eth_soc-add-flow-offloading-support.patch b/target/linux/generic/backport-5.10/610-v5.13-33-net-ethernet-mtk_eth_soc-add-flow-offloading-support.patch index 82e3ddec3f..660ac77dce 100644 --- a/target/linux/generic/backport-5.10/610-v5.13-33-net-ethernet-mtk_eth_soc-add-flow-offloading-support.patch +++ b/target/linux/generic/backport-5.10/610-v5.13-33-net-ethernet-mtk_eth_soc-add-flow-offloading-support.patch @@ -127,7 +127,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> + +static const struct rhashtable_params mtk_flow_ht_params = { + .head_offset = offsetof(struct mtk_flow_entry, node), -+ .head_offset = offsetof(struct mtk_flow_entry, cookie), ++ .key_offset = offsetof(struct mtk_flow_entry, cookie), + .key_len = sizeof(unsigned long), + .automatic_shrinking = true, +};
This fixes Hardware Offload on MT7621 Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>