Skip to content

L
linux
Commit 041b8a4a authored by Scott Feldman's avatar Scott Feldman Committed by Linus Torvalds
Browse files
Options

[e1000] fix VLAN support on PPC64 

* Bug fix: fix VLAN support on PPC64 [Mark Rakes (mrakes@vivato.net)]
parent ec7d1289
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
drivers/net/e1000/e1000_main.c
View file @ 041b8a4a
...@@ -2189,14 +2189,16 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter) ...@@ -2189,14 +2189,16 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter)
#ifdef CONFIG_E1000_NAPI #ifdef CONFIG_E1000_NAPI
if(adapter->vlgrp && (rx_desc->status & E1000_RXD_STAT_VP)) { if(adapter->vlgrp && (rx_desc->status & E1000_RXD_STAT_VP)) {
vlan_hwaccel_receive_skb(skb, adapter->vlgrp, vlan_hwaccel_receive_skb(skb, adapter->vlgrp,
(rx_desc->special & E1000_RXD_SPC_VLAN_MASK)); le16_to_cpu(rx_desc->special &
E1000_RXD_SPC_VLAN_MASK));
} else { } else {
netif_receive_skb(skb); netif_receive_skb(skb);
} }
#else /* CONFIG_E1000_NAPI */ #else /* CONFIG_E1000_NAPI */
if(adapter->vlgrp && (rx_desc->status & E1000_RXD_STAT_VP)) { if(adapter->vlgrp && (rx_desc->status & E1000_RXD_STAT_VP)) {
vlan_hwaccel_rx(skb, adapter->vlgrp, vlan_hwaccel_rx(skb, adapter->vlgrp,
(rx_desc->special & E1000_RXD_SPC_VLAN_MASK)); le16_to_cpu(rx_desc->special &
E1000_RXD_SPC_VLAN_MASK));
} else { } else {
netif_rx(skb); netif_rx(skb);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7