From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 917131A0220 for ; Mon, 8 Feb 2016 04:39:13 +1100 (AEDT) From: Luis Henriques To: Geoff Levand , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] powerpc/ps3: gelic_udbg: use struct ethhdr from Date: Sun, 7 Feb 2016 17:38:47 +0000 Message-Id: <1454866730-10481-2-git-send-email-luis.henriques@canonical.com> In-Reply-To: <1454866730-10481-1-git-send-email-luis.henriques@canonical.com> References: <1454866730-10481-1-git-send-email-luis.henriques@canonical.com> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Instead of defining a local version of struct ethhdr use the standard definition from . The fields in the definition have different names: - dest -> h_dest - src -> h_source - type -> h_proto Signed-off-by: Luis Henriques --- 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 + #include #include #include @@ -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); }