From: Martin Schiller <ms@dev.tdt.de>
To: khc@pm.waw.pl, davem@davemloft.net
Cc: linux-x25@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, Martin Schiller <ms@dev.tdt.de>
Subject: [PATCH 2/2] wan/hdlc_x25: fix skb handling
Date: Mon, 13 Jan 2020 13:45:51 +0100 [thread overview]
Message-ID: <20200113124551.2570-2-ms@dev.tdt.de> (raw)
In-Reply-To: <20200113124551.2570-1-ms@dev.tdt.de>
o call skb_reset_network_header() before hdlc->xmit()
o change skb proto to HDLC (0x0019) before hdlc->xmit()
o call dev_queue_xmit_nit() before hdlc->xmit()
This changes make it possible to trace (tcpdump) outgoing layer2
(ETH_P_HDLC) packets
o use a copy of the skb for lapb_data_request() in x25_xmit()
This fixes the problem, that tracing layer3 (ETH_P_X25) packets
results in a malformed first byte of the packets.
Signed-off-by: Martin Schiller <ms@dev.tdt.de>
---
drivers/net/wan/hdlc_x25.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wan/hdlc_x25.c b/drivers/net/wan/hdlc_x25.c
index b28051eba736..434e5263eddf 100644
--- a/drivers/net/wan/hdlc_x25.c
+++ b/drivers/net/wan/hdlc_x25.c
@@ -72,6 +72,7 @@ static int x25_data_indication(struct net_device *dev, struct sk_buff *skb)
unsigned char *ptr;
skb_push(skb, 1);
+ skb_reset_network_header(skb);
if (skb_cow(skb, 1))
return NET_RX_DROP;
@@ -88,6 +89,9 @@ static int x25_data_indication(struct net_device *dev, struct sk_buff *skb)
static void x25_data_transmit(struct net_device *dev, struct sk_buff *skb)
{
hdlc_device *hdlc = dev_to_hdlc(dev);
+ skb_reset_network_header(skb);
+ skb->protocol = hdlc_type_trans(skb, dev);
+ dev_queue_xmit_nit(skb, dev);
hdlc->xmit(skb, dev); /* Ignore return value :-( */
}
@@ -95,16 +99,19 @@ static void x25_data_transmit(struct net_device *dev, struct sk_buff *skb)
static netdev_tx_t x25_xmit(struct sk_buff *skb, struct net_device *dev)
{
+ struct sk_buff *skbn;
int result;
/* X.25 to LAPB */
switch (skb->data[0]) {
case X25_IFACE_DATA: /* Data to be transmitted */
- skb_pull(skb, 1);
- if ((result = lapb_data_request(dev, skb)) != LAPB_OK)
- dev_kfree_skb(skb);
- return NETDEV_TX_OK;
+ skbn = skb_copy(skb, GFP_ATOMIC);
+ skb_pull(skbn, 1);
+ skb_reset_network_header(skbn);
+ if ((result = lapb_data_request(dev, skbn)) != LAPB_OK)
+ dev_kfree_skb(skbn);
+ break;
case X25_IFACE_CONNECT:
if ((result = lapb_connect_request(dev))!= LAPB_OK) {
--
2.20.1
next prev parent reply other threads:[~2020-01-13 12:45 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-13 12:45 [PATCH 1/2] wan/hdlc_x25: make lapb params configurable Martin Schiller
2020-01-13 12:45 ` Martin Schiller [this message]
2020-01-13 13:44 ` [PATCH 2/2] wan/hdlc_x25: fix skb handling Jakub Kicinski
2020-01-14 8:10 ` Martin Schiller
2020-01-13 13:53 ` [PATCH 1/2] wan/hdlc_x25: make lapb params configurable Jakub Kicinski
2020-01-14 5:37 ` Martin Schiller
2020-01-14 12:51 ` Jakub Kicinski
2020-01-14 13:33 ` Martin Schiller
2020-01-14 13:45 ` Jakub Kicinski
2020-03-26 6:08 ` Krzysztof Hałasa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200113124551.2570-2-ms@dev.tdt.de \
--to=ms@dev.tdt.de \
--cc=davem@davemloft.net \
--cc=khc@pm.waw.pl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-x25@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).