summaryrefslogtreecommitdiff
path: root/patches/the-way-not-to-do-backports/0001-ethernet-igb
diff options
context:
space:
mode:
Diffstat (limited to 'patches/the-way-not-to-do-backports/0001-ethernet-igb')
-rw-r--r--patches/the-way-not-to-do-backports/0001-ethernet-igb/0001-igb_net_device_ops.patch6
-rw-r--r--patches/the-way-not-to-do-backports/0001-ethernet-igb/0002-igb_pci_sriov_configure.patch8
-rw-r--r--patches/the-way-not-to-do-backports/0001-ethernet-igb/0009-igb_vlan_rx_vid.patch6
-rw-r--r--patches/the-way-not-to-do-backports/0001-ethernet-igb/0012-igb_ndo_set_vf_spoofchk.patch6
4 files changed, 13 insertions, 13 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)
diff --git a/patches/the-way-not-to-do-backports/0001-ethernet-igb/0002-igb_pci_sriov_configure.patch b/patches/the-way-not-to-do-backports/0001-ethernet-igb/0002-igb_pci_sriov_configure.patch
index 49c29ee8..9409c8ae 100644
--- a/patches/the-way-not-to-do-backports/0001-ethernet-igb/0002-igb_pci_sriov_configure.patch
+++ b/patches/the-way-not-to-do-backports/0001-ethernet-igb/0002-igb_pci_sriov_configure.patch
@@ -22,7 +22,7 @@ index f2a5abf..dd878b6 100644
.err_handler = &igb_err_handler
};
-@@ -7600,6 +7604,7 @@ static int igb_sriov_reinit(struct pci_d
+@@ -7602,6 +7606,7 @@ static int igb_sriov_reinit(struct pci_d
return 0;
}
@@ -30,7 +30,7 @@ index f2a5abf..dd878b6 100644
static int igb_pci_disable_sriov(struct pci_dev *dev)
{
int err = igb_disable_sriov(dev);
-@@ -7609,6 +7614,7 @@ static int igb_pci_disable_sriov(struct
+@@ -7611,6 +7616,7 @@ static int igb_pci_disable_sriov(struct
return err;
}
@@ -38,7 +38,7 @@ index f2a5abf..dd878b6 100644
static int igb_pci_enable_sriov(struct pci_dev *dev, int num_vfs)
{
-@@ -7626,6 +7632,8 @@ out:
+@@ -7628,6 +7634,8 @@ out:
}
#endif
@@ -47,7 +47,7 @@ index f2a5abf..dd878b6 100644
static int igb_pci_sriov_configure(struct pci_dev *dev, int num_vfs)
{
#ifdef CONFIG_PCI_IOV
-@@ -7636,6 +7644,7 @@ static int igb_pci_sriov_configure(struc
+@@ -7638,6 +7646,7 @@ static int igb_pci_sriov_configure(struc
#endif
return 0;
}
diff --git a/patches/the-way-not-to-do-backports/0001-ethernet-igb/0009-igb_vlan_rx_vid.patch b/patches/the-way-not-to-do-backports/0001-ethernet-igb/0009-igb_vlan_rx_vid.patch
index a2021aea..4ad3c86a 100644
--- a/patches/the-way-not-to-do-backports/0001-ethernet-igb/0009-igb_vlan_rx_vid.patch
+++ b/patches/the-way-not-to-do-backports/0001-ethernet-igb/0009-igb_vlan_rx_vid.patch
@@ -18,7 +18,7 @@ index 37e6062..6bf0a88 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 *);
-@@ -7266,8 +7269,10 @@ static void igb_vlan_mode(struct net_dev
+@@ -7268,8 +7271,10 @@ static void igb_vlan_mode(struct net_dev
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
static int igb_vlan_rx_add_vid(struct net_device *netdev,
__be16 proto, u16 vid)
@@ -30,7 +30,7 @@ index 37e6062..6bf0a88 100644
#endif
{
struct igb_adapter *adapter = netdev_priv(netdev);
-@@ -7282,15 +7287,19 @@ static int igb_vlan_rx_add_vid(struct ne
+@@ -7284,15 +7289,19 @@ static int igb_vlan_rx_add_vid(struct ne
set_bit(vid, adapter->active_vlans);
@@ -52,7 +52,7 @@ index 37e6062..6bf0a88 100644
{
struct igb_adapter *adapter = netdev_priv(netdev);
struct e1000_hw *hw = &adapter->hw;
-@@ -7306,7 +7315,9 @@ static int igb_vlan_rx_kill_vid(struct n
+@@ -7308,7 +7317,9 @@ static int igb_vlan_rx_kill_vid(struct n
clear_bit(vid, adapter->active_vlans);
diff --git a/patches/the-way-not-to-do-backports/0001-ethernet-igb/0012-igb_ndo_set_vf_spoofchk.patch b/patches/the-way-not-to-do-backports/0001-ethernet-igb/0012-igb_ndo_set_vf_spoofchk.patch
index a2c5ddb7..477a7c6f 100644
--- a/patches/the-way-not-to-do-backports/0001-ethernet-igb/0012-igb_ndo_set_vf_spoofchk.patch
+++ b/patches/the-way-not-to-do-backports/0001-ethernet-igb/0012-igb_ndo_set_vf_spoofchk.patch
@@ -23,7 +23,7 @@ index 35ac7d8..e609f71 100644
.ndo_get_vf_config = igb_ndo_get_vf_config,
#ifdef CONFIG_NET_POLL_CONTROLLER
.ndo_poll_controller = igb_netpoll,
-@@ -7935,6 +7939,7 @@ static int igb_ndo_set_vf_bw(struct net_
+@@ -7937,6 +7941,7 @@ static int igb_ndo_set_vf_bw(struct net_
return 0;
}
@@ -31,7 +31,7 @@ index 35ac7d8..e609f71 100644
static int igb_ndo_set_vf_spoofchk(struct net_device *netdev, int vf,
bool setting)
{
-@@ -7961,6 +7966,7 @@ static int igb_ndo_set_vf_spoofchk(struc
+@@ -7963,6 +7968,7 @@ static int igb_ndo_set_vf_spoofchk(struc
adapter->vf_data[vf].spoofchk_enabled = setting;
return E1000_SUCCESS;
}
@@ -39,7 +39,7 @@ index 35ac7d8..e609f71 100644
static int igb_ndo_get_vf_config(struct net_device *netdev,
int vf, struct ifla_vf_info *ivi)
-@@ -7973,7 +7979,9 @@ static int igb_ndo_get_vf_config(struct
+@@ -7975,7 +7981,9 @@ static int igb_ndo_get_vf_config(struct
ivi->tx_rate = adapter->vf_data[vf].tx_rate;
ivi->vlan = adapter->vf_data[vf].pf_vlan;
ivi->qos = adapter->vf_data[vf].pf_qos;