From f796ee24c71bad07e061319a1201d46fdd1d56c5 Mon Sep 17 00:00:00 2001 From: Daniel Cotey Date: Sat, 15 Sep 2012 06:02:22 -0700 Subject: [PATCH] --- yaml --- r: 325329 b: refs/heads/master c: 0fe8f5d7a59f3d4d6d7dbdf624a665d11c6faf15 h: refs/heads/master i: 325327: a3ea5716a47332ad798a25c243b8757a40056954 v: v3 --- [refs] | 2 +- trunk/drivers/staging/silicom/bp_mod.h | 30 +++++++++++++------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index a92d437c0230..e1c164f899a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c2cf19334b5d06f5391b3ab5888f67528f59e76e +refs/heads/master: 0fe8f5d7a59f3d4d6d7dbdf624a665d11c6faf15 diff --git a/trunk/drivers/staging/silicom/bp_mod.h b/trunk/drivers/staging/silicom/bp_mod.h index 8c8cb959b9ac..61a12c27d5fd 100644 --- a/trunk/drivers/staging/silicom/bp_mod.h +++ b/trunk/drivers/staging/silicom/bp_mod.h @@ -309,23 +309,23 @@ static inline unsigned int jiffies_to_msecs(const unsigned long j) (pid == SILICOM_MEG2BPFILXNX_SSID)) #define TPL_IF_SERIES(pid) \ - ((pid==SILICOM_PXG2BPFIL_SSID)|| \ - (pid==SILICOM_PXG2BPFILLX_SSID)|| \ - (pid==SILICOM_PXG2TBFI_SSID)|| \ - (pid==SILICOM_PXG4BPFID_SSID)|| \ - (pid==SILICOM_PXG4BPFI_SSID)) + ((pid == SILICOM_PXG2BPFIL_SSID) || \ + (pid == SILICOM_PXG2BPFILLX_SSID) || \ + (pid == SILICOM_PXG2TBFI_SSID) || \ + (pid == SILICOM_PXG4BPFID_SSID) || \ + (pid == SILICOM_PXG4BPFI_SSID)) #define BP10G_IF_SERIES(pid) \ - ((pid==SILICOM_PE10G2BPISR_SSID)|| \ - (pid==SILICOM_PE10G2BPICX4_SSID)|| \ - (pid==SILICOM_PE10G2BPILR_SSID)|| \ - (pid==SILICOM_XE10G2BPIT_SSID)|| \ - (pid==SILICOM_XE10G2BPICX4_SSID)|| \ - (pid==SILICOM_XE10G2BPISR_SSID)|| \ - (pid==NOKIA_XE10G2BPIXR_SSID)|| \ - (pid==SILICOM_PE10GDBISR_SSID)|| \ - (pid==SILICOM_PE10GDBILR_SSID)|| \ - (pid==SILICOM_XE10G2BPILR_SSID)) + ((pid == SILICOM_PE10G2BPISR_SSID) || \ + (pid == SILICOM_PE10G2BPICX4_SSID) || \ + (pid == SILICOM_PE10G2BPILR_SSID) || \ + (pid == SILICOM_XE10G2BPIT_SSID) || \ + (pid == SILICOM_XE10G2BPICX4_SSID) || \ + (pid == SILICOM_XE10G2BPISR_SSID) || \ + (pid == NOKIA_XE10G2BPIXR_SSID) || \ + (pid == SILICOM_PE10GDBISR_SSID) || \ + (pid == SILICOM_PE10GDBILR_SSID) || \ + (pid == SILICOM_XE10G2BPILR_SSID)) #define BP10GB_IF_SERIES(pid) \ ((pid==SILICOM_PE10G2BPTCX4_SSID)|| \