Re: [PATCH net-next v2 1/4] net: hsr: generate supervision frame without HSR/PRP tag

George McCollister
2021-02-08T17:34:44Z

On Sat, Feb 6, 2021 at 7:26 PM Vladimir Oltean <olteanv@gmail.com> wrote:
>
> On Thu, Feb 04, 2021 at 03:59:23PM -0600, George McCollister wrote:
> > @@ -289,23 +286,12 @@ static void send_hsr_supervision_frame(struct hsr_port *master,
> > hsr->announce_count++;
> > }
> >
> > - if (!hsr->prot_version)
> > - proto = ETH_P_PRP;
> > - else
> > - proto = ETH_P_HSR;
> > -
> > - skb = hsr_init_skb(master, proto);
> > + skb = hsr_init_skb(master, ETH_P_PRP);
> > if (!skb) {
> > WARN_ONCE(1, "HSR: Could not send supervision frame\n");
> > return;
> > }
>
> I wonder why you aren't even more aggressive, just remove the proto
> argument from hsr_init_skb and delay setting skb->protocol to
> hsr_fill_tag or the whereabouts. This is probably also more correct
> since as far as I can see, nobody is updating the skb->proto of
> supervision frames from HSR v0 to v1 after your change.

Will do. Thanks.