diff options
| author | kxie@chelsio.com <kxie@chelsio.com> | 2011-01-10 16:45:07 -0800 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2011-01-24 11:45:17 -0600 |
| commit | 716163ff908be72f6b74752ad0796cc7c00b047a (patch) | |
| tree | 5f28e6934fbe8f8d5d60bfbadc039ab1e1b458cf /drivers/scsi/cxgbi | |
| parent | d38e19d00fe8c3591591e140d80dea785af5f1fe (diff) | |
| download | linux-3.10-716163ff908be72f6b74752ad0796cc7c00b047a.tar.gz linux-3.10-716163ff908be72f6b74752ad0796cc7c00b047a.tar.bz2 linux-3.10-716163ff908be72f6b74752ad0796cc7c00b047a.zip | |
[SCSI] cxgb3i: fixed connection problem with iscsi private ip
fixed the connection problem when the private iscsi ipv4 address is
provisioned on the interface.
Signed-off-by: Karen Xie <kxie@chelsio.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/cxgbi')
| -rw-r--r-- | drivers/scsi/cxgbi/cxgb3i/cxgb3i.h | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.h b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.h index 5f5e3394b59..20593fd69d8 100644 --- a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.h +++ b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.h @@ -24,10 +24,21 @@ extern cxgb3_cpl_handler_func cxgb3i_cpl_handlers[NUM_CPL_CMDS]; -#define cxgb3i_get_private_ipv4addr(ndev) \ - (((struct port_info *)(netdev_priv(ndev)))->iscsi_ipv4addr) -#define cxgb3i_set_private_ipv4addr(ndev, addr) \ - (((struct port_info *)(netdev_priv(ndev)))->iscsi_ipv4addr) = addr +static inline unsigned int cxgb3i_get_private_ipv4addr(struct net_device *ndev) +{ + return ((struct port_info *)(netdev_priv(ndev)))->iscsi_ipv4addr; +} + +static inline void cxgb3i_set_private_ipv4addr(struct net_device *ndev, + unsigned int addr) +{ + struct port_info *pi = (struct port_info *)netdev_priv(ndev); + + pi->iscsic.flags = addr ? 1 : 0; + pi->iscsi_ipv4addr = addr; + if (addr) + memcpy(pi->iscsic.mac_addr, ndev->dev_addr, ETH_ALEN); +} struct cpl_iscsi_hdr_norss { union opcode_tid ot; |