From d32b7172e031e168ac350234f2da6651a1cd15e9 Mon Sep 17 00:00:00 2001 From: Yi Zou Date: Wed, 27 Jul 2011 15:10:23 -0700 Subject: [PATCH] --- yaml --- r: 261726 b: refs/heads/master c: 302ff541d981e58cd455fdbd6a90bd74d0f2109b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 1 - trunk/drivers/scsi/fcoe/fcoe.c | 1 - trunk/include/scsi/fc_frame.h | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8af6e7d25881..1e8db15f5bfe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b35baae3a62c33a73a6fd8bf4d1b6c4e3b5b5f3 +refs/heads/master: 302ff541d981e58cd455fdbd6a90bd74d0f2109b diff --git a/trunk/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/trunk/drivers/scsi/bnx2fc/bnx2fc_fcoe.c index 833e9122e018..7cb2cd48b17b 100644 --- a/trunk/drivers/scsi/bnx2fc/bnx2fc_fcoe.c +++ b/trunk/drivers/scsi/bnx2fc/bnx2fc_fcoe.c @@ -418,7 +418,6 @@ static int bnx2fc_rcv(struct sk_buff *skb, struct net_device *dev, fr = fcoe_dev_from_skb(skb); fr->fr_dev = lport; - fr->ptype = ptype; bg = &bnx2fc_global; spin_lock_bh(&bg->fcoe_rx_list.lock); diff --git a/trunk/drivers/scsi/fcoe/fcoe.c b/trunk/drivers/scsi/fcoe/fcoe.c index 204fa8d4b4ab..f7547fb000c0 100644 --- a/trunk/drivers/scsi/fcoe/fcoe.c +++ b/trunk/drivers/scsi/fcoe/fcoe.c @@ -1350,7 +1350,6 @@ int fcoe_rcv(struct sk_buff *skb, struct net_device *netdev, fr = fcoe_dev_from_skb(skb); fr->fr_dev = lport; - fr->ptype = ptype; /* * In case the incoming frame's exchange is originated from diff --git a/trunk/include/scsi/fc_frame.h b/trunk/include/scsi/fc_frame.h index 4ad02041b667..8225d8063ec4 100644 --- a/trunk/include/scsi/fc_frame.h +++ b/trunk/include/scsi/fc_frame.h @@ -78,7 +78,6 @@ struct fc_frame { }; struct fcoe_rcv_info { - struct packet_type *ptype; struct fc_lport *fr_dev; /* transport layer private pointer */ struct fc_seq *fr_seq; /* for use with exchange manager */ struct fc_fcp_pkt *fr_fsp; /* for the corresponding fcp I/O */