Commit 4b468385 authored by Xie He's avatar Xie He Committed by David S. Miller

drivers/net/wan/x25_asy: Remove an unnecessary x25_type_trans call

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: default avatarXie He <xie.he.0141@gmail.com>
Acked-by: default avatarMartin Schiller <ms@dev.tdt.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2de79ee2
...@@ -202,8 +202,7 @@ static void x25_asy_bump(struct x25_asy *sl) ...@@ -202,8 +202,7 @@ static void x25_asy_bump(struct x25_asy *sl)
return; return;
} }
skb_put_data(skb, sl->rbuff, count); skb_put_data(skb, sl->rbuff, count);
skb->protocol = x25_type_trans(skb, sl->dev); err = lapb_data_received(sl->dev, skb);
err = lapb_data_received(skb->dev, skb);
if (err != LAPB_OK) { if (err != LAPB_OK) {
kfree_skb(skb); kfree_skb(skb);
printk(KERN_DEBUG "x25_asy: data received err - %d\n", err); printk(KERN_DEBUG "x25_asy: data received err - %d\n", err);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment