diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2008-07-03 16:24:06 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2008-07-03 16:24:06 -0400 |
| commit | e86322f611eef95aafaf726fd3965e5b211f1985 (patch) | |
| tree | 28547e26df4fc6ae671dc8cc6912a53717e4db08 /include/linux/inetdevice.h | |
| parent | b001a1b6aa960949a24c2cdc28257dfcc9428d74 (diff) | |
| parent | 8948896c9e098c6fd31a6a698a598a7cbd7fa40e (diff) | |
Merge branch 'for-bfields' of git://linux-nfs.org/~tomtucker/xprt-switch-2.6 into for-2.6.27
Diffstat (limited to 'include/linux/inetdevice.h')
| -rw-r--r-- | include/linux/inetdevice.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h index 7009b0cdd06f..c6f51ad52d5b 100644 --- a/include/linux/inetdevice.h +++ b/include/linux/inetdevice.h | |||
| @@ -117,7 +117,6 @@ struct in_ifaddr | |||
| 117 | __be32 ifa_address; | 117 | __be32 ifa_address; |
| 118 | __be32 ifa_mask; | 118 | __be32 ifa_mask; |
| 119 | __be32 ifa_broadcast; | 119 | __be32 ifa_broadcast; |
| 120 | __be32 ifa_anycast; | ||
| 121 | unsigned char ifa_scope; | 120 | unsigned char ifa_scope; |
| 122 | unsigned char ifa_flags; | 121 | unsigned char ifa_flags; |
| 123 | unsigned char ifa_prefixlen; | 122 | unsigned char ifa_prefixlen; |