From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754698AbcBGRjs (ORCPT ); Sun, 7 Feb 2016 12:39:48 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:44322 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754408AbcBGRjP (ORCPT ); Sun, 7 Feb 2016 12:39:15 -0500 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 2/4] powerpc/ps3: gelic_udbg: use struct vlan_hdr from Date: Sun, 7 Feb 2016 17:38:48 +0000 Message-Id: <1454866730-10481-3-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> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Instead of defining the local struct vlantag use the standard definition of vlan_hdr from . The fields in the definition have different names: - vlan -> h_vlan_TCI - subtype -> h_vlan_encapsulated_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 ac87811e8b4e..4d6e827edfde 100644 --- a/arch/powerpc/platforms/ps3/gelic_udbg.c +++ b/arch/powerpc/platforms/ps3/gelic_udbg.c @@ -14,6 +14,7 @@ */ #include +#include #include #include @@ -58,11 +59,6 @@ struct debug_block { u8 pkt[1520]; } __packed; -struct vlantag { - u16 vlan; - u16 subtype; -} __packed; - struct iphdr { u8 ver_len; u8 dscp_ecn; @@ -84,7 +80,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; @@ -181,10 +177,10 @@ static void gelic_debug_init(void) if (!result) { h_eth->h_proto= 0x8100; - 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 = 0x0800; h_ip = (struct iphdr *)(h_vlan + 1); } else { h_eth->h_proto= 0x0800;