From f82cf56b854bbfb54957ccc7f3e258c31d1a8afe Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Fri, 25 Jul 2014 20:56:35 +0200 Subject: backports: refresh on next-20140725 1 3.0.101 [ OK ] 2 3.1.10 [ OK ] 3 3.2.60 [ OK ] 4 3.3.8 [ OK ] 5 3.4.93 [ 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.43 [ OK ] 12 3.11.10 [ OK ] 13 3.12.22 [ OK ] 14 3.13.11 [ OK ] 15 3.14.7 [ OK ] 16 3.15.0 [ OK ] 17 3.16-rc1 [ OK ] Signed-off-by: Hauke Mehrtens --- .../collateral-evolutions/network/0043-ndo_set_vf_rate/igb.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'patches/collateral-evolutions/network/0043-ndo_set_vf_rate/igb.patch') 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 daa85b53..e8f54194 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) */ -@@ -7931,8 +7939,12 @@ static void igb_check_vf_rate_limit(stru +@@ -7947,8 +7955,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; -@@ -7941,6 +7953,7 @@ static int igb_ndo_set_vf_bw(struct net_ +@@ -7957,6 +7969,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; -@@ -7954,7 +7967,17 @@ static int igb_ndo_set_vf_bw(struct net_ +@@ -7970,7 +7983,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; } -@@ -7995,8 +8018,12 @@ static int igb_ndo_get_vf_config(struct +@@ -8011,8 +8034,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); -- cgit v1.2.3