d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add attrbute(packed) to union def with specific align constraitn.

Browse Source 
move file static variable to auto variable, make in6_cksum() work better in
kernel-MP environment.  sync with kame.

From: Alfred Perlstein <bright@wintelcom.net>
This commit is contained in:
Jun-ichiro itojun Hagino 2000-09-09 15:56:46 +00:00
parent a3f02cc072
commit 29a3d1b0d2
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=65637
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/netinet6/in6_cksum.c
View File

@ -1,5 +1,5 @@
/* $FreeBSD$ */
/* $KAME: in6_cksum.c,v 1.6 2000/03/25 07:23:43 sumikawa Exp $ */
/* $KAME: in6_cksum.c,v 1.9 2000/09/09 15:33:31 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@ -83,15 +83,6 @@
#define ADDCARRY(x) (x > 65535 ? x -= 65535 : x)
#define REDUCE {l_util.l = sum; sum = l_util.s[0] + l_util.s[1]; ADDCARRY(sum);}
static union {
u_int16_t phs[4];
struct {
u_int32_t ph_len;
u_int8_t ph_zero[3];
u_int8_t ph_nxt;
} ph;
} uph;
/*
* m MUST contain a continuous IP6 header.
* off is a offset where TCP/UDP/ICMP6 header starts.
@ -113,7 +104,14 @@ in6_cksum(m, nxt, off, len)
int srcifid = 0, dstifid = 0;
#endif
struct ip6_hdr *ip6;
union {
u_int16_t phs[4];
struct {
u_int32_t ph_len;
u_int8_t ph_zero[3];
u_int8_t ph_nxt;
} ph __attribute__((__packed__));
} uph;
union {
u_int8_t c[2];
u_int16_t s;
@ -129,6 +127,8 @@ in6_cksum(m, nxt, off, len)
m->m_pkthdr.len, off, len);
}
bzero(&uph, sizeof(uph));
/*
* First create IP6 pseudo header and calculate a summary.
*/