summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/0043-ndo_set_vf_rate/igb.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-08-10 14:32:29 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2014-08-10 20:40:15 +0200
commit87df966fc0ad299a9102077c1cebe29d68e663a8 (patch)
treee56fa19869a244fb35b69db257b289c8404ceaf2 /patches/collateral-evolutions/network/0043-ndo_set_vf_rate/igb.patch
parent8bf29482ead8dac9346c275467581340e7b5208e (diff)
backports: refresh on v3.16v3.16-1
1 3.0.101 [ OK ] 2 3.1.10 [ OK ] 3 3.2.62 [ OK ] 4 3.3.8 [ OK ] 5 3.4.102 [ OK ] 6 3.5.7 [ OK ] 7 3.6.11 [ OK ] 8 3.7.10 [ OK ] 9 3.8.13 [ OK ] 10 3.9.11 [ OK ] 11 3.10.52 [ OK ] 12 3.11.10 [ OK ] 13 3.12.26 [ OK ] 14 3.13.11 [ OK ] 15 3.14.16 [ OK ] 16 3.15.7 [ OK ] 17 3.16.0 [ OK ] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/0043-ndo_set_vf_rate/igb.patch')
-rw-r--r--patches/collateral-evolutions/network/0043-ndo_set_vf_rate/igb.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/collateral-evolutions/network/0043-ndo_set_vf_rate/igb.patch b/patches/collateral-evolutions/network/0043-ndo_set_vf_rate/igb.patch
index 59a22e54..991ca566 100644
--- a/patches/collateral-evolutions/network/0043-ndo_set_vf_rate/igb.patch
+++ b/patches/collateral-evolutions/network/0043-ndo_set_vf_rate/igb.patch
@@ -24,7 +24,7 @@
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
.ndo_set_vf_spoofchk = igb_ndo_set_vf_spoofchk,
#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) */
-@@ -7929,8 +7937,12 @@ static void igb_check_vf_rate_limit(stru
+@@ -7945,8 +7953,12 @@ static void igb_check_vf_rate_limit(stru
}
}
@@ -37,7 +37,7 @@
{
struct igb_adapter *adapter = netdev_priv(netdev);
struct e1000_hw *hw = &adapter->hw;
-@@ -7939,6 +7951,7 @@ static int igb_ndo_set_vf_bw(struct net_
+@@ -7955,6 +7967,7 @@ static int igb_ndo_set_vf_bw(struct net_
if (hw->mac.type != e1000_82576)
return -EOPNOTSUPP;
@@ -45,7 +45,7 @@
if (min_tx_rate)
return -EINVAL;
-@@ -7952,7 +7965,17 @@ static int igb_ndo_set_vf_bw(struct net_
+@@ -7968,7 +7981,17 @@ static int igb_ndo_set_vf_bw(struct net_
adapter->vf_rate_link_speed = actual_link_speed;
adapter->vf_data[vf].tx_rate = (u16)max_tx_rate;
igb_set_vf_rate_limit(hw, vf, max_tx_rate, actual_link_speed);
@@ -63,7 +63,7 @@
return 0;
}
-@@ -7993,8 +8016,12 @@ static int igb_ndo_get_vf_config(struct
+@@ -8009,8 +8032,12 @@ static int igb_ndo_get_vf_config(struct
return -EINVAL;
ivi->vf = vf;
memcpy(&ivi->mac, adapter->vf_data[vf].vf_mac_addresses, ETH_ALEN);