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/if_bonding.h | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'include/linux/if_bonding.h')
| -rw-r--r-- | include/linux/if_bonding.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/if_bonding.h b/include/linux/if_bonding.h index 65c2d247068b..cd525fae3c98 100644 --- a/include/linux/if_bonding.h +++ b/include/linux/if_bonding.h | |||
| @@ -94,8 +94,7 @@ typedef struct ifbond { | |||
| 94 | __s32 miimon; | 94 | __s32 miimon; |
| 95 | } ifbond; | 95 | } ifbond; |
| 96 | 96 | ||
| 97 | typedef struct ifslave | 97 | typedef struct ifslave { |
| 98 | { | ||
| 99 | __s32 slave_id; /* Used as an IN param to the BOND_SLAVE_INFO_QUERY ioctl */ | 98 | __s32 slave_id; /* Used as an IN param to the BOND_SLAVE_INFO_QUERY ioctl */ |
| 100 | char slave_name[IFNAMSIZ]; | 99 | char slave_name[IFNAMSIZ]; |
| 101 | __s8 link; | 100 | __s8 link; |