summaryrefslogtreecommitdiff
path: root/patches/the-way-not-to-do-backports/0001-ethernet-igb/0001-igb_net_device_ops.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-06-17 21:37:24 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2014-06-18 21:43:55 +0200
commitfcc5f1904d32847d17c9d7b0f7991b6b84ec754b (patch)
tree7c9d0e6186dff71b1c8862c64e868aabeb78b14b /patches/the-way-not-to-do-backports/0001-ethernet-igb/0001-igb_net_device_ops.patch
parent6e5603fa9e5b0d3c602eb1672473e81a1692f61e (diff)
backports: refresh on 3.15.1v3.15.1-1
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 ] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/the-way-not-to-do-backports/0001-ethernet-igb/0001-igb_net_device_ops.patch')
-rw-r--r--patches/the-way-not-to-do-backports/0001-ethernet-igb/0001-igb_net_device_ops.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/the-way-not-to-do-backports/0001-ethernet-igb/0001-igb_net_device_ops.patch b/patches/the-way-not-to-do-backports/0001-ethernet-igb/0001-igb_net_device_ops.patch
index 97ad8aa8..5758e9b4 100644
--- a/patches/the-way-not-to-do-backports/0001-ethernet-igb/0001-igb_net_device_ops.patch
+++ b/patches/the-way-not-to-do-backports/0001-ethernet-igb/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 *);
-@@ -7249,8 +7254,12 @@ static void igb_vlan_mode(struct net_dev
+@@ -7251,8 +7256,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;
-@@ -7267,8 +7276,12 @@ static int igb_vlan_rx_add_vid(struct ne
+@@ -7269,8 +7278,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;
-@@ -7294,7 +7307,11 @@ static void igb_restore_vlan(struct igb_
+@@ -7296,7 +7309,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)