diff options
author | Stefan Assmann <sassmann@kpanic.de> | 2014-01-29 10:19:08 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-02-01 00:31:30 +0100 |
commit | b8fc7e80cb5842f91abb1311c6538c28618a3892 (patch) | |
tree | bdfa82e359e894880aca0a886b40100afb7c7e00 /patches/collateral-evolutions/network/84-ethernet/0011-igb_ethtool_ops.patch | |
parent | 255a290f0705b06fd037dcb7206048a48ed92291 (diff) |
backports: igb fixes for linux-3.1
- add IFF_UNICAST_FLT define
- add PCI_DEV_FLAGS_ASSIGNED define
- add skb_frag_size_sub()
- add skb_frag_address()
- add patches/collateral-evolutions/network/84-ethernet/0011-igb_ethtool_ops.patch
- add patches/collateral-evolutions/network/84-ethernet/0012-igb_ndo_set_vf_spoofchk.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/84-ethernet/0011-igb_ethtool_ops.patch')
-rw-r--r-- | patches/collateral-evolutions/network/84-ethernet/0011-igb_ethtool_ops.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/patches/collateral-evolutions/network/84-ethernet/0011-igb_ethtool_ops.patch b/patches/collateral-evolutions/network/84-ethernet/0011-igb_ethtool_ops.patch new file mode 100644 index 00000000..81fc2df7 --- /dev/null +++ b/patches/collateral-evolutions/network/84-ethernet/0011-igb_ethtool_ops.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 5e519ce..9f61f1d 100644 +--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c ++++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c +@@ -2413,6 +2413,7 @@ static int igb_get_ts_info(struct net_de + } + #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) */ + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) + static int igb_get_rss_hash_opts(struct igb_adapter *adapter, + struct ethtool_rxnfc *cmd) + { +@@ -2591,6 +2592,7 @@ static int igb_set_rxnfc(struct net_devi + + return ret; + } ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) */ + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) + static int igb_get_eee(struct net_device *netdev, struct ethtool_eee *edata) +@@ -3016,8 +3018,10 @@ static const struct ethtool_ops igb_etht + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) + .get_ts_info = igb_get_ts_info, + #endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) + .get_rxnfc = igb_get_rxnfc, + .set_rxnfc = igb_set_rxnfc, ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) + .get_eee = igb_get_eee, + .set_eee = igb_set_eee, |