diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-17 09:26:58 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-17 09:26:58 +0400 |
| commit | 6811d58fc148c393f80a9f5a9db49d7e75cdc546 (patch) | |
| tree | c25d5b0e49ec848943d35f819e748d157ccb492e /include/linux/if_link.h | |
| parent | c4949f074332a64baeb2ead6ab9319ca37642f96 (diff) | |
| parent | c02db8c6290bb992442fec1407643c94cc414375 (diff) | |
| download | linux-6811d58fc148c393f80a9f5a9db49d7e75cdc546.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
include/linux/if_link.h
Diffstat (limited to 'include/linux/if_link.h')
| -rw-r--r-- | include/linux/if_link.h | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/include/linux/if_link.h b/include/linux/if_link.h index cfd420ba72df..c3af67fce3f2 100644 --- a/include/linux/if_link.h +++ b/include/linux/if_link.h @@ -111,10 +111,7 @@ enum { IFLA_NET_NS_PID, IFLA_IFALIAS, IFLA_NUM_VF, /* Number of VFs if device is SR-IOV PF */ - IFLA_VF_MAC, /* Hardware queue specific attributes */ - IFLA_VF_VLAN, - IFLA_VF_TX_RATE, /* TX Bandwidth Allocation */ - IFLA_VFINFO, + IFLA_VFINFO_LIST, IFLA_STATS64, __IFLA_MAX }; @@ -236,6 +233,24 @@ enum macvlan_mode { /* SR-IOV virtual function managment section */ +enum { + IFLA_VF_INFO_UNSPEC, + IFLA_VF_INFO, + __IFLA_VF_INFO_MAX, +}; + +#define IFLA_VF_INFO_MAX (__IFLA_VF_INFO_MAX - 1) + +enum { + IFLA_VF_UNSPEC, + IFLA_VF_MAC, /* Hardware queue specific attributes */ + IFLA_VF_VLAN, + IFLA_VF_TX_RATE, /* TX Bandwidth Allocation */ + __IFLA_VF_MAX, +}; + +#define IFLA_VF_MAX (__IFLA_VF_MAX - 1) + struct ifla_vf_mac { __u32 vf; __u8 mac[32]; /* MAX_ADDR_LEN */ |