summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/84-ethernet/0001-igb_net_device_ops.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-09-07 12:56:05 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2014-10-25 16:20:25 +0200
commit7793930ad12f67c15bab95fa3cea34345472722f (patch)
tree473259b8f63713fced5b92f0306df03ac38e96da /patches/collateral-evolutions/network/84-ethernet/0001-igb_net_device_ops.patch
parent36f33cbcb7b2652850f76a7413adf17f12fdf5e8 (diff)
backports: refresh on v3.14.22v3.14.22-1linux-3.14.y
1 3.0.101 [ OK ] 2 3.1.10 [ OK ] 3 3.2.62 [ OK ] 4 3.3.8 [ OK ] 5 3.4.104 [ 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.58 [ OK ] 12 3.11.10 [ OK ] 13 3.12.31 [ OK ] 14 3.13.11 [ OK ] 15 3.14.22 [ OK ] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/84-ethernet/0001-igb_net_device_ops.patch')
-rw-r--r--patches/collateral-evolutions/network/84-ethernet/0001-igb_net_device_ops.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/collateral-evolutions/network/84-ethernet/0001-igb_net_device_ops.patch b/patches/collateral-evolutions/network/84-ethernet/0001-igb_net_device_ops.patch
index e07ec866..eab4041b 100644
--- a/patches/collateral-evolutions/network/84-ethernet/0001-igb_net_device_ops.patch
+++ b/patches/collateral-evolutions/network/84-ethernet/0001-igb_net_device_ops.patch
@@ -16,7 +16,7 @@ index 14ad4c7..f2a5abf 100644
static void igb_restore_vlan(struct igb_adapter *);
static void igb_rar_set_qsel(struct igb_adapter *, u8 *, u32 , u8);
static void igb_ping_all_vfs(struct igb_adapter *);
-@@ -7168,8 +7173,12 @@ static void igb_vlan_mode(struct net_dev
+@@ -7189,8 +7194,12 @@ static void igb_vlan_mode(struct net_dev
igb_rlpml_set(adapter);
}
@@ -29,7 +29,7 @@ index 14ad4c7..f2a5abf 100644
{
struct igb_adapter *adapter = netdev_priv(netdev);
struct e1000_hw *hw = &adapter->hw;
-@@ -7186,8 +7195,12 @@ static int igb_vlan_rx_add_vid(struct ne
+@@ -7207,8 +7216,12 @@ static int igb_vlan_rx_add_vid(struct ne
return 0;
}
@@ -42,7 +42,7 @@ index 14ad4c7..f2a5abf 100644
{
struct igb_adapter *adapter = netdev_priv(netdev);
struct e1000_hw *hw = &adapter->hw;
-@@ -7213,7 +7226,11 @@ static void igb_restore_vlan(struct igb_
+@@ -7234,7 +7247,11 @@ static void igb_restore_vlan(struct igb_
igb_vlan_mode(adapter->netdev, adapter->netdev->features);
for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)