diff options
| author | Stefan Assmann <sassmann@kpanic.de> | 2014-01-29 10:19:05 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-02-01 00:31:05 +0100 |
| commit | b3c578eba470126a5cda33275b26adb841b803ae (patch) | |
| tree | b9a08efee376eba6a0a20fca5d155efc0b9a570a /patches | |
| parent | 8e146028ec1281bb5bad65e66aff2f8d520d981d (diff) | |
backports: igb fixes for linux-3.4
- add struct timestamp_event_queue
- add struct ptp_clock
- add ptp_clock_index()
- add patches/collateral-evolutions/network/84-ethernet/0007-igb_ethtool_ops.patch
Signed-off-by: Stefan Assmann <sassmann@kpanic.de>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/collateral-evolutions/network/84-ethernet/0007-igb_ethtool_ops.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/patches/collateral-evolutions/network/84-ethernet/0007-igb_ethtool_ops.patch b/patches/collateral-evolutions/network/84-ethernet/0007-igb_ethtool_ops.patch new file mode 100644 index 00000000..b4e666c7 --- /dev/null +++ b/patches/collateral-evolutions/network/84-ethernet/0007-igb_ethtool_ops.patch @@ -0,0 +1,56 @@ +diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c +index 9767f11..3cf9600 100644 +--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c ++++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c +@@ -2355,6 +2355,7 @@ static void igb_get_strings(struct net_d + } + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) + static int igb_get_ts_info(struct net_device *dev, + struct ethtool_ts_info *info) + { +@@ -2410,6 +2411,7 @@ static int igb_get_ts_info(struct net_de + return -EOPNOTSUPP; + } + } ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) */ + + static int igb_get_rss_hash_opts(struct igb_adapter *adapter, + struct ethtool_rxnfc *cmd) +@@ -2721,6 +2723,7 @@ static int igb_set_eee(struct net_device + } + #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) */ + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) + static int igb_get_module_info(struct net_device *netdev, + struct ethtool_modinfo *modinfo) + { +@@ -2799,6 +2802,7 @@ static int igb_get_module_eeprom(struct + + return 0; + } ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) */ + + static int igb_ethtool_begin(struct net_device *netdev) + { +@@ -3005,15 +3009,19 @@ static const struct ethtool_ops igb_etht + .get_ethtool_stats = igb_get_ethtool_stats, + .get_coalesce = igb_get_coalesce, + .set_coalesce = igb_set_coalesce, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) + .get_ts_info = igb_get_ts_info, ++#endif + .get_rxnfc = igb_get_rxnfc, + .set_rxnfc = igb_set_rxnfc, + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) + .get_eee = igb_get_eee, + .set_eee = igb_set_eee, + #endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) + .get_module_info = igb_get_module_info, + .get_module_eeprom = igb_get_module_eeprom, ++#endif + .get_rxfh_indir_size = igb_get_rxfh_indir_size, + .get_rxfh_indir = igb_get_rxfh_indir, + .set_rxfh_indir = igb_set_rxfh_indir, |