mlx4_en: Removed redundant cq->armed flag

Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc drivers/net/mlx4/en_cq.c
Simple merge

diff --cc drivers/net/mlx4/en_tx.c
Simple merge

diff --cc drivers/net/mlx4/mlx4_en.h
Simple merge