diff options
author | Luis Henriques <luis.henriques@canonical.com> | 2016-02-08 17:27:07 -0500 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-03-01 03:27:20 -0500 |
commit | 95442c64de7a6d6efe788a9820b114f6bd67fef7 (patch) | |
tree | 9abda31d4e736e7123e4059483d97764783c3a3e | |
parent | 0336c8cd4d61231a6745a99f74929b2f09519d87 (diff) |
powerpc/ps3: gelic_udbg: use struct udphdr from <linux/udp.h>
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>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r-- | arch/powerpc/platforms/ps3/gelic_udbg.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/powerpc/platforms/ps3/gelic_udbg.c b/arch/powerpc/platforms/ps3/gelic_udbg.c index d69f33dcc64b..09bf24d616a5 100644 --- a/arch/powerpc/platforms/ps3/gelic_udbg.c +++ b/arch/powerpc/platforms/ps3/gelic_udbg.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/etherdevice.h> | 17 | #include <linux/etherdevice.h> |
18 | #include <linux/if_vlan.h> | 18 | #include <linux/if_vlan.h> |
19 | #include <linux/ip.h> | 19 | #include <linux/ip.h> |
20 | #include <linux/udp.h> | ||
20 | 21 | ||
21 | #include <asm/io.h> | 22 | #include <asm/io.h> |
22 | #include <asm/udbg.h> | 23 | #include <asm/udbg.h> |
@@ -61,13 +62,6 @@ struct debug_block { | |||
61 | u8 pkt[1520]; | 62 | u8 pkt[1520]; |
62 | } __packed; | 63 | } __packed; |
63 | 64 | ||
64 | struct udphdr { | ||
65 | u16 src; | ||
66 | u16 dest; | ||
67 | u16 len; | ||
68 | u16 checksum; | ||
69 | } __packed; | ||
70 | |||
71 | static __iomem struct ethhdr *h_eth; | 65 | static __iomem struct ethhdr *h_eth; |
72 | static __iomem struct vlan_hdr *h_vlan; | 66 | static __iomem struct vlan_hdr *h_vlan; |
73 | static __iomem struct iphdr *h_ip; | 67 | static __iomem struct iphdr *h_ip; |
@@ -186,7 +180,7 @@ static void gelic_debug_init(void) | |||
186 | 180 | ||
187 | header_size += sizeof(struct udphdr); | 181 | header_size += sizeof(struct udphdr); |
188 | h_udp = (struct udphdr *)(h_ip + 1); | 182 | h_udp = (struct udphdr *)(h_ip + 1); |
189 | h_udp->src = GELIC_DEBUG_PORT; | 183 | h_udp->source = GELIC_DEBUG_PORT; |
190 | h_udp->dest = GELIC_DEBUG_PORT; | 184 | h_udp->dest = GELIC_DEBUG_PORT; |
191 | 185 | ||
192 | pmsgc = pmsg = (char *)(h_udp + 1); | 186 | pmsgc = pmsg = (char *)(h_udp + 1); |