diff options
| author | Stefan Assmann <sassmann@kpanic.de> | 2014-01-29 10:19:04 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-02-01 00:30:39 +0100 |
| commit | 8e146028ec1281bb5bad65e66aff2f8d520d981d (patch) | |
| tree | 7e289405726445e02ab3b594ed6102c540a899c2 /patches/collateral-evolutions/network | |
| parent | 98ee83982e19ad71b1b7bc98ab1a9111cb1a3215 (diff) | |
backports: igb fixes for linux-3.5
- add EEE defines
- backport __skb_alloc_page and __skb_alloc_pages
- add patches/collateral-evolutions/network/84-ethernet/0006-igb_eee.patch
Signed-off-by: Stefan Assmann <sassmann@kpanic.de>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network')
| -rw-r--r-- | patches/collateral-evolutions/network/84-ethernet/0006-igb_eee.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/patches/collateral-evolutions/network/84-ethernet/0006-igb_eee.patch b/patches/collateral-evolutions/network/84-ethernet/0006-igb_eee.patch new file mode 100644 index 00000000..334ca44d --- /dev/null +++ b/patches/collateral-evolutions/network/84-ethernet/0006-igb_eee.patch @@ -0,0 +1,31 @@ +diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c +index 9b15820..9767f11 100644 +--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c ++++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c +@@ -2590,6 +2590,7 @@ static int igb_set_rxnfc(struct net_devi + return ret; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) + static int igb_get_eee(struct net_device *netdev, struct ethtool_eee *edata) + { + struct igb_adapter *adapter = netdev_priv(netdev); +@@ -2718,6 +2719,7 @@ static int igb_set_eee(struct net_device + + return 0; + } ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) */ + + static int igb_get_module_info(struct net_device *netdev, + struct ethtool_modinfo *modinfo) +@@ -3006,8 +3008,10 @@ static const struct ethtool_ops igb_etht + .get_ts_info = igb_get_ts_info, + .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 + .get_module_info = igb_get_module_info, + .get_module_eeprom = igb_get_module_eeprom, + .get_rxfh_indir_size = igb_get_rxfh_indir_size, |