| Message ID | 20200912021807.365158-1-xie.he.0141@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] drivers/net/wan/x25_asy: Remove an unnecessary x25_type_trans call | expand |
On 2020-09-12 04:18, Xie He wrote: > x25_type_trans only needs to be called before we call netif_rx to pass > the skb to upper layers. > > It does not need to be called before lapb_data_received. The LAPB > module > does not need the fields that are set by calling it. > > In the other two X.25 drivers - lapbether and hdlc_x25. x25_type_trans > is only called before netif_rx and not before lapb_data_received. > > Cc: Martin Schiller <ms@dev.tdt.de> > Signed-off-by: Xie He <xie.he.0141@gmail.com> > --- > drivers/net/wan/x25_asy.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c > index 5a7cf8bf9d0d..ab56a5e6447a 100644 > --- a/drivers/net/wan/x25_asy.c > +++ b/drivers/net/wan/x25_asy.c > @@ -202,8 +202,7 @@ static void x25_asy_bump(struct x25_asy *sl) > return; > } > skb_put_data(skb, sl->rbuff, count); > - skb->protocol = x25_type_trans(skb, sl->dev); > - err = lapb_data_received(skb->dev, skb); > + err = lapb_data_received(sl->dev, skb); > if (err != LAPB_OK) { > kfree_skb(skb); > printk(KERN_DEBUG "x25_asy: data received err - %d\n", err); Acked-by: Martin Schiller <ms@dev.tdt.de>
On Sun, Sep 13, 2020 at 10:32 PM Martin Schiller <ms@dev.tdt.de> wrote: > > Acked-by: Martin Schiller <ms@dev.tdt.de> Thank you, Martin!
From: Xie He <xie.he.0141@gmail.com> Date: Fri, 11 Sep 2020 19:18:07 -0700 > x25_type_trans only needs to be called before we call netif_rx to pass > the skb to upper layers. > > It does not need to be called before lapb_data_received. The LAPB module > does not need the fields that are set by calling it. > > In the other two X.25 drivers - lapbether and hdlc_x25. x25_type_trans > is only called before netif_rx and not before lapb_data_received. > > Cc: Martin Schiller <ms@dev.tdt.de> > Signed-off-by: Xie He <xie.he.0141@gmail.com> Applied to net-next, thanks.
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c index 5a7cf8bf9d0d..ab56a5e6447a 100644 --- a/drivers/net/wan/x25_asy.c +++ b/drivers/net/wan/x25_asy.c @@ -202,8 +202,7 @@ static void x25_asy_bump(struct x25_asy *sl) return; } skb_put_data(skb, sl->rbuff, count); - skb->protocol = x25_type_trans(skb, sl->dev); - err = lapb_data_received(skb->dev, skb); + err = lapb_data_received(sl->dev, skb); if (err != LAPB_OK) { kfree_skb(skb); printk(KERN_DEBUG "x25_asy: data received err - %d\n", err);
x25_type_trans only needs to be called before we call netif_rx to pass the skb to upper layers. It does not need to be called before lapb_data_received. The LAPB module does not need the fields that are set by calling it. In the other two X.25 drivers - lapbether and hdlc_x25. x25_type_trans is only called before netif_rx and not before lapb_data_received. Cc: Martin Schiller <ms@dev.tdt.de> Signed-off-by: Xie He <xie.he.0141@gmail.com> --- drivers/net/wan/x25_asy.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)