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

Groups > linux.kernel > #1328540

[PATCH 4/4] powerpc/ps3: gelic_udbg: use struct udphdr from <linux/udp.h>

Show all headers | View raw

Instead of defining a local version of struct udphdr use the standard
definition from <linux/udp.h>.

The 'src' field is named 'source' in the <linux/udp.h> definition.

Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---
 arch/powerpc/platforms/ps3/gelic_udbg.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/arch/powerpc/platforms/ps3/gelic_udbg.c b/arch/powerpc/platforms/ps3/gelic_udbg.c
index 01d274fcbe51..b8f90a8465b9 100644
--- a/arch/powerpc/platforms/ps3/gelic_udbg.c
+++ b/arch/powerpc/platforms/ps3/gelic_udbg.c
@@ -16,6 +16,7 @@
 #include <linux/if_ether.h>
 #include <linux/if_vlan.h>
 #include <linux/ip.h>
+#include <linux/udp.h>
 
 #include <asm/io.h>
 #include <asm/udbg.h>
@@ -60,13 +61,6 @@ struct debug_block {
 	u8 pkt[1520];
 } __packed;
 
-struct udphdr {
-	u16 src;
-	u16 dest;
-	u16 len;
-	u16 checksum;
-} __packed;
-
 static __iomem struct ethhdr *h_eth;
 static __iomem struct vlan_hdr *h_vlan;
 static __iomem struct iphdr *h_ip;
@@ -185,7 +179,7 @@ static void gelic_debug_init(void)
 
 	header_size += sizeof(struct udphdr);
 	h_udp = (struct udphdr *)(h_ip + 1);
-	h_udp->src = GELIC_DEBUG_PORT;
+	h_udp->source = GELIC_DEBUG_PORT;
 	h_udp->dest = GELIC_DEBUG_PORT;
 
 	pmsgc = pmsg = (char *)(h_udp + 1);

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