diff options
author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/scsi/bfa/bfa_svc.h | |
parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/scsi/bfa/bfa_svc.h')
-rw-r--r-- | drivers/scsi/bfa/bfa_svc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/bfa/bfa_svc.h b/drivers/scsi/bfa/bfa_svc.h index 331ad992a581..5902a45c080f 100644 --- a/drivers/scsi/bfa/bfa_svc.h +++ b/drivers/scsi/bfa/bfa_svc.h | |||
@@ -127,7 +127,7 @@ struct bfa_fcxp_req_info_s { | |||
127 | * rport nexus is established | 127 | * rport nexus is established |
128 | */ | 128 | */ |
129 | struct fchs_s fchs; /* request FC header structure */ | 129 | struct fchs_s fchs; /* request FC header structure */ |
130 | u8 cts; /* continous sequence */ | 130 | u8 cts; /* continuous sequence */ |
131 | u8 class; /* FC class for the request/response */ | 131 | u8 class; /* FC class for the request/response */ |
132 | u16 max_frmsz; /* max send frame size */ | 132 | u16 max_frmsz; /* max send frame size */ |
133 | u16 vf_id; /* vsan tag if applicable */ | 133 | u16 vf_id; /* vsan tag if applicable */ |