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

Commit 4dce2396 authored by Roopa Prabhu's avatar Roopa Prabhu Committed by David S. Miller
Browse files

enic: Bug Fix: Dont reset ENIC_SET_APPLIED flag on port profile disassociate 



enic_get_vf_port returns port profile operation status only if ENIC_SET_APPLIED
flag is set. A recent rework of enic_set_port_profile added code to reset this
flag on disassociate. As a result of which a client calling enic_get_vf_port
to get the status of port profile disassociate will always get a return value
of ENODATA. This patch renames ENIC_SET_APPLIED to more appropriate
ENIC_PORT_REQUEST_APPLIED and reverts back the recent change so that the
flag is set both at associate and disassociate of a port profile.

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 f2eda47d

drivers/net/enic/enic.h

+3 −3
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ 


#define DRV_NAME		"enic"

#define DRV_DESCRIPTION		"Cisco VIC Ethernet NIC Driver"

#define DRV_VERSION		"1.4.1.10"

#define DRV_COPYRIGHT		"Copyright 2008-2010 Cisco Systems, Inc"

#define DRV_VERSION		"2.1.1.2"

#define DRV_COPYRIGHT		"Copyright 2008-2011 Cisco Systems, Inc"



#define ENIC_BARS_MAX		6
@@ -49,7 +49,7 @@ struct enic_msix_entry { 
	void *devid;

};



#define ENIC_SET_APPLIED		(1 << 0)

#define ENIC_PORT_REQUEST_APPLIED	(1 << 0)

#define ENIC_SET_REQUEST		(1 << 1)

#define ENIC_SET_NAME			(1 << 2)

#define ENIC_SET_INSTANCE		(1 << 3)

drivers/net/enic/enic_main.c

+6 −4
Original line number Diff line number Diff line
@@ -1318,18 +1318,20 @@ static int enic_set_port_profile(struct enic *enic, u8 *mac) 
		vic_provinfo_free(vp);

		if (err)

			return err;



		enic->pp.set |= ENIC_SET_APPLIED;

		break;



	case PORT_REQUEST_DISASSOCIATE:

		enic->pp.set &= ~ENIC_SET_APPLIED;

		break;



	default:

		return -EINVAL;

	}



	/* Set flag to indicate that the port assoc/disassoc

	 * request has been sent out to fw

	 */

	enic->pp.set |= ENIC_PORT_REQUEST_APPLIED;



	return 0;

}
@@ -1411,7 +1413,7 @@ static int enic_get_vf_port(struct net_device *netdev, int vf, 
	int err, error, done;

	u16 response = PORT_PROFILE_RESPONSE_SUCCESS;



	if (!(enic->pp.set & ENIC_SET_APPLIED))

	if (!(enic->pp.set & ENIC_PORT_REQUEST_APPLIED))

		return -ENODATA;



	err = enic_dev_init_done(enic, &done, &error);