Re: [tipc-discussion] [PATCH net-next] tipc: remove inputq from tipc_bc_base

[Hoang H. Le <hoa...@de...>]

> -----Original Message-----
> From: Xin Long <luc...@gm...>
> Sent: Tuesday, June 7, 2022 12:57 AM
> To: tip...@li...
> Subject: Re: [tipc-discussion] [PATCH net-next] tipc: remove inputq from tipc_bc_base
> 
> fix Jon's email address.
> 
> On Mon, Jun 6, 2022 at 1:52 PM Xin Long <luc...@gm...> wrote:
> >
> > After Commit 2af5ae372a4b ("tipc: clean up unused code and structures"),
> > there is no place really using tn->bcbase->inputq. This patch is to
> > delete this member from struct tipc_bc_base.
> >
> > Signed-off-by: Xin Long <luc...@gm...>
> > ---
> >  net/tipc/bcast.c | 22 +---------------------
> >  1 file changed, 1 insertion(+), 21 deletions(-)
> >
> > diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
> > index 593846d25214..2293f6caa682 100644
> > --- a/net/tipc/bcast.c
> > +++ b/net/tipc/bcast.c
> > @@ -63,7 +63,6 @@ unsigned long sysctl_tipc_bc_retruni __read_mostly;
> >   */
> >  struct tipc_bc_base {
> >         struct tipc_link *link;
> > -       struct sk_buff_head inputq;
> >         int dests[MAX_BEARERS];
> >         int primary_bearer;
> >         bool bcast_support;
> > @@ -436,7 +435,6 @@ int tipc_mcast_xmit(struct net *net, struct sk_buff_head *pkts,
> >  int tipc_bcast_rcv(struct net *net, struct tipc_link *l, struct sk_buff *skb)
> >  {
> >         struct tipc_msg *hdr = buf_msg(skb);
> > -       struct sk_buff_head *inputq = &tipc_bc_base(net)->inputq;
> >         struct sk_buff_head xmitq;
> >         int rc;
> >
> > @@ -456,10 +454,6 @@ int tipc_bcast_rcv(struct net *net, struct tipc_link *l, struct sk_buff *skb)
> >
> >         tipc_bcbase_xmit(net, &xmitq);
> >
> > -       /* Any socket wakeup messages ? */
> > -       if (!skb_queue_empty(inputq))
> > -               tipc_sk_rcv(net, inputq);
> > -
> >         return rc;
> >  }
> >
> > @@ -470,7 +464,6 @@ int tipc_bcast_rcv(struct net *net, struct tipc_link *l, struct sk_buff *skb)
> >  void tipc_bcast_ack_rcv(struct net *net, struct tipc_link *l,
> >                         struct tipc_msg *hdr)
> >  {
> > -       struct sk_buff_head *inputq = &tipc_bc_base(net)->inputq;
> >         u16 acked = msg_bcast_ack(hdr);
> >         struct sk_buff_head xmitq;
> >
> > @@ -485,10 +478,6 @@ void tipc_bcast_ack_rcv(struct net *net, struct tipc_link *l,
> >         tipc_bcast_unlock(net);
> >
> >         tipc_bcbase_xmit(net, &xmitq);
> > -
> > -       /* Any socket wakeup messages ? */
> > -       if (!skb_queue_empty(inputq))
> > -               tipc_sk_rcv(net, inputq);
> >  }
> >
> >  /* tipc_bcast_synch_rcv -  check and update rcv link with peer's send state
> > @@ -499,7 +488,6 @@ int tipc_bcast_sync_rcv(struct net *net, struct tipc_link *l,
> >                         struct tipc_msg *hdr,
> >                         struct sk_buff_head *retrq)
> >  {
> > -       struct sk_buff_head *inputq = &tipc_bc_base(net)->inputq;
> >         struct tipc_gap_ack_blks *ga;
> >         struct sk_buff_head xmitq;
> >         int rc = 0;
> > @@ -522,9 +510,6 @@ int tipc_bcast_sync_rcv(struct net *net, struct tipc_link *l,
> >
> >         tipc_bcbase_xmit(net, &xmitq);
> >
> > -       /* Any socket wakeup messages ? */
> > -       if (!skb_queue_empty(inputq))
> > -               tipc_sk_rcv(net, inputq);
> >         return rc;
> >  }
> >
> > @@ -551,7 +536,6 @@ void tipc_bcast_add_peer(struct net *net, struct tipc_link *uc_l,
> >  void tipc_bcast_remove_peer(struct net *net, struct tipc_link *rcv_l)
> >  {
> >         struct tipc_link *snd_l = tipc_bc_sndlink(net);
> > -       struct sk_buff_head *inputq = &tipc_bc_base(net)->inputq;
> >         struct sk_buff_head xmitq;
> >
> >         __skb_queue_head_init(&xmitq);
> > @@ -563,10 +547,6 @@ void tipc_bcast_remove_peer(struct net *net, struct tipc_link *rcv_l)
> >         tipc_bcast_unlock(net);
> >
> >         tipc_bcbase_xmit(net, &xmitq);
> > -
> > -       /* Any socket wakeup messages ? */
> > -       if (!skb_queue_empty(inputq))
> > -               tipc_sk_rcv(net, inputq);
> >  }
> >
> >  int tipc_bclink_reset_stats(struct net *net, struct tipc_link *l)
> > @@ -703,7 +683,7 @@ int tipc_bcast_init(struct net *net)
> >                                  BCLINK_WIN_DEFAULT,
> >                                  BCLINK_WIN_DEFAULT,
> >                                  0,
> > -                                &bb->inputq,
> > +                                NULL,
> >                                  NULL,
> >                                  NULL,
> >                                  &l))
> > --
> > 2.31.1
> >
> 
> 
> _______________________________________________
> tipc-discussion mailing list
> tip...@li...
> https://lists.sourceforge.net/lists/listinfo/tipc-discussion

Please also remove kernel-doc comment for this member too.
Regards,
Hoang