diff options
| author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-03-29 22:09:57 +0000 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-04-08 18:16:21 -0700 |
| commit | ae919302cc8c1c93a1f1b8b7e086abfe13771286 (patch) | |
| tree | 97430c31a96601786ac27d7fb4920bf3b0f40633 /patches/collateral-evolutions/network/84-ethernet/0001-igb_net_device_ops.patch | |
| parent | 8680eb1be12f4121fa4a49cbf6b4e043cdbb1c73 (diff) | |
backports: refresh patches based on next-20140311backports-20140311
1 2.6.25 [ OK ]
2 2.6.26 [ OK ]
3 2.6.27 [ OK ]
4 2.6.28 [ OK ]
5 2.6.29 [ OK ]
6 2.6.30 [ OK ]
7 2.6.31 [ OK ]
8 2.6.32 [ OK ]
9 2.6.33 [ OK ]
10 2.6.34 [ OK ]
11 2.6.35 [ OK ]
12 2.6.36 [ OK ]
13 2.6.37 [ OK ]
14 2.6.38 [ OK ]
15 2.6.39 [ OK ]
16 3.0.101 [ OK ]
17 3.1.10 [ OK ]
18 3.2.54 [ OK ]
19 3.3.8 [ OK ]
20 3.4.79 [ OK ]
21 3.5.7 [ OK ]
22 3.6.11 [ OK ]
23 3.7.10 [ OK ]
24 3.8.13 [ OK ]
25 3.9.11 [ OK ]
26 3.10.29 [ OK ]
27 3.11.10 [ OK ]
28 3.12.10 [ OK ]
29 3.13.2 [ OK ]
30 3.14-rc1 [ OK ]
Generation time:
real 1m32.523s
user 23m51.796s
sys 0m28.872s
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
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.patch | 8 |
1 files changed, 4 insertions, 4 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 f4f79cf3..0b61f5c4 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 @@ -2,7 +2,7 @@ diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/in index 14ad4c7..f2a5abf 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c -@@ -161,8 +161,13 @@ static int igb_ioctl(struct net_device * +@@ -160,8 +160,13 @@ static int igb_ioctl(struct net_device * static void igb_tx_timeout(struct net_device *); static void igb_reset_task(struct work_struct *); static void igb_vlan_mode(struct net_device *netdev, netdev_features_t features); @@ -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 *); -@@ -7169,8 +7174,12 @@ static void igb_vlan_mode(struct net_dev +@@ -7168,8 +7173,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; -@@ -7187,8 +7196,12 @@ static int igb_vlan_rx_add_vid(struct ne +@@ -7186,8 +7195,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; -@@ -7214,7 +7227,11 @@ static void igb_restore_vlan(struct igb_ +@@ -7213,7 +7226,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) |