git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
[pandora-kernel.git]
/
drivers
/
net
/
benet
/
be.h
diff --git
a/drivers/net/benet/be.h
b/drivers/net/benet/be.h
index
373c1a5
..
b46be49
100644
(file)
--- a/
drivers/net/benet/be.h
+++ b/
drivers/net/benet/be.h
@@
-283,6
+283,8
@@
struct be_adapter {
u8 port_type;
u8 transceiver;
u8 generation; /* BladeEngine ASIC generation */
+ u32 flash_status;
+ struct completion flash_compl;
bool sriov_enabled;
u32 vf_if_handle[BE_MAX_VF];