diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2011-03-01 15:05:35 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-14 19:51:46 -0400 |
| commit | cc8bdf062318e76277dd76970ed58930d49888b0 (patch) | |
| tree | 3ffe68c2602573829c2bb187a1f340069a0925b9 /drivers/scsi/fcoe | |
| parent | 2ce8c07d63cf860d6869eb4948522a0fef5ccc19 (diff) | |
fcoe: correct checking for bonding
Check for bonding master and refuse to use that.
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Acked-by: Robert Love <robert.w.love@intel.com>
Acked-by: James Bottomley <James.Bottomley@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/scsi/fcoe')
| -rw-r--r-- | drivers/scsi/fcoe/fcoe.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c index 9f9600b67001..3becc6a20a4f 100644 --- a/drivers/scsi/fcoe/fcoe.c +++ b/drivers/scsi/fcoe/fcoe.c | |||
| @@ -285,9 +285,7 @@ static int fcoe_interface_setup(struct fcoe_interface *fcoe, | |||
| 285 | } | 285 | } |
| 286 | 286 | ||
| 287 | /* Do not support for bonding device */ | 287 | /* Do not support for bonding device */ |
| 288 | if ((netdev->priv_flags & IFF_MASTER_ALB) || | 288 | if (netdev->priv_flags & IFF_BONDING && netdev->flags & IFF_MASTER) { |
| 289 | (netdev->priv_flags & IFF_SLAVE_INACTIVE) || | ||
| 290 | (netdev->priv_flags & IFF_MASTER_8023AD)) { | ||
| 291 | FCOE_NETDEV_DBG(netdev, "Bonded interfaces not supported\n"); | 289 | FCOE_NETDEV_DBG(netdev, "Bonded interfaces not supported\n"); |
| 292 | return -EOPNOTSUPP; | 290 | return -EOPNOTSUPP; |
| 293 | } | 291 | } |