diff options
| author | Andreas Schwab <schwab@redhat.com> | 2009-07-29 13:41:25 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2009-07-29 13:41:25 +0200 |
| commit | ac285df609a4cdd7fe09949bfe0d650a82d9942f (patch) | |
| tree | 4735e2e6ddc539475f3820d4aea955206fc8c077 /inet | |
| parent | 6bdb5f22a0ee205c45d1f465a8b39179830a14cb (diff) | |
| parent | c97164f05ba8fa5d2ebf30f1c2de083bc1ead1e1 (diff) | |
Merge commit 'origin/release/2.10/master' into fedora/2.10/master
Diffstat (limited to 'inet')
| -rw-r--r-- | inet/.cvsignore | 6 | ||||
| -rw-r--r-- | inet/netinet/icmp6.h | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/inet/.cvsignore b/inet/.cvsignore deleted file mode 100644 index 3fc9f4cdf1..0000000000 --- a/inet/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -*.d *.o *.so *.po *.go stamp.* *.stamp *.ustamp *.udeps -*.gz *.Z *.tar *.tgz -=* -TODO COPYING* AUTHORS copyr-* copying.* -glibc-* -distinfo diff --git a/inet/netinet/icmp6.h b/inet/netinet/icmp6.h index 0cb1aa6a6c..82893daa99 100644 --- a/inet/netinet/icmp6.h +++ b/inet/netinet/icmp6.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1997,2000,2006 Free Software Foundation, Inc. +/* Copyright (C) 1991-1997,2000,2006,2009 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -339,7 +339,7 @@ struct nd_opt_home_agent_info uint8_t nd_opt_home_agent_info_type; uint8_t nd_opt_home_agent_info_len; uint16_t nd_opt_home_agent_info_reserved; - int16_t nd_opt_home_agent_info_preference; + uint16_t nd_opt_home_agent_info_preference; uint16_t nd_opt_home_agent_info_lifetime; }; |