net: fix build erros with CONFIG_BUG=n, CONFIG_GENERIC_BUG=n

[safe/jmp/linux-2.6] / include / scsi / fc_encode.h

diff --git a/include/scsi/fc_encode.h b/include/scsi/fc_encode.h
index c8968d3..8eb0a0f 100644 (file)
--- a/include/scsi/fc_encode.h
+++ b/include/scsi/fc_encode.h
@@ -32,6 +32,7 @@ struct fc_ct_req {
                struct fc_ns_gid_ft gid;
                struct fc_ns_rn_id  rn;
                struct fc_ns_rft rft;
+               struct fc_ns_rff_id rff;
                struct fc_ns_fid fid;
                struct fc_ns_rsnn snn;
                struct fc_ns_rspn spn;
@@ -111,6 +112,7 @@ static inline int fc_ct_fill(struct fc_lport *lport,
                      enum fc_fh_type *fh_type)
 {
        struct fc_ct_req *ct;
+       size_t len;
 
        switch (op) {
        case FC_NS_GPN_FT:
@@ -130,6 +132,17 @@ static inline int fc_ct_fill(struct fc_lport *lport,
                ct->payload.rft.fts = lport->fcts;
                break;
 
+       case FC_NS_RFF_ID:
+               ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rff_id));
+               hton24(ct->payload.rff.fr_fid.fp_fid,
+                      fc_host_port_id(lport->host));
+               ct->payload.rff.fr_type = FC_TYPE_FCP;
+               if (lport->service_params & FCP_SPPF_INIT_FCN)
+                       ct->payload.rff.fr_feat = FCP_FEAT_INIT;
+               if (lport->service_params & FCP_SPPF_TARG_FCN)
+                       ct->payload.rff.fr_feat |= FCP_FEAT_TARG;
+               break;
+
        case FC_NS_RNN_ID:
                ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rn_id));
                hton24(ct->payload.rn.fr_fid.fp_fid,
@@ -138,22 +151,22 @@ static inline int fc_ct_fill(struct fc_lport *lport,
                break;
 
        case FC_NS_RSPN_ID:
-               ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rspn));
+               len = strnlen(fc_host_symbolic_name(lport->host), 255);
+               ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rspn) + len);
                hton24(ct->payload.spn.fr_fid.fp_fid,
                       fc_host_port_id(lport->host));
                strncpy(ct->payload.spn.fr_name,
-                       fc_host_symbolic_name(lport->host), 255);
-               ct->payload.spn.fr_name_len =
-                       strnlen(ct->payload.spn.fr_name, 255);
+                       fc_host_symbolic_name(lport->host), len);
+               ct->payload.spn.fr_name_len = len;
                break;
 
        case FC_NS_RSNN_NN:
-               ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rsnn));
+               len = strnlen(fc_host_symbolic_name(lport->host), 255);
+               ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rsnn) + len);
                put_unaligned_be64(lport->wwnn, &ct->payload.snn.fr_wwn);
                strncpy(ct->payload.snn.fr_name,
-                       fc_host_symbolic_name(lport->host), 255);
-               ct->payload.snn.fr_name_len =
-                       strnlen(ct->payload.snn.fr_name, 255);
+                       fc_host_symbolic_name(lport->host), len);
+               ct->payload.snn.fr_name_len = len;
                break;
 
        default: