diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-09-07 12:56:05 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-10-25 16:20:25 +0200 |
| commit | 7793930ad12f67c15bab95fa3cea34345472722f (patch) | |
| tree | 473259b8f63713fced5b92f0306df03ac38e96da /patches/collateral-evolutions/network/84-ethernet/0009-igb_vlan_rx_vid.patch | |
| parent | 36f33cbcb7b2652850f76a7413adf17f12fdf5e8 (diff) | |
backports: refresh on v3.14.22v3.14.22-1linux-3.14.y
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.62 [ OK ]
4 3.3.8 [ OK ]
5 3.4.104 [ 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.58 [ OK ]
12 3.11.10 [ OK ]
13 3.12.31 [ OK ]
14 3.13.11 [ OK ]
15 3.14.22 [ OK ]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/84-ethernet/0009-igb_vlan_rx_vid.patch')
| -rw-r--r-- | patches/collateral-evolutions/network/84-ethernet/0009-igb_vlan_rx_vid.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/collateral-evolutions/network/84-ethernet/0009-igb_vlan_rx_vid.patch b/patches/collateral-evolutions/network/84-ethernet/0009-igb_vlan_rx_vid.patch index c6d977aa..99c8fc66 100644 --- a/patches/collateral-evolutions/network/84-ethernet/0009-igb_vlan_rx_vid.patch +++ b/patches/collateral-evolutions/network/84-ethernet/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 *); -@@ -7185,8 +7188,10 @@ static void igb_vlan_mode(struct net_dev +@@ -7206,8 +7209,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); -@@ -7201,15 +7206,19 @@ static int igb_vlan_rx_add_vid(struct ne +@@ -7222,15 +7227,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; -@@ -7225,7 +7234,9 @@ static int igb_vlan_rx_kill_vid(struct n +@@ -7246,7 +7255,9 @@ static int igb_vlan_rx_kill_vid(struct n clear_bit(vid, adapter->active_vlans); |