diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /include/linux/ip_vs.h | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'include/linux/ip_vs.h')
| -rw-r--r-- | include/linux/ip_vs.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/ip_vs.h b/include/linux/ip_vs.h index 148265e63e8d..dfc170362842 100644 --- a/include/linux/ip_vs.h +++ b/include/linux/ip_vs.h | |||
| @@ -127,8 +127,7 @@ struct ip_vs_dest_user { | |||
| 127 | /* | 127 | /* |
| 128 | * IPVS statistics object (for user space) | 128 | * IPVS statistics object (for user space) |
| 129 | */ | 129 | */ |
| 130 | struct ip_vs_stats_user | 130 | struct ip_vs_stats_user { |
| 131 | { | ||
| 132 | __u32 conns; /* connections scheduled */ | 131 | __u32 conns; /* connections scheduled */ |
| 133 | __u32 inpkts; /* incoming packets */ | 132 | __u32 inpkts; /* incoming packets */ |
| 134 | __u32 outpkts; /* outgoing packets */ | 133 | __u32 outpkts; /* outgoing packets */ |