summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-12-21 19:10:52 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2014-12-21 22:34:43 +0100
commit5e9ec4c59a8b6dd9cf970754255ec61922462c99 (patch)
treef62e524980e365e2378ed3ea48f03679eafbf371 /patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch
parent3dc16aef2e0e29da915fc2be645bb364cd5d885f (diff)
patches: refresh patches on top of v3.18.1v3.18.1-1linux-3.18.y
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 ] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch')
-rw-r--r--patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch8
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 0bca0512..c0c22fbf 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 *);
-@@ -7188,8 +7196,14 @@ static void igb_vlan_mode(struct net_dev
+@@ -7199,8 +7207,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;
-@@ -7203,11 +7217,19 @@ static int igb_vlan_rx_add_vid(struct ne
+@@ -7214,11 +7228,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;
-@@ -7223,7 +7245,9 @@ static int igb_vlan_rx_kill_vid(struct n
+@@ -7234,7 +7256,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)
-@@ -7233,7 +7257,11 @@ static void igb_restore_vlan(struct igb_
+@@ -7244,7 +7268,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)