Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1328547

[PATCH 2/4] powerpc/ps3: gelic_udbg: use struct vlan_hdr from <linux/if_vlan.h>

Show all headers | View raw

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

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 ac87811e8b4e..4d6e827edfde 100644
--- a/arch/powerpc/platforms/ps3/gelic_udbg.c
+++ b/arch/powerpc/platforms/ps3/gelic_udbg.c
@@ -14,6 +14,7 @@
  */
 
 #include <linux/if_ether.h>
+#include <linux/if_vlan.h>
 
 #include <asm/io.h>
 #include <asm/udbg.h>
@@ -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;

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/4] powerpc/ps3: gelic_udbg: drop local versions of network data structs Luis Henriques <luis.henriques@canonical.com> - 2016-02-07 18:40 +0100
  [PATCH 4/4] powerpc/ps3: gelic_udbg: use struct udphdr from <linux/udp.h> Luis Henriques <luis.henriques@canonical.com> - 2016-02-07 18:40 +0100
  [PATCH 1/4] powerpc/ps3: gelic_udbg: use struct ethhdr from <linux/if_ether.h> Luis Henriques <luis.henriques@canonical.com> - 2016-02-07 18:50 +0100
    Re: [PATCH 1/4] powerpc/ps3: gelic_udbg: use struct ethhdr from  <linux/if_ether.h> Joe Perches <joe@perches.com> - 2016-02-07 20:40 +0100
      Re: [PATCH 1/4] powerpc/ps3: gelic_udbg: use struct ethhdr from  <linux/if_ether.h> Luis Henriques <luis.henriques@canonical.com> - 2016-02-08 23:10 +0100
  [PATCH 3/4] powerpc/ps3: gelic_udbg: use struct iphdr from <linux/ip.h> Luis Henriques <luis.henriques@canonical.com> - 2016-02-07 18:50 +0100
  [PATCH 2/4] powerpc/ps3: gelic_udbg: use struct vlan_hdr from <linux/if_vlan.h> Luis Henriques <luis.henriques@canonical.com> - 2016-02-07 18:50 +0100
  Re: [PATCH 0/4] powerpc/ps3: gelic_udbg: drop local versions of  network data structs Geert Uytterhoeven <geert@linux-m68k.org> - 2016-02-08 09:40 +0100
    Re: [PATCH 0/4] powerpc/ps3: gelic_udbg: drop local versions of  network data structs Luis Henriques <luis.henriques@canonical.com> - 2016-02-08 23:20 +0100

csiph-web