diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-07-10 22:35:13 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-07-23 23:33:22 +0200 |
commit | a7176940b9685a32c8172297c7f5ee369049067a (patch) | |
tree | 675f88182a9460c204f55f6c014b15ef2592a506 /patches/collateral-evolutions/network/0043-ndo_set_vf_rate/igb.patch | |
parent | 5fb6e1a4be888d612f36bdbc61824a820681d943 (diff) |
backports: refresh patches on next-20140710backports-20140710
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 <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.patch | 10 |
1 files changed, 5 insertions, 5 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..daa85b53 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 @@ -12,7 +12,7 @@ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) static int igb_ndo_set_vf_spoofchk(struct net_device *netdev, int vf, bool setting); -@@ -2102,7 +2106,11 @@ static const struct net_device_ops igb_n +@@ -2104,7 +2108,11 @@ static const struct net_device_ops igb_n .ndo_vlan_rx_kill_vid = igb_vlan_rx_kill_vid, .ndo_set_vf_mac = igb_ndo_set_vf_mac, .ndo_set_vf_vlan = igb_ndo_set_vf_vlan, @@ -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 +@@ -7931,8 +7939,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_ +@@ -7941,6 +7953,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_ +@@ -7954,7 +7967,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 +@@ -7995,8 +8018,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); |