diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-08-09 13:43:05 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-08-09 16:42:28 +0200 |
commit | 9eb338787fa1183183a371c63f98488c4ddc1104 (patch) | |
tree | d20c83a8c658bb10502ed1bf8e05b98bd4413bbc /patches/collateral-evolutions/network/0043-ndo_set_vf_rate | |
parent | 00d3fc79b53d1f9ddf88edbb81a71391a9bfffd7 (diff) |
backports: refresh patches on next-20140808
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 ]
Manual changes were done to:
patches/collateral-evolutions/network/0006-ieee802154-6lowpan-namespace.patch
This patch was removed:
patches/collateral-evolutions/network/0009-inet_frag_evictor.patch
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/0043-ndo_set_vf_rate')
-rw-r--r-- | patches/collateral-evolutions/network/0043-ndo_set_vf_rate/igb.patch | 8 |
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 e8f54194..ed1db41c 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) */ -@@ -7947,8 +7955,12 @@ static void igb_check_vf_rate_limit(stru +@@ -7972,8 +7980,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; -@@ -7957,6 +7969,7 @@ static int igb_ndo_set_vf_bw(struct net_ +@@ -7982,6 +7994,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; -@@ -7970,7 +7983,17 @@ static int igb_ndo_set_vf_bw(struct net_ +@@ -7995,7 +8008,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; } -@@ -8011,8 +8034,12 @@ static int igb_ndo_get_vf_config(struct +@@ -8036,8 +8059,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); |