提交 95442c64 编写于 作者: L Luis Henriques 提交者: Michael Ellerman

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: NLuis Henriques <luis.henriques@canonical.com>
Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
上级 0336c8cd
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/ip.h> #include <linux/ip.h>
#include <linux/udp.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/udbg.h> #include <asm/udbg.h>
...@@ -61,13 +62,6 @@ struct debug_block { ...@@ -61,13 +62,6 @@ struct debug_block {
u8 pkt[1520]; u8 pkt[1520];
} __packed; } __packed;
struct udphdr {
u16 src;
u16 dest;
u16 len;
u16 checksum;
} __packed;
static __iomem struct ethhdr *h_eth; static __iomem struct ethhdr *h_eth;
static __iomem struct vlan_hdr *h_vlan; static __iomem struct vlan_hdr *h_vlan;
static __iomem struct iphdr *h_ip; static __iomem struct iphdr *h_ip;
...@@ -186,7 +180,7 @@ static void gelic_debug_init(void) ...@@ -186,7 +180,7 @@ static void gelic_debug_init(void)
header_size += sizeof(struct udphdr); header_size += sizeof(struct udphdr);
h_udp = (struct udphdr *)(h_ip + 1); 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; h_udp->dest = GELIC_DEBUG_PORT;
pmsgc = pmsg = (char *)(h_udp + 1); pmsgc = pmsg = (char *)(h_udp + 1);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册