Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325206
b: refs/heads/master
c: b84a9ce
h: refs/heads/master
v: v3
  • Loading branch information
Daniel Cotey authored and Greg Kroah-Hartman committed Sep 11, 2012
1 parent a9b41fe commit 24efb06
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 13d6b7b21aedac9deb884d90f30ca66b0aef6cd1
refs/heads/master: b84a9ce54430225053667cce146f06d6ee257372
72 changes: 36 additions & 36 deletions trunk/drivers/staging/silicom/bp_mod.h
Original file line number Diff line number Diff line change
Expand Up @@ -236,45 +236,45 @@ static inline unsigned int jiffies_to_msecs(const unsigned long j)
#define SILICOM_PE210G2BPi40_SSID 0x01a0

#define PEG540_IF_SERIES(pid) \
((pid==SILICOM_PE210G2BPi40_SSID))
((pid == SILICOM_PE210G2BPi40_SSID))

#define OLD_IF_SERIES(pid) \
((pid==SILICOM_PXG2BPFI_SSID)|| \
(pid==SILICOM_PXG2BPFILX_SSID))
#define OLD_IF_SERIES(pid)\
((pid == SILICOM_PXG2BPFI_SSID) || \
(pid == SILICOM_PXG2BPFILX_SSID))

#define P2BPFI_IF_SERIES(pid) \
((pid==SILICOM_PXG2BPFI_SSID)|| \
(pid==SILICOM_PXG2BPFILX_SSID)|| \
(pid==SILICOM_PEG2BPFI_SSID)|| \
(pid==SILICOM_PEG2BPFID_SSID)|| \
(pid==SILICOM_PEG2BPFIDLX_SSID)|| \
(pid==SILICOM_MEG2BPFILN_SSID)|| \
(pid==SILICOM_MEG2BPFINX_SSID)|| \
(pid==SILICOM_PEG4BPFILX_SSID)|| \
(pid==SILICOM_PEG4BPFI_SSID)|| \
(pid==SILICOM_PXEG4BPFI_SSID)|| \
(pid==SILICOM_PXG4BPFID_SSID)|| \
(pid==SILICOM_PEG2TBFI_SSID)|| \
(pid==SILICOM_PE10G2BPISR_SSID)|| \
(pid==SILICOM_PE10G2BPILR_SSID)|| \
(pid==SILICOM_PEG2BPFILX_SSID)|| \
(pid==SILICOM_PMCXG2BPFI_SSID) || \
(pid==SILICOM_MHIO8AD_SSID) || \
(pid==SILICOM_PEG4BPFI5LX_SSID) || \
(pid==SILICOM_PEG4BPFI5_SSID) || \
(pid==SILICOM_PEG4BPFI6FC_SSID) || \
(pid==SILICOM_PEG4BPFI6FCLX_SSID) || \
(pid==SILICOM_PEG4BPFI6FCZX_SSID) || \
(pid==NOKIA_PMCXG2BPFIN_SSID)|| \
(pid==SILICOM_MEG2BPFILXLN_SSID)|| \
(pid==SILICOM_MEG2BPFILXNX_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_PXG2BPFI_SSID) || \
(pid == SILICOM_PXG2BPFILX_SSID) || \
(pid == SILICOM_PEG2BPFI_SSID) || \
(pid == SILICOM_PEG2BPFID_SSID) || \
(pid == SILICOM_PEG2BPFIDLX_SSID) || \
(pid == SILICOM_MEG2BPFILN_SSID) || \
(pid == SILICOM_MEG2BPFINX_SSID) || \
(pid == SILICOM_PEG4BPFILX_SSID) || \
(pid == SILICOM_PEG4BPFI_SSID) || \
(pid == SILICOM_PXEG4BPFI_SSID) || \
(pid == SILICOM_PXG4BPFID_SSID) || \
(pid == SILICOM_PEG2TBFI_SSID) || \
(pid == SILICOM_PE10G2BPISR_SSID) || \
(pid == SILICOM_PE10G2BPILR_SSID) || \
(pid == SILICOM_PEG2BPFILX_SSID) || \
(pid == SILICOM_PMCXG2BPFI_SSID) || \
(pid == SILICOM_MHIO8AD_SSID) || \
(pid == SILICOM_PEG4BPFI5LX_SSID) || \
(pid == SILICOM_PEG4BPFI5_SSID) || \
(pid == SILICOM_PEG4BPFI6FC_SSID) || \
(pid == SILICOM_PEG4BPFI6FCLX_SSID) || \
(pid == SILICOM_PEG4BPFI6FCZX_SSID) || \
(pid == NOKIA_PMCXG2BPFIN_SSID) || \
(pid == SILICOM_MEG2BPFILXLN_SSID) || \
(pid == SILICOM_MEG2BPFILXNX_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 INTEL_IF_SERIES(pid) \
((pid==INTEL_PEG4BPII_SSID)|| \
Expand Down

0 comments on commit 24efb06

Please sign in to comment.