diff options
| author | Raghava Kondapalli <rakondap@cisco.com> | 2007-08-03 13:45:18 -0400 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2007-08-03 13:45:18 -0400 |
| commit | 3d1ff48da760968793f3c36672961ffd23088787 (patch) | |
| tree | 0e7f9b7a1f33f94b46be9bf5d05dd7b2b2c0ff60 /drivers | |
| parent | 5d7cbfd63136e4469a896acfadb33e19ed62f068 (diff) | |
IB/srp: Add OUI for new Cisco targets
New Cisco IB SRP targets use the Cisco OUI 00-1b-0d but still need the
Topspin workarounds. Add this OUI to srp_target_is_topspin().
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/infiniband/ulp/srp/ib_srp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c index fb6c5798daf3..f6a051428144 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.c +++ b/drivers/infiniband/ulp/srp/ib_srp.c | |||
| @@ -107,9 +107,11 @@ static const char *srp_target_info(struct Scsi_Host *host) | |||
| 107 | static int srp_target_is_topspin(struct srp_target_port *target) | 107 | static int srp_target_is_topspin(struct srp_target_port *target) |
| 108 | { | 108 | { |
| 109 | static const u8 topspin_oui[3] = { 0x00, 0x05, 0xad }; | 109 | static const u8 topspin_oui[3] = { 0x00, 0x05, 0xad }; |
| 110 | static const u8 cisco_oui[3] = { 0x00, 0x1b, 0x0d }; | ||
| 110 | 111 | ||
| 111 | return topspin_workarounds && | 112 | return topspin_workarounds && |
| 112 | !memcmp(&target->ioc_guid, topspin_oui, sizeof topspin_oui); | 113 | (!memcmp(&target->ioc_guid, topspin_oui, sizeof topspin_oui) || |
| 114 | !memcmp(&target->ioc_guid, cisco_oui, sizeof cisco_oui)); | ||
| 113 | } | 115 | } |
| 114 | 116 | ||
| 115 | static int srp_target_is_mellanox(struct srp_target_port *target) | 117 | static int srp_target_is_mellanox(struct srp_target_port *target) |