mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
[SCSI] cxgb3i: Fix a login over vlan issue
Fix a target login issue, when parent interface is vlan and we are using cxgb3i sepecific private ip address in '/etc/iscsi/ifaces/' iface file. Signed-off-by: Rakesh Ranjan <rakesh@chelsio.com> Acked-by: Karen Xie <kxie@chelsio.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
parent
6b7b284958
commit
44214ab474
1 changed files with 33 additions and 1 deletions
|
@ -1440,6 +1440,10 @@ void cxgb3i_c3cn_release(struct s3_conn *c3cn)
|
|||
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)
|
||||
ndev = vlan_dev_real_dev(dev);
|
||||
|
||||
write_lock(&cdata_rwlock);
|
||||
list_for_each_entry(cdata, &cdata_list, list) {
|
||||
|
@ -1447,7 +1451,7 @@ static int is_cxgb3_dev(struct net_device *dev)
|
|||
int i;
|
||||
|
||||
for (i = 0; i < ports->nports; i++)
|
||||
if (dev == ports->lldevs[i]) {
|
||||
if (ndev == ports->lldevs[i]) {
|
||||
write_unlock(&cdata_rwlock);
|
||||
return 1;
|
||||
}
|
||||
|
@ -1566,6 +1570,26 @@ static int initiate_act_open(struct s3_conn *c3cn, struct net_device *dev)
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
/**
|
||||
* cxgb3i_find_dev - find the interface associated with the given address
|
||||
* @ipaddr: ip address
|
||||
*/
|
||||
static struct net_device *
|
||||
cxgb3i_find_dev(struct net_device *dev, __be32 ipaddr)
|
||||
{
|
||||
struct flowi fl;
|
||||
int err;
|
||||
struct rtable *rt;
|
||||
|
||||
memset(&fl, 0, sizeof(fl));
|
||||
fl.nl_u.ip4_u.daddr = ipaddr;
|
||||
|
||||
err = ip_route_output_key(dev ? dev_net(dev) : &init_net, &rt, &fl);
|
||||
if (!err)
|
||||
return (&rt->u.dst)->dev;
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/**
|
||||
* cxgb3i_c3cn_connect - initiates an iscsi tcp connection to a given address
|
||||
|
@ -1581,6 +1605,7 @@ int cxgb3i_c3cn_connect(struct net_device *dev, struct s3_conn *c3cn,
|
|||
struct cxgb3i_sdev_data *cdata;
|
||||
struct t3cdev *cdev;
|
||||
__be32 sipv4;
|
||||
struct net_device *dstdev;
|
||||
int err;
|
||||
|
||||
c3cn_conn_debug("c3cn 0x%p, dev 0x%p.\n", c3cn, dev);
|
||||
|
@ -1591,6 +1616,13 @@ int cxgb3i_c3cn_connect(struct net_device *dev, struct s3_conn *c3cn,
|
|||
c3cn->daddr.sin_port = usin->sin_port;
|
||||
c3cn->daddr.sin_addr.s_addr = usin->sin_addr.s_addr;
|
||||
|
||||
dstdev = cxgb3i_find_dev(dev, usin->sin_addr.s_addr);
|
||||
if (!dstdev || !is_cxgb3_dev(dstdev))
|
||||
return -ENETUNREACH;
|
||||
|
||||
if (dstdev->priv_flags & IFF_802_1Q_VLAN)
|
||||
dev = dstdev;
|
||||
|
||||
rt = find_route(dev, c3cn->saddr.sin_addr.s_addr,
|
||||
c3cn->daddr.sin_addr.s_addr,
|
||||
c3cn->saddr.sin_port,
|
||||
|
|
Loading…
Reference in a new issue