aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/enic/enic.h
diff options
context:
space:
mode:
authorVasanthy Kolluri <vkolluri@cisco.com>2010-06-24 06:49:25 -0400
committerDavid S. Miller <davem@davemloft.net>2010-06-25 23:45:00 -0400
commit88132f55d74fdd97a7d459007b2bbb59e850f8c0 (patch)
tree440a621ab075be307e2cf4964c8e44ad27675458 /drivers/net/enic/enic.h
parent72b8a169dbfa74e7d1d08b97435e61e711d7be0e (diff)
enic: Feature Add: Replace LRO with GRO
enic now uses the GRO mechanism instead of LRO to pass skbs to upper layers. Signed-off-by: Scott Feldman <scofeldm@cisco.com> Signed-off-by: Vasanthy Kolluri <vkolluri@cisco.com> Signed-off-by: Roopa Prabhu <roprabhu@cisco.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/enic/enic.h')
-rw-r--r--drivers/net/enic/enic.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index 45e86d1e5b1b..81c2adeaa9b8 100644
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -20,8 +20,6 @@
20#ifndef _ENIC_H_ 20#ifndef _ENIC_H_
21#define _ENIC_H_ 21#define _ENIC_H_
22 22
23#include <linux/inet_lro.h>
24
25#include "vnic_enet.h" 23#include "vnic_enet.h"
26#include "vnic_dev.h" 24#include "vnic_dev.h"
27#include "vnic_wq.h" 25#include "vnic_wq.h"
@@ -34,13 +32,10 @@
34 32
35#define DRV_NAME "enic" 33#define DRV_NAME "enic"
36#define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver" 34#define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver"
37#define DRV_VERSION "1.3.1.1-pp" 35#define DRV_VERSION "1.4.1.1"
38#define DRV_COPYRIGHT "Copyright 2008-2009 Cisco Systems, Inc" 36#define DRV_COPYRIGHT "Copyright 2008-2009 Cisco Systems, Inc"
39#define PFX DRV_NAME ": " 37#define PFX DRV_NAME ": "
40 38
41#define ENIC_LRO_MAX_DESC 8
42#define ENIC_LRO_MAX_AGGR 64
43
44#define ENIC_BARS_MAX 6 39#define ENIC_BARS_MAX 6
45 40
46#define ENIC_WQ_MAX 8 41#define ENIC_WQ_MAX 8
@@ -124,8 +119,6 @@ struct enic {
124 u64 rq_truncated_pkts; 119 u64 rq_truncated_pkts;
125 u64 rq_bad_fcs; 120 u64 rq_bad_fcs;
126 struct napi_struct napi; 121 struct napi_struct napi;
127 struct net_lro_mgr lro_mgr;
128 struct net_lro_desc lro_desc[ENIC_LRO_MAX_DESC];
129 122
130 /* interrupt resource cache line section */ 123 /* interrupt resource cache line section */
131 ____cacheline_aligned struct vnic_intr intr[ENIC_INTR_MAX]; 124 ____cacheline_aligned struct vnic_intr intr[ENIC_INTR_MAX];