diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 19:10:39 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 19:10:39 -0400 |
commit | 739cdbf1d8f0739b80035b80d69d871e33749b86 (patch) | |
tree | 15134df8723ab7d7a5524c99070f02d5739bad0d /drivers/net/bonding/bonding.h | |
parent | 83bbecc905b3431c60fe282830e09aaaab97b26a (diff) | |
parent | 8f3d17fb7bcb7c255197d11469fb5e9695c9d2f4 (diff) | |
download | op-kernel-dev-739cdbf1d8f0739b80035b80d69d871e33749b86.zip op-kernel-dev-739cdbf1d8f0739b80035b80d69d871e33749b86.tar.gz |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/net/bonding/bonding.h')
-rw-r--r-- | drivers/net/bonding/bonding.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index d27f377..3881969 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h @@ -211,6 +211,9 @@ struct bonding { struct bond_params params; struct list_head vlan_list; struct vlan_group *vlgrp; + /* the features the bonding device supports, independently + * of any slaves */ + int bond_features; }; /** |