From b4ef6ac03c9111bc44566fc3272f00d02ea395eb Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 4 Jan 2010 14:36:40 -0800 Subject: [PATCH] --- yaml --- r: 179090 b: refs/heads/master c: d3af9dd04f8795dc2761ecfa56632e4d0df0dae2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/cxgb3i/cxgb3i_offload.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b7f70e8c6632..60369e574d95 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4b751d87241c1b49ce43f819428223bfc22dc27 +refs/heads/master: d3af9dd04f8795dc2761ecfa56632e4d0df0dae2 diff --git a/trunk/drivers/scsi/cxgb3i/cxgb3i_offload.c b/trunk/drivers/scsi/cxgb3i/cxgb3i_offload.c index 4b8a5133d69d..7449d465bc17 100644 --- a/trunk/drivers/scsi/cxgb3i/cxgb3i_offload.c +++ b/trunk/drivers/scsi/cxgb3i/cxgb3i_offload.c @@ -1442,7 +1442,7 @@ static int is_cxgb3_dev(struct net_device *dev) struct cxgb3i_sdev_data *cdata; struct net_device *ndev = dev; - if (dev->priv_flags && IFF_802_1Q_VLAN) + if (dev->priv_flags & IFF_802_1Q_VLAN) ndev = vlan_dev_real_dev(dev); write_lock(&cdata_rwlock);