diff options
| author | Luis R. Rodriguez <mcgrof@suse.com> | 2014-05-01 13:48:23 -0700 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-05-01 18:44:14 -0700 |
| commit | a559c48f39eabfc327411c0e9c4d4f0eb8b1fb28 (patch) | |
| tree | 478a6628aeec3547344866fcd75fe482ef720d9f /patches | |
| parent | f941ed3515d6852dab300d6e746ba9caf74e72f6 (diff) | |
backports: fix igb patch for next-20140501
Manual fixes were needed for:
patches/the-way-not-to-do-backports/0001-ethernet-igb/0001-igb_net_device_ops.patch
We currently hit a compile error as of next-20140501 because of the
introduction of smp_mb__after_atomic(). This is not yet addressed.
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/the-way-not-to-do-backports/0001-ethernet-igb/0001-igb_net_device_ops.patch | 14 |
1 files changed, 6 insertions, 8 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..e4642836 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 @@ -1,11 +1,9 @@ -diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c -index 14ad4c7..f2a5abf 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c -@@ -160,8 +160,13 @@ static int igb_ioctl(struct net_device * - static void igb_tx_timeout(struct net_device *); +@@ -157,8 +157,13 @@ static void igb_tx_timeout(struct net_de static void igb_reset_task(struct work_struct *); - static void igb_vlan_mode(struct net_device *netdev, netdev_features_t features); + static void igb_vlan_mode(struct net_device *netdev, + netdev_features_t features); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) static int igb_vlan_rx_add_vid(struct net_device *, __be16, u16); static int igb_vlan_rx_kill_vid(struct net_device *, __be16, u16); @@ -16,7 +14,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 +@@ -7257,8 +7262,12 @@ static void igb_vlan_mode(struct net_dev igb_rlpml_set(adapter); } @@ -29,7 +27,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 +@@ -7275,8 +7284,12 @@ static int igb_vlan_rx_add_vid(struct ne return 0; } @@ -42,7 +40,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_ +@@ -7302,7 +7315,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) |