Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 756462f3 authored by Roopa Prabhu's avatar Roopa Prabhu Committed by David S. Miller
Browse files

enic: Cleanups in port profile helper code 



This patch does the following:
- Introduces a new macro VIC_PROVINFO_ADD_TLV
- Adds a new OS type in vic_generic_prov_os_type
- Changes some vic_provinfo* helper routine args to constants

Signed-off-by: default avatarRoopa Prabhu <roprabhu@cisco.com>
Signed-off-by: default avatarDavid Wang <dwang2@cisco.com>
Signed-off-by: default avatarChristian Benvenuti <benve@cisco.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 18714ff8

drivers/net/enic/vnic_vic.c

+3 −2
Original line number Diff line number Diff line
@@ -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,7 +48,7 @@ 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;

drivers/net/enic/vnic_vic.h

+11 −2
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ enum vic_generic_prov_os_type { 
	VIC_GENERIC_PROV_OS_TYPE_ESX = 1,

	VIC_GENERIC_PROV_OS_TYPE_LINUX = 2,

	VIC_GENERIC_PROV_OS_TYPE_WINDOWS = 3,

	VIC_GENERIC_PROV_OS_TYPE_SOLARIS = 4,

};



struct vic_provinfo {
@@ -61,14 +62,22 @@ struct vic_provinfo { 
	} tlv[0];

} __packed;



#define VIC_PROVINFO_ADD_TLV(vp, tlvtype, tlvlen, data) \

	do { \

		err = vic_provinfo_add_tlv(vp, tlvtype, tlvlen, data); \

		if (err) \

			goto add_tlv_failure; \

	} while (0)



#define VIC_PROVINFO_MAX_DATA		1385

#define VIC_PROVINFO_MAX_TLV_DATA (VIC_PROVINFO_MAX_DATA - \

	sizeof(struct vic_provinfo))



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);

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);

size_t vic_provinfo_size(struct vic_provinfo *vp);



#endif	/* _VNIC_VIC_H_ */