summaryrefslogtreecommitdiff
path: root/drivers/net/benet/be.h
diff options
context:
space:
mode:
authorDavid Vrabel <david.vrabel@csr.com>2010-02-25 16:35:22 +0300
committerDavid Vrabel <david.vrabel@csr.com>2010-02-25 16:35:22 +0300
commit03806fa20f6a081493a731a4b18ea66317f9f947 (patch)
tree630796c65c501e3612253ee4d4af58082a5f984c /drivers/net/benet/be.h
parent35fb2a816a06ded2a3ff83d896c34b83c8e1d556 (diff)
parentbaac35c4155a8aa826c70acee6553368ca5243a2 (diff)
downloadlinux-03806fa20f6a081493a731a4b18ea66317f9f947.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'drivers/net/benet/be.h')
-rw-r--r--drivers/net/benet/be.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h
index 9fd8e5ecd5d7..5bc74590c73e 100644
--- a/drivers/net/benet/be.h
+++ b/drivers/net/benet/be.h
@@ -276,8 +276,13 @@ struct be_adapter {
int link_speed;
u8 port_type;
u8 transceiver;
+ u8 generation; /* BladeEngine ASIC generation */
};
+/* BladeEngine Generation numbers */
+#define BE_GEN2 2
+#define BE_GEN3 3
+
extern const struct ethtool_ops be_ethtool_ops;
#define drvr_stats(adapter) (&adapter->stats.drvr_stats)