qlge: Fix bonding mac address bug.

[firefly-linux-kernel-4.4.55.git] / drivers / net / qlge / qlge.h

diff --git a/drivers/net/qlge/qlge.h b/drivers/net/qlge/qlge.h
index 9169c4cf413a3c80c76f728c1969591a279fa773..8b742b639ceba5c19d0af01346f82e48fa6c7e8e 100644 (file)
--- a/drivers/net/qlge/qlge.h
+++ b/drivers/net/qlge/qlge.h
@@ -19,14 +19,6 @@
 #define DRV_VERSION    "v1.00.00.23.00.00-01"
 
 #define PFX "qlge: "
-#define QPRINTK(qdev, nlevel, klevel, fmt, args...)     \
-       do {       \
-       if (!((qdev)->msg_enable & NETIF_MSG_##nlevel))         \
-               ;                                               \
-       else                                                    \
-               dev_printk(KERN_##klevel, &((qdev)->pdev->dev), \
-                          "%s: " fmt, __func__, ##args);  \
-       } while (0)
 
 #define WQ_ADDR_ALIGN  0x3     /* 4 byte alignment */
 
@@ -2005,6 +1997,7 @@ enum {
        QL_SELFTEST = 9,
        QL_LB_LINK_UP = 10,
        QL_FRC_COREDUMP = 11,
+       QL_EEH_FATAL = 12,
 };
 
 /* link_status bit definitions */
@@ -2144,7 +2137,10 @@ struct ql_adapter {
        struct completion ide_completion;
        struct nic_operations *nic_ops;
        u16 device_id;
+       struct timer_list timer;
        atomic_t lb_count;
+       /* Keep local copy of current mac address. */
+       char current_mac_addr[6];
 };
 
 /*