From: Martin Schiller <ms@dev.tdt.de>
To: andrew.hendry@gmail.com, davem@davemloft.net, khc@pm.waw.pl,
isdn@linux-pingi.de
Cc: edumazet@google.com, linux-x25@vger.kernel.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Martin Schiller <ms@dev.tdt.de>
Subject: [PATCH 1/4] net/x25: call skb_reset_network_header where needed
Date: Wed, 3 Apr 2019 07:01:15 +0200 [thread overview]
Message-ID: <20190403050118.12785-1-ms@dev.tdt.de> (raw)
This fixes some problems like:
o tcpdump not showing X.25<->LapB Header
o "protocol 0508 is buggy" warning from I4L
Signed-off-by: Martin Schiller <ms@dev.tdt.de>
---
net/x25/x25_dev.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/net/x25/x25_dev.c b/net/x25/x25_dev.c
index 39231237e1c3..eef0305f3e99 100644
--- a/net/x25/x25_dev.c
+++ b/net/x25/x25_dev.c
@@ -127,6 +127,7 @@ int x25_lapb_receive_frame(struct sk_buff *skb, struct net_device *dev,
case X25_IFACE_DATA:
skb_pull(skb, 1);
+ skb_reset_network_header(skb);
if (x25_receive_data(skb, nb)) {
x25_neigh_put(nb);
goto out;
@@ -171,6 +172,8 @@ void x25_establish_link(struct x25_neigh *nb)
return;
}
+ skb_reset_network_header(skb);
+
skb->protocol = htons(ETH_P_X25);
skb->dev = nb->dev;
@@ -198,6 +201,8 @@ void x25_terminate_link(struct x25_neigh *nb)
ptr = skb_put(skb, 1);
*ptr = X25_IFACE_DISCONNECT;
+ skb_reset_network_header(skb);
+
skb->protocol = htons(ETH_P_X25);
skb->dev = nb->dev;
dev_queue_xmit(skb);
@@ -207,8 +212,6 @@ void x25_send_frame(struct sk_buff *skb, struct x25_neigh *nb)
{
unsigned char *dptr;
- skb_reset_network_header(skb);
-
switch (nb->dev->type) {
case ARPHRD_X25:
dptr = skb_push(skb, 1);
@@ -225,6 +228,8 @@ void x25_send_frame(struct sk_buff *skb, struct x25_neigh *nb)
return;
}
+ skb_reset_network_header(skb);
+
skb->protocol = htons(ETH_P_X25);
skb->dev = nb->dev;
--
2.11.0
next reply other threads:[~2019-04-03 5:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-03 5:01 Martin Schiller [this message]
2019-04-03 5:01 ` [PATCH 2/4] wan/hdlc_x25: fix skb handling Martin Schiller
2019-04-05 0:32 ` David Miller
2019-04-05 6:56 ` Martin Schiller
2019-04-05 19:15 ` David Miller
2019-04-08 6:07 ` Martin Schiller
2019-04-03 5:01 ` [PATCH 3/4] isdn/i4l/isdn_x25iface: call skb_reset_network_header Martin Schiller
2019-04-03 5:01 ` [PATCH 4/4] isdn/i4l: Call notifiers before and after changing device type Martin Schiller
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=20190403050118.12785-1-ms@dev.tdt.de \
--to=ms@dev.tdt.de \
--cc=andrew.hendry@gmail.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=isdn@linux-pingi.de \
--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 read-only IMAP folder(s) and NNTP newsgroup(s).