From: Luis Henriques <luis.henriques@canonical.com>
To: Geoff Levand <geoff@infradead.org>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>
Cc: Joe Perches <joe@perches.com>,
Geert Uytterhoeven <geert@linux-m68k.org>,
linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 2/4] powerpc/ps3: gelic_udbg: use struct vlan_hdr from <linux/if_vlan.h>
Date: Mon, 8 Feb 2016 22:27:05 +0000 [thread overview]
Message-ID: <1454970427-23017-3-git-send-email-luis.henriques@canonical.com> (raw)
In-Reply-To: <1454970427-23017-1-git-send-email-luis.henriques@canonical.com>
Instead of defining the local struct vlantag use the standard definition
of vlan_hdr from <linux/if_vlan.h>.
The fields in the <linux/if_vlan.h> definition have different names:
- vlan -> h_vlan_TCI
- subtype -> h_vlan_encapsulated_proto
While there, use also the ETH_P_IP macro instead of an hard-coded 0x0800
value.
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---
arch/powerpc/platforms/ps3/gelic_udbg.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/arch/powerpc/platforms/ps3/gelic_udbg.c b/arch/powerpc/platforms/ps3/gelic_udbg.c
index f11059e1ec35..bbf9c9904caf 100644
--- a/arch/powerpc/platforms/ps3/gelic_udbg.c
+++ b/arch/powerpc/platforms/ps3/gelic_udbg.c
@@ -15,6 +15,7 @@
#include <linux/if_ether.h>
#include <linux/etherdevice.h>
+#include <linux/if_vlan.h>
#include <asm/io.h>
#include <asm/udbg.h>
@@ -59,11 +60,6 @@ struct debug_block {
u8 pkt[1520];
} __packed;
-struct vlantag {
- u16 vlan;
- u16 subtype;
-} __packed;
-
struct iphdr {
u8 ver_len;
u8 dscp_ecn;
@@ -85,7 +81,7 @@ struct udphdr {
} __packed;
static __iomem struct ethhdr *h_eth;
-static __iomem struct vlantag *h_vlan;
+static __iomem struct vlan_hdr *h_vlan;
static __iomem struct iphdr *h_ip;
static __iomem struct udphdr *h_udp;
@@ -182,10 +178,10 @@ static void gelic_debug_init(void)
if (!result) {
h_eth->h_proto= ETH_P_8021Q;
- header_size += sizeof(struct vlantag);
- h_vlan = (struct vlantag *)(h_eth + 1);
- h_vlan->vlan = vlan_id;
- h_vlan->subtype = 0x0800;
+ header_size += sizeof(struct vlan_hdr);
+ h_vlan = (struct vlan_hdr *)(h_eth + 1);
+ h_vlan->h_vlan_TCI = vlan_id;
+ h_vlan->h_vlan_encapsulated_proto = ETH_P_IP;
h_ip = (struct iphdr *)(h_vlan + 1);
} else {
h_eth->h_proto= 0x0800;
next prev parent reply other threads:[~2016-02-08 22:27 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-08 22:27 [PATCH v2 0/4] powerpc/ps3: gelic_udbg: drop local versions of network data structs Luis Henriques
2016-02-08 22:27 ` [PATCH v2 1/4] powerpc/ps3: gelic_udbg: use struct ethhdr from <linux/if_ether.h> Luis Henriques
2016-03-01 22:21 ` [v2, " Michael Ellerman
2016-02-08 22:27 ` Luis Henriques [this message]
2016-02-08 22:27 ` [PATCH v2 3/4] powerpc/ps3: gelic_udbg: use struct iphdr from <linux/ip.h> Luis Henriques
2016-02-08 22:27 ` [PATCH v2 4/4] powerpc/ps3: gelic_udbg: use struct udphdr from <linux/udp.h> Luis Henriques
2016-02-09 2:54 ` [PATCH v2 0/4] powerpc/ps3: gelic_udbg: drop local versions of network data structs Michael Ellerman
2016-02-11 23:20 ` Geoff Levand
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=1454970427-23017-3-git-send-email-luis.henriques@canonical.com \
--to=luis.henriques@canonical.com \
--cc=benh@kernel.crashing.org \
--cc=geert@linux-m68k.org \
--cc=geoff@infradead.org \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.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).