Input: elantech - discard the first 2 positions on some firmwares

[deliverable/linux.git] / drivers / net / cnic.h

diff --git a/drivers/net/cnic.h b/drivers/net/cnic.h
index a0d853dff983a31ab9a8a1fb235c18cae3f05169..08b1235d987db09492df534521a2fd9d89c0e8d5 100644 (file)
--- a/drivers/net/cnic.h
+++ b/drivers/net/cnic.h
@@ -179,9 +179,9 @@ struct cnic_local {
 #define ULP_F_CALL_PENDING     2
        struct cnic_ulp_ops *ulp_ops[MAX_CNIC_ULP_TYPE];
 
-       /* protected by ulp_lock */
-       u32 cnic_local_flags;
-#define        CNIC_LCL_FL_KWQ_INIT    0x00000001
+       unsigned long cnic_local_flags;
+#define        CNIC_LCL_FL_KWQ_INIT            0x0
+#define        CNIC_LCL_FL_L2_WAIT             0x1
 
        struct cnic_dev *dev;
 
@@ -349,6 +349,10 @@ struct bnx2x_bd_chain_next {
 #define BNX2X_RCQ_DESC_CNT             (BCM_PAGE_SIZE / sizeof(union eth_rx_cqe))
 #define BNX2X_MAX_RCQ_DESC_CNT         (BNX2X_RCQ_DESC_CNT - 1)
 
+#define BNX2X_NEXT_RCQE(x) (((x) & BNX2X_MAX_RCQ_DESC_CNT) ==          \
+               (BNX2X_MAX_RCQ_DESC_CNT - 1)) ?                         \
+               ((x) + 2) : ((x) + 1)
+
 #define BNX2X_DEF_SB_ID                        16
 
 #define BNX2X_ISCSI_RX_SB_INDEX_NUM                                    \