From 487bdb3855ed82a39c80e5aae8777fba22e2d380 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Thu, 12 Oct 2000 16:33:41 +0000 Subject: [PATCH] Backout my wrong attempt to fix the compilation warning in ip_input.c and instead reapply the revision 1.49 of mbuf.h, i.e. Fixed regression of the type of the `header' member of struct pkthdr from `void *' to caddr_t in rev.1.51. This mainly caused an annoying warning for compiling ip_input.c. Requested by: bde --- sys/netinet/ip_input.c | 2 +- sys/sys/mbuf.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 943254515e9f..a360b4f8228e 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -668,7 +668,7 @@ found: */ if (mff || ip->ip_off) { ipstat.ips_fragments++; - m->m_pkthdr.header = (caddr_t)ip; + m->m_pkthdr.header = ip; #ifdef IPDIVERT m = ip_reass(m, fp, &ipq[sum], &divert_info, &divert_cookie); diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index d59ab541796e..e2945686e778 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -92,7 +92,7 @@ struct pkthdr { struct ifnet *rcvif; /* rcv interface */ int len; /* total packet length */ /* variables for ip and tcp reassembly */ - caddr_t header; /* pointer to packet header */ + void *header; /* pointer to packet header */ /* variables for hardware checksum */ int csum_flags; /* flags regarding checksum */ int csum_data; /* data field used by csum routines */