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-12-21 19:10:52 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2014-12-21 22:34:43 +0100
commit5e9ec4c59a8b6dd9cf970754255ec61922462c99 (patch)
treef62e524980e365e2378ed3ea48f03679eafbf371 /patches/collateral-evolutions/network/0043-ndo_set_vf_rate/igb.patch
parent3dc16aef2e0e29da915fc2be645bb364cd5d885f (diff)
patches: refresh patches on top of v3.18.1v3.18.1-1linux-3.18.y
1 3.0.101 [ OK ] 2 3.1.10 [ OK ] 3 3.2.65 [ OK ] 4 3.3.8 [ OK ] 5 3.4.105 [ 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.63 [ OK ] 12 3.11.10 [ OK ] 13 3.12.35 [ OK ] 14 3.13.11 [ OK ] 15 3.14.27 [ OK ] 16 3.15.10 [ OK ] 17 3.16.6 [ OK ] 18 3.17.7 [ OK ] 19 3.18.1 [ 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.patch10
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 498b2713..2acc9549 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);
-@@ -2104,7 +2108,11 @@ static const struct net_device_ops igb_n
+@@ -2107,7 +2111,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) */
-@@ -7853,8 +7861,12 @@ static void igb_check_vf_rate_limit(stru
+@@ -7866,8 +7874,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;
-@@ -7863,6 +7875,7 @@ static int igb_ndo_set_vf_bw(struct net_
+@@ -7876,6 +7888,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;
-@@ -7876,7 +7889,17 @@ static int igb_ndo_set_vf_bw(struct net_
+@@ -7889,7 +7902,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;
}
-@@ -7917,8 +7940,12 @@ static int igb_ndo_get_vf_config(struct
+@@ -7930,8 +7953,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);