diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-12-20 15:46:28 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-12-21 16:39:07 +0100 |
commit | 375bd0e8cd5dca383150a4e338b1b3fb68f84fd2 (patch) | |
tree | 16a1e8513373ed7177b5cfa91231f1e84a9deeb5 /patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid | |
parent | c1761f6eadae9b8ab5488f0ebb613f807d75b81b (diff) |
patches: refresh on next-20141201
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.65 [ OK ]
4 3.3.8 [ OK ]
5 3.4.105 [ 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.63 [ OK ]
12 3.11.10 [ OK ]
13 3.12.35 [ OK ]
14 3.13.11 [ OK ]
15 3.14.27 [ OK ]
16 3.15.10 [ OK ]
17 3.16.6 [ OK ]
18 3.17.7 [ OK ]
19 3.18.1 [ OK ]
manual changed were needed for the following patches:
backport-adjustments/crypto-ccm.patch
backport-adjustments/devcoredump.patch
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid')
-rw-r--r-- | patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch b/patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch index 3100a169..7f0c1b5a 100644 --- a/patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch +++ b/patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch @@ -17,7 +17,7 @@ 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 *); -@@ -7189,8 +7197,14 @@ static void igb_vlan_mode(struct net_dev +@@ -7196,8 +7204,14 @@ static void igb_vlan_mode(struct net_dev igb_rlpml_set(adapter); } @@ -32,7 +32,7 @@ { struct igb_adapter *adapter = netdev_priv(netdev); struct e1000_hw *hw = &adapter->hw; -@@ -7204,11 +7218,19 @@ static int igb_vlan_rx_add_vid(struct ne +@@ -7211,11 +7225,19 @@ static int igb_vlan_rx_add_vid(struct ne set_bit(vid, adapter->active_vlans); @@ -52,7 +52,7 @@ { struct igb_adapter *adapter = netdev_priv(netdev); struct e1000_hw *hw = &adapter->hw; -@@ -7224,7 +7246,9 @@ static int igb_vlan_rx_kill_vid(struct n +@@ -7231,7 +7253,9 @@ static int igb_vlan_rx_kill_vid(struct n clear_bit(vid, adapter->active_vlans); @@ -62,7 +62,7 @@ } static void igb_restore_vlan(struct igb_adapter *adapter) -@@ -7234,7 +7258,11 @@ static void igb_restore_vlan(struct igb_ +@@ -7241,7 +7265,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) |