aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/ezchip/nps_enet.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-05-10 15:04:57 -0400
committerDavid S. Miller <davem@davemloft.net>2016-05-10 15:04:57 -0400
commit3b0d190aeb21cf5aabf7157161468970296bb88c (patch)
tree8d54a352040648ddc202a7e93a2d31ea29b97c0b /drivers/net/ethernet/ezchip/nps_enet.h
parentd99079e2fbd5ac38884f498ca99435d525152a88 (diff)
parent05c00d82f4d170987ac29607e7f3c27223b52d1e (diff)
downloadleg-kernel-3b0d190aeb21cf5aabf7157161468970296bb88c.tar.gz
Merge branch 'nps_enet-fixes'
Elad Kanfi says: ==================== nps_enet: Net driver bugs fix v3: tx_packet_sent flag is not necessary, use socket buffer pointer instead. Use wmb() instead of smp_wmb(). v2: Remove code style commit for now. Code style commit will be added after the bugs fix will be approved. Summary: 1. Bug description: TX done interrupts that arrives while interrupts are masked, during NAPI poll, will not trigger an interrupt handling. Since TX interrupt is of level edge we will lose the TX done interrupt. As a result all pending tx frames will get no service. Solution: Check if there is a pending tx request after unmasking the interrupt and if answer is yes then re-add ourselves to the NAPI poll list. 2. Bug description: CPU-A before sending a frame will set a variable to true. CPU-B that executes the tx done interrupt service routine might read a non valid value of that variable. Solution: Use the socket buffer pointer instead of the variable, and add a write memory barrier at the tx sending function after the pointer is set. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ezchip/nps_enet.h')
-rw-r--r--drivers/net/ethernet/ezchip/nps_enet.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/ezchip/nps_enet.h b/drivers/net/ethernet/ezchip/nps_enet.h
index d0cab600bce8..3939ca20cc9f 100644
--- a/drivers/net/ethernet/ezchip/nps_enet.h
+++ b/drivers/net/ethernet/ezchip/nps_enet.h
@@ -165,14 +165,12 @@
* struct nps_enet_priv - Storage of ENET's private information.
* @regs_base: Base address of ENET memory-mapped control registers.
* @irq: For RX/TX IRQ number.
- * @tx_packet_sent: SW indication if frame is being sent.
* @tx_skb: socket buffer of sent frame.
* @napi: Structure for NAPI.
*/
struct nps_enet_priv {
void __iomem *regs_base;
s32 irq;
- bool tx_packet_sent;
struct sk_buff *tx_skb;
struct napi_struct napi;
u32 ge_mac_cfg_2_value;