diff options
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 | 8 |
1 files changed, 4 insertions, 4 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 3c2d9395..63d8658f 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 @@ -2,7 +2,7 @@ diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/in index 37e6062..6bf0a88 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c -@@ -164,10 +164,13 @@ static void igb_vlan_mode(struct net_dev +@@ -163,10 +163,13 @@ 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 *, __be16, u16); static int igb_vlan_rx_kill_vid(struct net_device *, __be16, u16); @@ -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 *); -@@ -7186,8 +7189,10 @@ static void igb_vlan_mode(struct net_dev +@@ -7185,8 +7188,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); -@@ -7202,15 +7207,19 @@ static int igb_vlan_rx_add_vid(struct ne +@@ -7201,15 +7206,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; -@@ -7226,7 +7235,9 @@ static int igb_vlan_rx_kill_vid(struct n +@@ -7225,7 +7234,9 @@ static int igb_vlan_rx_kill_vid(struct n clear_bit(vid, adapter->active_vlans); |