These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / net / ethernet / brocade / bna / cna.h

diff --git a/kernel/drivers/net/ethernet/brocade/bna/cna.h b/kernel/drivers/net/ethernet/brocade/bna/cna.h
index 28e7d0f..75f8f1a 100644 (file)
--- a/kernel/drivers/net/ethernet/brocade/bna/cna.h
+++ b/kernel/drivers/net/ethernet/brocade/bna/cna.h
@@ -42,66 +42,4 @@ extern char bfa_version[];
 #define CNA_FW_FILE_CT2        "ct2fw-3.2.5.1.bin"
 #define FC_SYMNAME_MAX 256     /*!< max name server symbolic name size */
 
-#pragma pack(1)
-
-typedef struct mac { u8 mac[ETH_ALEN]; } mac_t;
-
-#pragma pack()
-
-#define bfa_q_first(_q) ((void *)(((struct list_head *) (_q))->next))
-#define bfa_q_next(_qe)        (((struct list_head *) (_qe))->next)
-#define bfa_q_prev(_qe) (((struct list_head *) (_qe))->prev)
-
-/*
- * bfa_q_qe_init - to initialize a queue element
- */
-#define bfa_q_qe_init(_qe) {                                           \
-       bfa_q_next(_qe) = (struct list_head *) NULL;                    \
-       bfa_q_prev(_qe) = (struct list_head *) NULL;                    \
-}
-
-/*
- * bfa_q_deq - dequeue an element from head of the queue
- */
-#define bfa_q_deq(_q, _qe) {                                           \
-       if (!list_empty(_q)) {                                          \
-               (*((struct list_head **) (_qe))) = bfa_q_next(_q);      \
-               bfa_q_prev(bfa_q_next(*((struct list_head **) _qe))) =  \
-                                               (struct list_head *) (_q); \
-               bfa_q_next(_q) = bfa_q_next(*((struct list_head **) _qe)); \
-               bfa_q_qe_init(*((struct list_head **) _qe));            \
-       } else {                                                        \
-               *((struct list_head **)(_qe)) = NULL;                   \
-       }                                                               \
-}
-
-/*
- * bfa_q_deq_tail - dequeue an element from tail of the queue
- */
-#define bfa_q_deq_tail(_q, _qe) {                                      \
-       if (!list_empty(_q)) {                                          \
-               *((struct list_head **) (_qe)) = bfa_q_prev(_q);        \
-               bfa_q_next(bfa_q_prev(*((struct list_head **) _qe))) =  \
-                                               (struct list_head *) (_q); \
-               bfa_q_prev(_q) = bfa_q_prev(*(struct list_head **) _qe);\
-               bfa_q_qe_init(*((struct list_head **) _qe));            \
-       } else {                                                        \
-               *((struct list_head **) (_qe)) = (struct list_head *) NULL; \
-       }                                                               \
-}
-
-/*
- * bfa_add_tail_head - enqueue an element at the head of queue
- */
-#define bfa_q_enq_head(_q, _qe) {                                      \
-       if (!(bfa_q_next(_qe) == NULL) && (bfa_q_prev(_qe) == NULL))    \
-               pr_err("Assertion failure: %s:%d: %d",                  \
-                       __FILE__, __LINE__,                             \
-               (bfa_q_next(_qe) == NULL) && (bfa_q_prev(_qe) == NULL));\
-       bfa_q_next(_qe) = bfa_q_next(_q);                               \
-       bfa_q_prev(_qe) = (struct list_head *) (_q);                    \
-       bfa_q_prev(bfa_q_next(_q)) = (struct list_head *) (_qe);        \
-       bfa_q_next(_q) = (struct list_head *) (_qe);                    \
-}
-
 #endif /* __CNA_H__ */