From 5bf945a874d13e4e44c61afaeb7714d07fa7baca Mon Sep 17 00:00:00 2001 From: Michael Chan Date: Mon, 2 Sep 2013 11:42:30 -0700 Subject: cnic: Eliminate CNIC_PORT macro and port_mode in local struct. Use BP_PORT and chip_port_mode directly from bnx2x.h to avoid duplication. Signed-off-by: Michael Chan Signed-off-by: David S. Miller --- drivers/net/ethernet/broadcom/cnic.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'drivers/net/ethernet/broadcom/cnic.h') diff --git a/drivers/net/ethernet/broadcom/cnic.h b/drivers/net/ethernet/broadcom/cnic.h index 0408ae286b89..10531f69fe72 100644 --- a/drivers/net/ethernet/broadcom/cnic.h +++ b/drivers/net/ethernet/broadcom/cnic.h @@ -304,7 +304,6 @@ struct cnic_local { u32 chip_id; int func; u32 pfid; - u8 port_mode; u32 shmem_base; @@ -399,7 +398,6 @@ struct bnx2x_bd_chain_next { #define ETH_MAX_RX_CLIENTS_E2 ETH_MAX_RX_CLIENTS_E1H #endif -#define CNIC_PORT(cp) ((cp)->pfid & 1) #define CNIC_FUNC(cp) ((cp)->func) #define BNX2X_HW_CID(bp, x) ((BP_PORT(bp) << 23) | \ -- cgit v1.2.3