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

Commit 5990b189 authored by Vasanthy Kolluri's avatar Vasanthy Kolluri Committed by David S. Miller
Browse files

enic: Clean up: Remove a not needed #ifdef 



Signed-off-by: default avatarChristian Benvenuti <benve@cisco.com>
Signed-off-by: default avatarDanny Guo <dannguo@cisco.com>
Signed-off-by: default avatarVasanthy Kolluri <vkolluri@cisco.com>
Signed-off-by: default avatarRoopa Prabhu <roprabhu@cisco.com>
Signed-off-by: default avatarDavid Wang <dwang2@cisco.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e0afe53f

drivers/net/enic/enic.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 


#define DRV_NAME		"enic"

#define DRV_DESCRIPTION		"Cisco VIC Ethernet NIC Driver"

#define DRV_VERSION		"2.1.1.7"

#define DRV_VERSION		"2.1.1.8"

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



#define ENIC_BARS_MAX		6

drivers/net/enic/enic_main.c

+0 −2
Original line number Diff line number Diff line
@@ -2223,9 +2223,7 @@ static const struct net_device_ops enic_netdev_dynamic_ops = { 
	.ndo_tx_timeout		= enic_tx_timeout,

	.ndo_set_vf_port	= enic_set_vf_port,

	.ndo_get_vf_port	= enic_get_vf_port,

#ifdef IFLA_VF_MAX

	.ndo_set_vf_mac		= enic_set_vf_mac,

#endif

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller	= enic_poll_controller,

#endif