dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[SCSI] bnx2fc: Fix MTU issue by using static MTU 

bnx2x now uses seperate MTUs for networking and FCoE. FCoE MTU is fixed to 2500
and bnx2fc now needs to match this logic by using FCOE_MTU instead of
netdev->mtu.

Signed-off-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
Bhanu Gollapudi 2011-03-17 17:13:34 -07:00 committed by James Bottomley
parent 26ce67c3df
commit 1294bfe609
3 changed files with 6 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/scsi/bnx2fc/bnx2fc.h
View File

@ -89,6 +89,10 @@
#define BNX2FC_ELSTM_XIDS BNX2FC_CAN_QUEUE
#define BNX2FC_MIN_PAYLOAD 256
#define BNX2FC_MAX_PAYLOAD 2048
#define BNX2FC_MFS \
(BNX2FC_MAX_PAYLOAD + sizeof(struct fc_frame_header))
#define BNX2FC_MINI_JUMBO_MTU 2500
#define BNX2FC_RQ_BUF_SZ 256
#define BNX2FC_RQ_BUF_LOG_SZ (ilog2(BNX2FC_RQ_BUF_SZ))
@ -128,7 +132,6 @@
#define BNX2FC_WAIT_CNT 120
#define BNX2FC_FW_TIMEOUT (3 * HZ)
#define PORT_MAX 2
#define CMD_SCSI_STATUS(Cmnd) ((Cmnd)->SCp.Status)

35
drivers/scsi/bnx2fc/bnx2fc_fcoe.c
View File

@ -661,31 +661,6 @@ static int bnx2fc_shost_config(struct fc_lport *lport, struct device *dev)
return 0;
}
static int bnx2fc_mfs_update(struct fc_lport *lport)
{
struct fcoe_port *port = lport_priv(lport);
struct bnx2fc_hba *hba = port->priv;
struct net_device *netdev = hba->netdev;
u32 mfs;
u32 max_mfs;
mfs = netdev->mtu - (sizeof(struct fcoe_hdr) +
sizeof(struct fcoe_crc_eof));
max_mfs = BNX2FC_MAX_PAYLOAD + sizeof(struct fc_frame_header);
BNX2FC_HBA_DBG(lport, "mfs = %d, max_mfs = %d\n", mfs, max_mfs);
if (mfs > max_mfs)
mfs = max_mfs;
/* Adjust mfs to be a multiple of 256 bytes */
mfs = (((mfs - sizeof(struct fc_frame_header)) / BNX2FC_MIN_PAYLOAD) *
BNX2FC_MIN_PAYLOAD);
mfs = mfs + sizeof(struct fc_frame_header);
BNX2FC_HBA_DBG(lport, "Set MFS = %d\n", mfs);
if (fc_set_mfs(lport, mfs))
return -EINVAL;
return 0;
}
static void bnx2fc_link_speed_update(struct fc_lport *lport)
{
struct fcoe_port *port = lport_priv(lport);
@ -754,7 +729,7 @@ static int bnx2fc_net_config(struct fc_lport *lport)
!hba->phys_dev->ethtool_ops->get_pauseparam)
return -EOPNOTSUPP;
if (bnx2fc_mfs_update(lport))
if (fc_set_mfs(lport, BNX2FC_MFS))
return -EINVAL;
skb_queue_head_init(&port->fcoe_pending_queue);
@ -825,14 +800,6 @@ static void bnx2fc_indicate_netevent(void *context, unsigned long event)
if (!test_bit(ADAPTER_STATE_UP, &hba->adapter_state))
printk(KERN_ERR "indicate_netevent: "\
"adapter is not UP!!\n");
/* fall thru to update mfs if MTU has changed */
case NETDEV_CHANGEMTU:
BNX2FC_HBA_DBG(lport, "NETDEV_CHANGEMTU event\n");
bnx2fc_mfs_update(lport);
mutex_lock(&lport->lp_mutex);
list_for_each_entry(vport, &lport->vports, list)
bnx2fc_mfs_update(vport);
mutex_unlock(&lport->lp_mutex);
break;
case NETDEV_DOWN:

2
drivers/scsi/bnx2fc/bnx2fc_hwi.c
View File

@ -87,7 +87,7 @@ int bnx2fc_send_fw_fcoe_init_msg(struct bnx2fc_hba *hba)
fcoe_init1.task_list_pbl_addr_lo = (u32) hba->task_ctx_bd_dma;
fcoe_init1.task_list_pbl_addr_hi =
(u32) ((u64) hba->task_ctx_bd_dma >> 32);
fcoe_init1.mtu = hba->netdev->mtu;
fcoe_init1.mtu = BNX2FC_MINI_JUMBO_MTU;
fcoe_init1.flags = (PAGE_SHIFT <<
FCOE_KWQE_INIT1_LOG_PAGE_SIZE_SHIFT);