projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[linux-drm-fsl-dcu.git]
/
drivers
/
net
/
ethernet
/
intel
/
igb
/
e1000_hw.h
diff --git
a/drivers/net/ethernet/intel/igb/e1000_hw.h
b/drivers/net/ethernet/intel/igb/e1000_hw.h
index 2e166b22d52b6374e3814a9526d6cad9decfa5a3..ab99e2b582a85c7b445d54ec85f867c431cf1e29 100644
(file)
--- a/
drivers/net/ethernet/intel/igb/e1000_hw.h
+++ b/
drivers/net/ethernet/intel/igb/e1000_hw.h
@@
-533,6
+533,9
@@
struct e1000_dev_spec_82575 {
bool clear_semaphore_once;
struct e1000_sfp_flags eth_flags;
bool module_plugged;
+ u8 media_port;
+ bool media_changed;
+ bool mas_capable;
};
struct e1000_hw {