From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 19 Aug 2009 12:00:40 +0000 (+0100)
Subject: ixgbe: memset size in netif_napi_del()
X-Git-Tag: xen-3.4.2~12
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c7a9e79ae1148788efe4a8948b7689345c6e15ff;p=legacy%2Flinux-2.6.18-xen.git

ixgbe: memset size in netif_napi_del()

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>
---

diff --git a/drivers/net/ixgbe/kcompat.h b/drivers/net/ixgbe/kcompat.h
index 9e72dc5f..c6d14790 100644
--- a/drivers/net/ixgbe/kcompat.h
+++ b/drivers/net/ixgbe/kcompat.h
@@ -1595,7 +1595,7 @@ extern int __kc_adapter_clean(struct net_device *, int *);
 	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)