ixgbe: Add support for using FCoE DDP in 82599 as FCoE targets

The FCoE DDP in 82599 can be used for both FCoE initiator as well as FCoE
target, depending on the indication of the exchange being the responder or
originator in the F_CTL (frame control) field in the encapsulated Fiber
Channel frame header (T10 Spec., FC-FS). For the initiator, OX_ID is used
for FCoE DDP, where for the target RX_ID is used for FCoE DDP.

Signed-off-by: Yi Zou <yi.zou@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ixgbe/ixgbe_fcoe.c b/drivers/net/ixgbe/ixgbe_fcoe.c
index 0607cffbb213531aaf180c7d8ed0293bae90f472..a3c9f99515e27c72708c92912da0f4e486423bf0 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_fcoe.c
+++ b/drivers/net/ixgbe/ixgbe_fcoe.c
@@ -292,6 +292,7 @@ int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter,
                   struct sk_buff *skb)
 {
        u16 xid;
+       u32 fctl;
        u32 sterr, fceofe, fcerr, fcstat;
        int rc = -EINVAL;
        struct ixgbe_fcoe *fcoe;
@@ -312,7 +313,12 @@ int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter,
        skb_set_transport_header(skb, skb_network_offset(skb) +
                                 sizeof(struct fcoe_hdr));
        fh = (struct fc_frame_header *)skb_transport_header(skb);
-       xid =  be16_to_cpu(fh->fh_ox_id);
+       fctl = ntoh24(fh->fh_f_ctl);
+       if (fctl & FC_FC_EX_CTX)
+               xid =  be16_to_cpu(fh->fh_ox_id);
+       else
+               xid =  be16_to_cpu(fh->fh_rx_id);
+
        if (xid >= IXGBE_FCOE_DDP_MAX)
                goto ddp_out;