diff --git a/[refs] b/[refs] index e1c164f899a4..aba6c26d4670 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0fe8f5d7a59f3d4d6d7dbdf624a665d11c6faf15 +refs/heads/master: 2ea2ea4dab8512560aec31a9e4b6d11b6d0e3b15 diff --git a/trunk/drivers/staging/silicom/bp_mod.h b/trunk/drivers/staging/silicom/bp_mod.h index 61a12c27d5fd..425085a70b52 100644 --- a/trunk/drivers/staging/silicom/bp_mod.h +++ b/trunk/drivers/staging/silicom/bp_mod.h @@ -328,16 +328,16 @@ static inline unsigned int jiffies_to_msecs(const unsigned long j) (pid == SILICOM_XE10G2BPILR_SSID)) #define BP10GB_IF_SERIES(pid) \ - ((pid==SILICOM_PE10G2BPTCX4_SSID)|| \ - (pid==SILICOM_PE10G2BPTSR_SSID)|| \ - (pid==SILICOM_PE10G2BPTLR_SSID)|| \ - (pid==SILICOM_PE10G2BPTT_SSID)) + ((pid == SILICOM_PE10G2BPTCX4_SSID) || \ + (pid == SILICOM_PE10G2BPTSR_SSID) || \ + (pid == SILICOM_PE10G2BPTLR_SSID) || \ + (pid == SILICOM_PE10G2BPTT_SSID)) #define BP10G_CX4_SERIES(pid) \ - (pid==SILICOM_PE10G2BPICX4_SSID) + (pid == SILICOM_PE10G2BPICX4_SSID) #define BP10GB_CX4_SERIES(pid) \ - (pid==SILICOM_PE10G2BPTCX4_SSID) + (pid == SILICOM_PE10G2BPTCX4_SSID) #define SILICOM_M2EG2BPFI6_SSID 0x0501 #define SILICOM_M2EG2BPFI6LX_SSID 0x0502