Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/net/enic/vnic_vic.c b/drivers/net/enic/vnic_vic.c
index 197c9d24af82..24ef8cd40545 100644
--- a/drivers/net/enic/vnic_vic.c
+++ b/drivers/net/enic/vnic_vic.c
@@ -23,7 +23,8 @@
 
 #include "vnic_vic.h"
 
-struct vic_provinfo *vic_provinfo_alloc(gfp_t flags, u8 *oui, u8 type)
+struct vic_provinfo *vic_provinfo_alloc(gfp_t flags, const u8 *oui,
+        const u8 type)
 {
         struct vic_provinfo *vp;
 
@@ -47,15 +48,15 @@ void vic_provinfo_free(struct vic_provinfo *vp)
 }
 
 int vic_provinfo_add_tlv(struct vic_provinfo *vp, u16 type, u16 length,
-        void *value)
+        const void *value)
 {
         struct vic_provinfo_tlv *tlv;
 
         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 +67,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;
 }