diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-07-02 12:01:31 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-07-02 12:01:31 -0400 |
| commit | 27eb2c4b3d3e13f376a359e293c212a2e9407af5 (patch) | |
| tree | 556aa7b5cd6eeb4214dec129c789515157187010 /include/uapi/linux/ip_vs.h | |
| parent | 5705b8aca5a80141de5637ff0e23b31b26f2c5bf (diff) | |
| parent | 67bf12ca50d524f9e225347fe63533562e2004de (diff) | |
Merge branch 'next' into for-linus
Prepare first set of updates for 3.11 merge window.
Diffstat (limited to 'include/uapi/linux/ip_vs.h')
| -rw-r--r-- | include/uapi/linux/ip_vs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/ip_vs.h b/include/uapi/linux/ip_vs.h index 8a2d438dc499..a24537725e80 100644 --- a/include/uapi/linux/ip_vs.h +++ b/include/uapi/linux/ip_vs.h | |||
| @@ -280,8 +280,8 @@ struct ip_vs_daemon_user { | |||
| 280 | #define IPVS_GENL_VERSION 0x1 | 280 | #define IPVS_GENL_VERSION 0x1 |
| 281 | 281 | ||
| 282 | struct ip_vs_flags { | 282 | struct ip_vs_flags { |
| 283 | __be32 flags; | 283 | __u32 flags; |
| 284 | __be32 mask; | 284 | __u32 mask; |
| 285 | }; | 285 | }; |
| 286 | 286 | ||
| 287 | /* Generic Netlink command attributes */ | 287 | /* Generic Netlink command attributes */ |