diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-24 09:35:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-24 09:35:18 -0500 |
| commit | 30c27abd28fa168d7ebd2e5286f1fe473c74bfa9 (patch) | |
| tree | 9936b38c0c81cd430d5e75906c1207d127fe588c /include/uapi/linux/ip_vs.h | |
| parent | 16ec790938d4f356c82fab27b9a9adf4d6fe19a6 (diff) | |
| parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) | |
Merge tag 'v3.13-rc1' into asoc-arizona
Linux 3.13-rc1
Diffstat (limited to 'include/uapi/linux/ip_vs.h')
| -rw-r--r-- | include/uapi/linux/ip_vs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/ip_vs.h b/include/uapi/linux/ip_vs.h index 29458223d044..fbcffe8041f7 100644 --- a/include/uapi/linux/ip_vs.h +++ b/include/uapi/linux/ip_vs.h | |||
| @@ -334,7 +334,7 @@ enum { | |||
| 334 | __IPVS_CMD_ATTR_MAX, | 334 | __IPVS_CMD_ATTR_MAX, |
| 335 | }; | 335 | }; |
| 336 | 336 | ||
| 337 | #define IPVS_CMD_ATTR_MAX (__IPVS_SVC_ATTR_MAX - 1) | 337 | #define IPVS_CMD_ATTR_MAX (__IPVS_CMD_ATTR_MAX - 1) |
| 338 | 338 | ||
| 339 | /* | 339 | /* |
| 340 | * Attributes used to describe a service | 340 | * Attributes used to describe a service |