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 commit 'origin/master' into next
[pandora-kernel.git]
/
drivers
/
net
/
e1000e
/
param.c
diff --git
a/drivers/net/e1000e/param.c
b/drivers/net/e1000e/param.c
index
e909f96
..
1342e0b
100644
(file)
--- a/
drivers/net/e1000e/param.c
+++ b/
drivers/net/e1000e/param.c
@@
-427,6
+427,8
@@
void __devinit e1000e_check_options(struct e1000_adapter *adapter)
e1000_validate_option(&crc_stripping, &opt, adapter);
if (crc_stripping == OPTION_ENABLED)
adapter->flags2 |= FLAG2_CRC_STRIPPING;
+ } else {
+ adapter->flags2 |= FLAG2_CRC_STRIPPING;
}
}
{ /* Kumeran Lock Loss Workaround */