Merge branch 'master' into topic/robin/log-threads

Conflicts:
	cmake
This commit is contained in:
Jon Siwek 2012-03-30 12:02:32 -05:00
commit 256c0af98e
77 changed files with 1987 additions and 729 deletions

View file

@ -70,7 +70,6 @@ class IPAddr;
extern int ones_complement_checksum(const void* p, int b, uint32 sum);
extern int ones_complement_checksum(const IPAddr& a, uint32 sum);
extern int tcp_checksum(const struct ip* ip, const struct tcphdr* tp, int len);
extern int udp_checksum(const struct ip* ip, const struct udphdr* up, int len);
extern int udp6_checksum(const struct ip6_hdr* ip, const struct udphdr* up,
int len);