1 files changed, 10 insertions, 11 deletions

diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index 45e86d1e5b1b..f239aa8c6f4c 100644
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
  *
  * This program is free software; you may redistribute it and/or modify
@@ -20,8 +20,6 @@
 #ifndef _ENIC_H_
 #define _ENIC_H_
 
-#include <linux/inet_lro.h>
-
 #include "vnic_enet.h"
 #include "vnic_dev.h"
 #include "vnic_wq.h"
@@ -34,12 +32,8 @@
 
 #define DRV_NAME                "enic"
 #define DRV_DESCRIPTION         "Cisco VIC Ethernet NIC Driver"
-#define DRV_VERSION             "1.3.1.1-pp"
-#define DRV_COPYRIGHT           "Copyright 2008-2009 Cisco Systems, Inc"
-#define PFX                     DRV_NAME ": "
-
-#define ENIC_LRO_MAX_DESC       8
-#define ENIC_LRO_MAX_AGGR       64
+#define DRV_VERSION             "1.4.1.1"
+#define DRV_COPYRIGHT           "Copyright 2008-2010 Cisco Systems, Inc"
 
 #define ENIC_BARS_MAX           6
 
@@ -116,6 +110,8 @@ struct enic {
         spinlock_t wq_lock[ENIC_WQ_MAX];
         unsigned int wq_count;
         struct vlan_group *vlan_group;
+        u16 loop_enable;
+        u16 loop_tag;
 
         /* receive queue cache line section */
         ____cacheline_aligned struct vnic_rq rq[ENIC_RQ_MAX];
@@ -124,8 +120,6 @@ struct enic {
         u64 rq_truncated_pkts;
         u64 rq_bad_fcs;
         struct napi_struct napi;
-        struct net_lro_mgr lro_mgr;
-        struct net_lro_desc lro_desc[ENIC_LRO_MAX_DESC];
 
         /* interrupt resource cache line section */
         ____cacheline_aligned struct vnic_intr intr[ENIC_INTR_MAX];
@@ -137,4 +131,9 @@ struct enic {
         unsigned int cq_count;
 };
 
+static inline struct device *enic_get_dev(struct enic *enic)
+{
+        return &(enic->pdev->dev);
+}
+
 #endif /* _ENIC_H_ */