diff options
| author | Xie He <xie.he.0141@gmail.com> | 2020-09-12 05:18:07 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-09-15 00:41:02 +0300 |
| commit | 4b4683853507128ed78e255aa0b1ef2b1bccba41 (patch) | |
| tree | 562bdd1421ccdc33a27668d43510984104590329 /drivers/net/wan | |
| parent | 2de79ee27fdb52626ac4ac48ec6d8d52ba6f9047 (diff) | |
| download | linux-4b4683853507128ed78e255aa0b1ef2b1bccba41.tar.xz | |
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: Xie He <xie.he.0141@gmail.com>
Acked-by: Martin Schiller <ms@dev.tdt.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wan')
| -rw-r--r-- | drivers/net/wan/x25_asy.c | 3 |
1 files changed, 1 insertions, 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); |