From: Simon Horman <horms@verge.net.au>
Subject: [patch] linux-2.6.18.8-xen: ixgbe: memset size in
	netif_napi_del()
Date: Tue, 18 Aug 2009 15:49:06 +1000
Message-ID: <20090818054904.GA20383@verge.net.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
Cc: Mitch Williams <mitch.a.williams@intel.com>
List-Id: xen-devel@lists.xenproject.org

By inspection the memset appears to be long as napi->poll_dev
is a struct net_device not a struct napi_struct.

Cc: Mitch Williams <mitch.a.williams@intel.com>
Signed-off-by: Simon Horman <horms@verge.net.au>

--- 

Compile tested only.

Index: linux-2.6.18-xen.hg/drivers/net/ixgbe/kcompat.h
===================================================================
--- linux-2.6.18-xen.hg.orig/drivers/net/ixgbe/kcompat.h	2009-08-18 15:42:32.000000000 +1000
+++ linux-2.6.18-xen.hg/drivers/net/ixgbe/kcompat.h	2009-08-18 15:43:32.000000000 +1000
@@ -1595,7 +1595,7 @@ extern int __kc_adapter_clean(struct net
 	do { \
 		WARN_ON(!test_bit(__LINK_STATE_RX_SCHED, &(_napi)->poll_dev.state)); \
 		dev_put(&(_napi)->poll_dev); \
-		memset(&(_napi)->poll_dev, 0, sizeof(struct napi_struct));\
+		memset(&(_napi)->poll_dev, 0, sizeof((_napi)->poll_dev));\
 	} while (0)
 #else /* DRIVER_IGB || DRIVER_IXGBE */
 #define netif_rx_complete(netdev, napi) netif_rx_complete(netdev)