diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-08-10 21:01:50 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-08-10 21:55:27 +0200 |
| commit | 3c01584a7607caa35c509ac8b41ff73051874225 (patch) | |
| tree | 82457a6517ded3123aed94ecd412f11ca18f7d60 /patches/the-way-not-to-do-backports/0001-ethernet-igb/0009-igb_vlan_rx_vid.patch | |
| parent | fcc5f1904d32847d17c9d7b0f7991b6b84ec754b (diff) | |
backports: refresh patches on v3.15.9v3.15.9-1linux-3.15.y
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.62 [ OK ]
4 3.3.8 [ OK ]
5 3.4.102 [ 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.52 [ OK ]
12 3.11.10 [ OK ]
13 3.12.26 [ OK ]
14 3.13.11 [ OK ]
15 3.14.16 [ OK ]
16 3.15.7 [ OK ]
17 3.16.0 [ FAIL ]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/the-way-not-to-do-backports/0001-ethernet-igb/0009-igb_vlan_rx_vid.patch')
| -rw-r--r-- | patches/the-way-not-to-do-backports/0001-ethernet-igb/0009-igb_vlan_rx_vid.patch | 6 |
1 files changed, 3 insertions, 3 deletions
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 4ad3c86a..062180f6 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 *); -@@ -7268,8 +7271,10 @@ static void igb_vlan_mode(struct net_dev +@@ -7282,8 +7285,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); -@@ -7284,15 +7289,19 @@ static int igb_vlan_rx_add_vid(struct ne +@@ -7298,15 +7303,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; -@@ -7308,7 +7317,9 @@ static int igb_vlan_rx_kill_vid(struct n +@@ -7322,7 +7331,9 @@ static int igb_vlan_rx_kill_vid(struct n clear_bit(vid, adapter->active_vlans); |