From b8927a53eb24421a1df179a674102f4772244753 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Tue, 5 Mar 2013 15:57:22 +0000
Subject: [PATCH] --- yaml --- r: 368108 b: refs/heads/master c:
 82dc3c63c692b1e1d59378ecee948ac88e034aad h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/netdevice.h | 5 +++++
 trunk/net/core/dev.c            | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fae671706f3d..2f75a5887db5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd9f319d94c99b96fc9b34ccde7389a91059fe31
+refs/heads/master: 82dc3c63c692b1e1d59378ecee948ac88e034aad
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
index b3d00fa4b314..896eb4985f97 100644
--- a/trunk/include/linux/netdevice.h
+++ b/trunk/include/linux/netdevice.h
@@ -1475,6 +1475,11 @@ static inline void *netdev_priv(const struct net_device *dev)
  */
 #define SET_NETDEV_DEVTYPE(net, devtype)	((net)->dev.type = (devtype))
 
+/* Default NAPI poll() weight
+ * Device drivers are strongly advised to not use bigger value
+ */
+#define NAPI_POLL_WEIGHT 64
+
 /**
  *	netif_napi_add - initialize a napi context
  *	@dev:  network device
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index a06a7a58dd11..96103894ad69 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -4057,6 +4057,9 @@ void netif_napi_add(struct net_device *dev, struct napi_struct *napi,
 	napi->gro_list = NULL;
 	napi->skb = NULL;
 	napi->poll = poll;
+	if (weight > NAPI_POLL_WEIGHT)
+		pr_err_once("netif_napi_add() called with weight %d on device %s\n",
+			    weight, dev->name);
 	napi->weight = weight;
 	list_add(&napi->dev_list, &dev->napi_list);
 	napi->dev = dev;