cxgb3i: Fix a login over vlan issue
Subsystems (3)
PATCH 1/1 cxgb3i: Fix a login over vlan issue
Fix a login over vlan issue, when parent interface is vlan and we are using cxgb3i sepecific private ip address in '/etc/iscsi/ifaces/' iface file.
--- drivers/scsi/cxgb3i/cxgb3i_offload.c | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-)
drivers/scsi/cxgb3i/cxgb3i_offload.c +33 -1
@@ -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 @@ out_err:return -1 ; } +/** +* cxgb3i_find_dev - find the interface associated with the given address +* @ipaddr: ip address +*/ +static struct net_device * +cxgb3i_find_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 (&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 (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,
Signature · 8 lines
1.6.0.6 -- You received this message because you are subscribed to the Google Groups "open-iscsi" group. To post to this group, send email to open-iscsi-/JYPxA39Uh5TLH3MbocFF+G/[email protected] To unsubscribe from this group, send email to open-iscsi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected] For more options, visit this group at http://groups.google.com/group/open-iscsi?hl=en.
Quoted 72 lines · Rakesh Ranjan
Fix a login over vlan issue, when parent interface is vlan and we are using cxgb3i sepecific private ip address in '
/etc/iscsi/ifaces/' iface file.Acked-by Karen Xie <[email protected]>Signed-off-by Rakesh Ranjan <[email protected]>--- drivers/scsi/cxgb3i/cxgb3i_offload.c | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-)drivers/scsi/cxgb3i/cxgb3i_offload.c +26
-1@@ -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 @@ out_err:return -1 ; } +/** +* cxgb3i_find_dev - find the interface associated with the given address +* @ipaddr: ip address +*/ +static struct net_device * +cxgb3i_find_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 (&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;
drivers/scsi/cxgb3i/cxgb3i_offload.c int cxgb3i_c3cn_connect(struct net_device *dev, struct s3_conn *c3cn, · line 1628
Quoted 10 lines
drivers/scsi/cxgb3i/cxgb3i_offload.c +7
-0+ dstdev =cxgb3i_find_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,
Looks sane. I am not a expert on the networks apis being used though.
Hi, thanks, Mike.
It looks like the original patch somehow did not make into the linux-scsi list at all for some reason: tried to search for it but could not find it.
We are re-submitting it just to make sure.
Best regards,
Karen
-----Original Message-----
From: Mike Christie [mailto:[email protected]]
Sent: Mon 12/7/2009 8:34 AM
To: [email protected]
Cc: [email protected]; [email protected]; Steve Wise; Karen Xie; [email protected]; [email protected]; [email protected]; Rakesh Ranjan
Subject: Re: [PATCH 1/1] cxgb3i: Fix a login over vlan issue
Quoted 72 lines · Rakesh Ranjan
Fix a login over vlan issue, when parent interface is vlan and we are using cxgb3i sepecific private ip address in '
/etc/iscsi/ifaces/' iface file.Acked-by Karen Xie <[email protected]>Signed-off-by Rakesh Ranjan <[email protected]>--- drivers/scsi/cxgb3i/cxgb3i_offload.c | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-)drivers/scsi/cxgb3i/cxgb3i_offload.c +26
-1@@ -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 @@ out_err:return -1 ; } +/** +* cxgb3i_find_dev - find the interface associated with the given address +* @ipaddr: ip address +*/ +static struct net_device * +cxgb3i_find_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 (&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;
drivers/scsi/cxgb3i/cxgb3i_offload.c int cxgb3i_c3cn_connect(struct net_device *dev, struct s3_conn *c3cn, · line 1628
Quoted 10 lines
drivers/scsi/cxgb3i/cxgb3i_offload.c +7
-0+ dstdev =cxgb3i_find_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,
Looks sane. I am not a expert on the networks apis being used though.