Subject: Re: [PATCH v2] cxgb3i: fixed connection problem with iscsi private ip

From: Mike Christie <[email-masked]>
Date: Mon, 10 Jan 2011 20:19:13 -0600

On 01/10/2011 06:45 PM, [email-masked] wrote:
> [PATCH v2] cxgb3i: fixed connection problem with iscsi private ip
>
> From: Karen Xie<[email-masked]>
>
> The last one seems to have some formatting problem. Regenerated the patch.
>
> fixed the connection problem when the private iscsi ipv4 address is provisioned on the interface.
>
> Signed-off-by: Karen Xie<[email-masked]>
> ---
>   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 5f5e339..20593fd 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;
>

Looks ok to me, and it fixes my setup here. Thanks.

Reviewed-by: Mike Christie <[email-masked]>