Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/net/tehuti.h b/drivers/net/tehuti.h
index 67e3b71bf705..c5642fefc9e7 100644
--- a/drivers/net/tehuti.h
+++ b/drivers/net/tehuti.h
@@ -269,7 +269,6 @@ struct bdx_priv {
         u32 msg_enable;
         int stats_flag;
         struct bdx_stats hw_stats;
-        struct net_device_stats net_stats;
         struct pci_dev *pdev;
 
         struct pci_nic *nic;
@@ -503,7 +502,7 @@ struct txd_desc {
 #define  GMAC_RX_FILTER_ACRC  0x0010    /* accept crc error */
 #define  GMAC_RX_FILTER_AM    0x0008    /* accept multicast */
 #define  GMAC_RX_FILTER_AB    0x0004    /* accept broadcast */
-#define  GMAC_RX_FILTER_PRM   0x0001    /* [0:1] promiscous mode */
+#define  GMAC_RX_FILTER_PRM   0x0001    /* [0:1] promiscuous mode */
 
 #define  MAX_FRAME_AB_VAL       0x3fff  /* 13:0 */