diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-08-22 17:18:55 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2007-08-22 17:18:55 +1000 |
| commit | df9ec77b6bfd533e39e616b34a9b54a47158b63c (patch) | |
| tree | c6b397e5bcc8c298eedef3b967f52121258abf6b /ctdb/common/system_linux.c | |
| parent | 95f6328678e3d8735fa692425f1396f684956d42 (diff) | |
| download | samba-df9ec77b6bfd533e39e616b34a9b54a47158b63c.tar.gz samba-df9ec77b6bfd533e39e616b34a9b54a47158b63c.tar.xz samba-df9ec77b6bfd533e39e616b34a9b54a47158b63c.zip | |
merge from volker
(This used to be ctdb commit a5587b3c065f7115ad5e55429c2c9d9923d3b4dc)
Diffstat (limited to 'ctdb/common/system_linux.c')
| -rw-r--r-- | ctdb/common/system_linux.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ctdb/common/system_linux.c b/ctdb/common/system_linux.c index 2b054cd446..ba2c4dfc83 100644 --- a/ctdb/common/system_linux.c +++ b/ctdb/common/system_linux.c @@ -161,8 +161,10 @@ static uint16_t tcp_checksum(uint16_t *data, size_t n, struct iphdr *ip) { uint32_t sum = uint16_checksum(data, n); uint16_t sum2; - sum += uint16_checksum((uint16_t *)&ip->saddr, sizeof(ip->saddr)); - sum += uint16_checksum((uint16_t *)&ip->daddr, sizeof(ip->daddr)); + sum += uint16_checksum((uint16_t *)(void *)&ip->saddr, + sizeof(ip->saddr)); + sum += uint16_checksum((uint16_t *)(void *)&ip->daddr, + sizeof(ip->daddr)); sum += ip->protocol + n; sum = (sum & 0xFFFF) + (sum >> 16); sum = (sum & 0xFFFF) + (sum >> 16); |