In message: [linux-yocto] net: hsr: Reapply the change for fill_frame_info() on 27/09/2023 Kevin Hao wrote:
> From: Kevin Hao <[email protected]> > > The change introduced by commit 6a4480c5e6eb ("hsr: Fix uninit-value > access in fill_frame_info()") were lost when fixing the merge > conflicts. Restore it back. > > Signed-off-by: Kevin Hao <[email protected]> > --- > Hi Bruce, > > Please help me merge this into the following two branches: > v5.15/standard/ti-sdk-5.10/ti-j72xx > v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx merged. Bruce > > net/hsr/hsr_forward.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/net/hsr/hsr_forward.c b/net/hsr/hsr_forward.c > index 70c9ac89ca61..09ee979e9c9e 100644 > --- a/net/hsr/hsr_forward.c > +++ b/net/hsr/hsr_forward.c > @@ -776,6 +776,7 @@ static int fill_frame_info(struct hsr_frame_info *frame, > if (frame->is_vlan) { > vlan_hdr = (struct hsr_vlan_ethhdr *)ethhdr; > proto = vlan_hdr->vlanhdr.h_vlan_encapsulated_proto; > + return -EINVAL; > } > > frame->is_from_san = false; > -- > 2.39.2 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13135): https://lists.yoctoproject.org/g/linux-yocto/message/13135 Mute This Topic: https://lists.yoctoproject.org/mt/101615037/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/leave/6687884/21656/624485779/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
