summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/cisco/enic/enic.h
diff options
context:
space:
mode:
authorGovindarajulu Varadarajan2014-07-02 12:12:15 +0200
committerDavid S. Miller2014-07-08 06:33:46 +0200
commita16a3361927f75e6032df110920c83ca6c5045d3 (patch)
treefa137120fad58594d535c208aebb1d15fd67a240 /drivers/net/ethernet/cisco/enic/enic.h
parentbonding: remove no longer relevant vlan warnings (diff)
downloadkernel-qcow2-linux-a16a3361927f75e6032df110920c83ca6c5045d3.tar.gz
kernel-qcow2-linux-a16a3361927f75e6032df110920c83ca6c5045d3.tar.xz
kernel-qcow2-linux-a16a3361927f75e6032df110920c83ca6c5045d3.zip
enic: fix return values in enic_set_coalesce
enic_set_coalesce() has two problems. * It should return -EINVAL and not -EOPNOTSUPP for invalid coalesce values. * In case of MSIX, enic_set_coalesce return error after applying requested coalescing setting partially. We should either apply all the setting requeste and return success or apply non and return error. * This patch also simplifies the algo. This was introduced by '7c2ce6e60f703 enic: Add support for adaptive interrupt coalescing' These changes were suggested by Ben Hutchings here http://www.spinics.net/lists/netdev/msg283972.html Also change enic driver version. Signed-off-by: Govindarajulu Varadarajan <_govind@gmx.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cisco/enic/enic.h')
-rw-r--r--drivers/net/ethernet/cisco/enic/enic.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/cisco/enic/enic.h b/drivers/net/ethernet/cisco/enic/enic.h
index c8aa9fb81d3c..4ecbbb3c024a 100644
--- a/drivers/net/ethernet/cisco/enic/enic.h
+++ b/drivers/net/ethernet/cisco/enic/enic.h
@@ -33,7 +33,7 @@
#define DRV_NAME "enic"
#define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver"
-#define DRV_VERSION "2.1.1.50"
+#define DRV_VERSION "2.1.1.67"
#define DRV_COPYRIGHT "Copyright 2008-2013 Cisco Systems, Inc"
#define ENIC_BARS_MAX 6