diff options
| author |   Roopa Prabhu <roprabhu@cisco.com> | 2010-08-10 18:55:10 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-08-17 02:32:58 -0700 |
| commit | 7c46835e4845fed5f348f5845a3a6165874e2f05 (patch) | |
| tree | 7ddc9fb2de9ba71a8904452160685a74c5bd8cff /drivers/net/enic | |
| parent | enic: Add new firmware devcmds (diff) | |
| download | linux-dev-7c46835e4845fed5f348f5845a3a6165874e2f05.tar.xz linux-dev-7c46835e4845fed5f348f5845a3a6165874e2f05.zip | |
enic: Use offsetof macro in vic tlv length calculation
Signed-off-by: Scott Feldman <scofeldm@cisco.com>
Signed-off-by: Roopa Prabhu <roprabhu@cisco.com>
Signed-off-by: Vasanthy Kolluri <vkolluri@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/enic')
| -rw-r--r-- | drivers/net/enic/vnic_vic.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/enic/vnic_vic.c b/drivers/net/enic/vnic_vic.c index 197c9d24af82..4725b79de0ef 100644 --- a/drivers/net/enic/vnic_vic.c +++ b/drivers/net/enic/vnic_vic.c @@ -54,8 +54,8 @@ int vic_provinfo_add_tlv(struct vic_provinfo *vp, u16 type, u16 length, if (!vp || !value) return -EINVAL; - if (ntohl(vp->length) + sizeof(*tlv) + length > - VIC_PROVINFO_MAX_TLV_DATA) + if (ntohl(vp->length) + offsetof(struct vic_provinfo_tlv, value) + + length > VIC_PROVINFO_MAX_TLV_DATA) return -ENOMEM; tlv = (struct vic_provinfo_tlv *)((u8 *)vp->tlv + @@ -66,7 +66,8 @@ int vic_provinfo_add_tlv(struct vic_provinfo *vp, u16 type, u16 length, memcpy(tlv->value, value, length); vp->num_tlvs = htonl(ntohl(vp->num_tlvs) + 1); - vp->length = htonl(ntohl(vp->length) + sizeof(*tlv) + length); + vp->length = htonl(ntohl(vp->length) + + offsetof(struct vic_provinfo_tlv, value) + length); return 0; } |