Explorar o código

net: cosmetic: Un-typedef ICMP_t

Remove typedef and lower-case name

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Joe Hershberger %!s(int64=13) %!d(string=hai) anos
pai
achega
e0a630795b
Modificáronse 3 ficheiros con 6 adicións e 4 borrados
  1. 4 2
      include/net.h
  2. 1 1
      net/net.c
  3. 1 1
      net/ping.c

+ 4 - 2
include/net.h

@@ -298,7 +298,7 @@ struct arp_hdr {
 /* Codes for NOT_REACH */
 #define ICMP_NOT_REACH_PORT	3	/* Port unreachable		*/
 
-typedef struct icmphdr {
+struct icmp_hdr {
 	uchar		type;
 	uchar		code;
 	ushort		checksum;
@@ -314,8 +314,10 @@ typedef struct icmphdr {
 		} frag;
 		uchar data[0];
 	} un;
-} ICMP_t;
+};
 
+#define ICMP_HDR_SIZE		(sizeof(struct icmp_hdr))
+#define IP_ICMP_HDR_SIZE	(IP_HDR_SIZE + ICMP_HDR_SIZE)
 
 /*
  * Maximum packet size; used to allocate packet storage.

+ 1 - 1
net/net.c

@@ -825,7 +825,7 @@ static inline struct ip_udp_hdr *NetDefragment(struct ip_udp_hdr *ip, int *lenp)
 static void receive_icmp(struct ip_udp_hdr *ip, int len,
 			IPaddr_t src_ip, struct ethernet_hdr *et)
 {
-	ICMP_t *icmph = (ICMP_t *)&ip->udp_src;
+	struct icmp_hdr *icmph = (struct icmp_hdr *)&ip->udp_src;
 
 	switch (icmph->type) {
 	case ICMP_REDIRECT:

+ 1 - 1
net/ping.c

@@ -100,7 +100,7 @@ void ping_start(void)
 
 void ping_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len)
 {
-	ICMP_t *icmph = (ICMP_t *)&(ip->udp_src);
+	struct icmp_hdr *icmph = (struct icmp_hdr *)&ip->udp_src;
 	IPaddr_t src_ip;
 
 	switch (icmph->type) {