diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-02-21 20:39:27 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-02-24 01:35:23 +0100 |
commit | 8e946501aef6e3dd5bac12eb45d24df8248672b0 (patch) | |
tree | 5acad1bbc1f71ad268585a96c1168c7ceed1de06 /patches/collateral-evolutions/network/84-ethernet/0009-igb_vlan_rx_vid.patch | |
parent | 38009d04f323751d21d01857d3df7dd4571408f4 (diff) |
backports: refresh patches on next-20140221backports-20140221
manual changes were needed on these files:
* patches/backport-adjustments/flow_dissector.patch
* patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch
* patches/collateral-evolutions/network/83-select_queue/mac80211.patch
* patches/collateral-evolutions/network/83-select_queue/mwifiex.patch
* patches/collateral-evolutions/network/85-hid_ll_driver/net_bluetooth_hidp_core.patch
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 ]
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..3c2d9395 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 +@@ -7186,8 +7189,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 +@@ -7202,15 +7207,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 +@@ -7226,7 +7235,9 @@ static int igb_vlan_rx_kill_vid(struct n clear_bit(vid, adapter->active_vlans); |