diff options
| author | ru <ru@FreeBSD.org> | 2000-10-12 16:33:41 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2000-10-12 16:33:41 +0000 |
| commit | 529896e0eaa10f24eedd25e99cd5dc9a520fc14b (patch) | |
| tree | daa01ee95ef46514e4362e6991420b7f9d9fc33a | |
| parent | 51c91a72d927ac55e028218db79ad05e1c0e9853 (diff) | |
| download | FreeBSD-src-529896e0eaa10f24eedd25e99cd5dc9a520fc14b.zip FreeBSD-src-529896e0eaa10f24eedd25e99cd5dc9a520fc14b.tar.gz | |
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
| -rw-r--r-- | sys/netinet/ip_input.c | 2 | ||||
| -rw-r--r-- | 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 9432545..a360b4f 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 d59ab54..e294568 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 */ |
