UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[SCSI] fcoe: Remove ifdef for NETIF_F_FCOE_CRC and NETIF_F_FSO 

Remove the extra ifdef for NETIF_F_FSO and NETIF_F_FCOE_CRC since they are
already defined in the current kernel as in include/linux/netdevice.h.

Signed-off-by: Yi Zou <yi.zou@intel.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
Yi Zou 2009-07-29 17:05:26 -07:00 committed by James Bottomley
parent d7179680d0
commit 15a521b424
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/fcoe/fcoe.c
View File

@ -300,20 +300,16 @@ static int fcoe_netdev_config(struct fc_lport *lp, struct net_device *netdev)
if (fc->real_dev->features & NETIF_F_SG) if (fc->real_dev->features & NETIF_F_SG)
lp->sg_supp = 1; lp->sg_supp = 1;
#ifdef NETIF_F_FCOE_CRC
if (netdev->features & NETIF_F_FCOE_CRC) { if (netdev->features & NETIF_F_FCOE_CRC) {
lp->crc_offload = 1; lp->crc_offload = 1;
FCOE_NETDEV_DBG(netdev, "Supports FCCRC offload\n"); FCOE_NETDEV_DBG(netdev, "Supports FCCRC offload\n");
} }
#endif
#ifdef NETIF_F_FSO
if (netdev->features & NETIF_F_FSO) { if (netdev->features & NETIF_F_FSO) {
lp->seq_offload = 1; lp->seq_offload = 1;
lp->lso_max = netdev->gso_max_size; lp->lso_max = netdev->gso_max_size;
FCOE_NETDEV_DBG(netdev, "Supports LSO for max len 0x%x\n", FCOE_NETDEV_DBG(netdev, "Supports LSO for max len 0x%x\n",
lp->lso_max); lp->lso_max);
} }
#endif
if (netdev->fcoe_ddp_xid) { if (netdev->fcoe_ddp_xid) {
lp->lro_enabled = 1; lp->lro_enabled = 1;
lp->lro_xid = netdev->fcoe_ddp_xid; lp->lro_xid = netdev->fcoe_ddp_xid;
@ -1205,7 +1201,6 @@ int fcoe_xmit(struct fc_lport *lp, struct fc_frame *fp)
FC_FCOE_ENCAPS_VER(hp, FC_FCOE_VER); FC_FCOE_ENCAPS_VER(hp, FC_FCOE_VER);
hp->fcoe_sof = sof; hp->fcoe_sof = sof;
#ifdef NETIF_F_FSO
/* fcoe lso, mss is in max_payload which is non-zero for FCP data */ /* fcoe lso, mss is in max_payload which is non-zero for FCP data */
if (lp->seq_offload && fr_max_payload(fp)) { if (lp->seq_offload && fr_max_payload(fp)) {
skb_shinfo(skb)->gso_type = SKB_GSO_FCOE; skb_shinfo(skb)->gso_type = SKB_GSO_FCOE;
@ -1214,7 +1209,6 @@ int fcoe_xmit(struct fc_lport *lp, struct fc_frame *fp)
skb_shinfo(skb)->gso_type = 0; skb_shinfo(skb)->gso_type = 0;
skb_shinfo(skb)->gso_size = 0; skb_shinfo(skb)->gso_size = 0;
} }
#endif
/* update tx stats: regardless if LLD fails */ /* update tx stats: regardless if LLD fails */
stats = fc_lport_get_stats(lp); stats = fc_lport_get_stats(lp);
stats->TxFrames++; stats->TxFrames++;