projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[cascardo/linux.git]
/
drivers
/
net
/
ethernet
/
emulex
/
benet
/
be.h
diff --git
a/drivers/net/ethernet/emulex/benet/be.h
b/drivers/net/ethernet/emulex/benet/be.h
index
ee584c5
..
fe3763d
100644
(file)
--- a/
drivers/net/ethernet/emulex/benet/be.h
+++ b/
drivers/net/ethernet/emulex/benet/be.h
@@
-545,6
+545,7
@@
struct be_adapter {
struct delayed_work be_err_detection_work;
u8 recovery_retries;
u8 err_flags;
+ bool pcicfg_mapped; /* pcicfg obtained via pci_iomap() */
u32 flags;
u32 cmd_privileges;
/* Ethtool knobs and info */