diff options
author | Jiri Pirko <jpirko@redhat.com> | 2011-03-01 20:05:35 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-14 16:51:46 -0700 |
commit | cc8bdf062318e76277dd76970ed58930d49888b0 (patch) | |
tree | 3ffe68c2602573829c2bb187a1f340069a0925b9 | |
parent | 2ce8c07d63cf860d6869eb4948522a0fef5ccc19 (diff) | |
download | linux-3.10-cc8bdf062318e76277dd76970ed58930d49888b0.tar.gz linux-3.10-cc8bdf062318e76277dd76970ed58930d49888b0.tar.bz2 linux-3.10-cc8bdf062318e76277dd76970ed58930d49888b0.zip |
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>
-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 9f9600b6700..3becc6a20a4 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, } /* Do not support for bonding device */ - if ((netdev->priv_flags & IFF_MASTER_ALB) || - (netdev->priv_flags & IFF_SLAVE_INACTIVE) || - (netdev->priv_flags & IFF_MASTER_8023AD)) { + if (netdev->priv_flags & IFF_BONDING && netdev->flags & IFF_MASTER) { FCOE_NETDEV_DBG(netdev, "Bonded interfaces not supported\n"); return -EOPNOTSUPP; } |