diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
| commit | 709334c87dbdb44150ce436b3d13c814db0dcae9 (patch) | |
| tree | 5861a45f70c1f283720337abd864498f5afb3dbe /include/linux/if_bonding.h | |
| parent | 0d64b568fcd48b133721c1d322e7c51d85eb12df (diff) | |
| parent | f74890277a196949e4004fe2955e1d4fb3930f98 (diff) | |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-linus
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; |