aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/bnx2fc
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2011-03-17 20:13:32 -0400
committerJames Bottomley <James.Bottomley@suse.de>2011-03-23 12:37:03 -0400
commit26ce67c3df46a8253e3bbf3eb87cc6782f6a6c91 (patch)
treeebfc2b430fe914c0692df789540fb723a54dcdc6 /drivers/scsi/bnx2fc
parent686959736a8543265930c8d777a73b052bc57f87 (diff)
[SCSI] bnx2fc: Remove network bonding checking
bnx2fc only operates on bnx2x hardware devices and not master bonding devices, so there is no need to check for bonding. Even if the bnx2x device is "enslaved" into a bonding device, FCoE is unaffected as it has its own MAC address and queues. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/bnx2fc')
-rw-r--r--drivers/scsi/bnx2fc/bnx2fc_fcoe.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index 90cd632eed91..0eec4e092554 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -1095,13 +1095,6 @@ static int bnx2fc_netdev_setup(struct bnx2fc_hba *hba)
1095 struct netdev_hw_addr *ha; 1095 struct netdev_hw_addr *ha;
1096 int sel_san_mac = 0; 1096 int sel_san_mac = 0;
1097 1097
1098 /* Do not support for bonding device */
1099 if ((netdev->priv_flags & IFF_MASTER_ALB) ||
1100 (netdev->priv_flags & IFF_SLAVE_INACTIVE) ||
1101 (netdev->priv_flags & IFF_MASTER_8023AD)) {
1102 return -EOPNOTSUPP;
1103 }
1104
1105 /* setup Source MAC Address */ 1098 /* setup Source MAC Address */
1106 rcu_read_lock(); 1099 rcu_read_lock();
1107 for_each_dev_addr(physdev, ha) { 1100 for_each_dev_addr(physdev, ha) {