diff options
| author | Jeff Garzik <jgarzik@redhat.com> | 2004-02-06 13:43:42 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2004-02-06 13:43:42 -0500 |
| commit | fddafab1fa9a318b86d186d45946c167fef5c8ef (patch) | |
| tree | db009f8730c26f693466a2f67df0d2bddbd8d084 /include/linux | |
| parent | f4d8611049b6a0e69973f263c93e4c71c854be82 (diff) | |
| parent | 3649733b0e2883dd3df62fed7780561db27a6e7a (diff) | |
Merge redhat.com:/spare/repo/linux-2.5
into redhat.com:/spare/repo/netdev-2.6/bonding-2
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/if_bonding.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/if_bonding.h b/include/linux/if_bonding.h index 0f2382b5c755..57024ce2c74f 100644 --- a/include/linux/if_bonding.h +++ b/include/linux/if_bonding.h @@ -32,6 +32,9 @@ * 2003/05/01 - Amir Noam <amir.noam at intel dot com> * - Added ABI version control to restore compatibility between * new/old ifenslave and new/old bonding. + * + * 2003/12/01 - Shmulik Hen <shmulik.hen at intel dot com> + * - Code cleanup and style changes */ #ifndef _LINUX_IF_BONDING_H @@ -86,7 +89,7 @@ typedef struct ifbond { typedef struct ifslave { __s32 slave_id; /* Used as an IN param to the BOND_SLAVE_INFO_QUERY ioctl */ - __s8 slave_name[IFNAMSIZ]; + char slave_name[IFNAMSIZ]; __s8 link; __s8 state; __u32 link_failure_count; |