projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote branch 'wireless-next/master' into ath6kl-next
[cascardo/linux.git]
/
drivers
/
net
/
ethernet
/
sfc
/
net_driver.h
diff --git
a/drivers/net/ethernet/sfc/net_driver.h
b/drivers/net/ethernet/sfc/net_driver.h
index
b8e251a
..
c49502b
100644
(file)
--- a/
drivers/net/ethernet/sfc/net_driver.h
+++ b/
drivers/net/ethernet/sfc/net_driver.h
@@
-908,7
+908,7
@@
struct efx_nic_type {
unsigned int phys_addr_channels;
unsigned int tx_dc_base;
unsigned int rx_dc_base;
-
u32
offload_features;
+
netdev_features_t
offload_features;
};
/**************************************************************************