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: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org
Subject: [PATCH 1/4] powerpc/ps3: gelic_udbg: use struct ethhdr from <linux/if_ether.h>
Date: Sun, 7 Feb 2016 17:38:47 +0000 [thread overview]
Message-ID: <1454866730-10481-2-git-send-email-luis.henriques@canonical.com> (raw)
In-Reply-To: <1454866730-10481-1-git-send-email-luis.henriques@canonical.com>
Instead of defining a local version of struct ethhdr use the standard
definition from <linux/if_ether.h>.
The fields in the <linux/if_ether.h> definition have different names:
- dest -> h_dest
- src -> h_source
- type -> h_proto
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 20b46a19a48f..ac87811e8b4e 100644
--- a/arch/powerpc/platforms/ps3/gelic_udbg.c
+++ b/arch/powerpc/platforms/ps3/gelic_udbg.c
@@ -13,6 +13,8 @@
*
*/
+#include <linux/if_ether.h>
+
#include <asm/io.h>
#include <asm/udbg.h>
#include <asm/lv1call.h>
@@ -56,12 +58,6 @@ struct debug_block {
u8 pkt[1520];
} __packed;
-struct ethhdr {
- u8 dest[6];
- u8 src[6];
- u16 type;
-} __packed;
-
struct vlantag {
u16 vlan;
u16 subtype;
@@ -173,8 +169,8 @@ static void gelic_debug_init(void)
h_eth = (struct ethhdr *)dbg.pkt;
- memset(&h_eth->dest, 0xff, 6);
- memcpy(&h_eth->src, &mac, 6);
+ memset(&h_eth->h_dest, 0xff, 6);
+ memcpy(&h_eth->h_source, &mac, 6);
header_size = sizeof(struct ethhdr);
@@ -183,7 +179,7 @@ static void gelic_debug_init(void)
GELIC_LV1_VLAN_TX_ETHERNET_0, 0, 0,
&vlan_id, &v2);
if (!result) {
- h_eth->type = 0x8100;
+ h_eth->h_proto= 0x8100;
header_size += sizeof(struct vlantag);
h_vlan = (struct vlantag *)(h_eth + 1);
@@ -191,7 +187,7 @@ static void gelic_debug_init(void)
h_vlan->subtype = 0x0800;
h_ip = (struct iphdr *)(h_vlan + 1);
} else {
- h_eth->type = 0x0800;
+ h_eth->h_proto= 0x0800;
h_ip = (struct iphdr *)(h_eth + 1);
}
next prev parent reply other threads:[~2016-02-07 17:39 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-07 17:38 [PATCH 0/4] powerpc/ps3: gelic_udbg: drop local versions of network data structs Luis Henriques
2016-02-07 17:38 ` Luis Henriques [this message]
2016-02-07 18:26 ` [PATCH 1/4] powerpc/ps3: gelic_udbg: use struct ethhdr from <linux/if_ether.h> Joe Perches
2016-02-08 22:04 ` Luis Henriques
2016-02-07 17:38 ` [PATCH 2/4] powerpc/ps3: gelic_udbg: use struct vlan_hdr from <linux/if_vlan.h> Luis Henriques
2016-02-07 17:38 ` [PATCH 3/4] powerpc/ps3: gelic_udbg: use struct iphdr from <linux/ip.h> Luis Henriques
2016-02-07 17:38 ` [PATCH 4/4] powerpc/ps3: gelic_udbg: use struct udphdr from <linux/udp.h> Luis Henriques
2016-02-08 8:31 ` [PATCH 0/4] powerpc/ps3: gelic_udbg: drop local versions of network data structs Geert Uytterhoeven
2016-02-08 22:10 ` Luis Henriques
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=1454866730-10481-2-git-send-email-luis.henriques@canonical.com \
--to=luis.henriques@canonical.com \
--cc=benh@kernel.crashing.org \
--cc=geoff@infradead.org \
--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).