From 87a75609c046c550de6baf271b3807675ef85d72 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Wed, 26 Sep 2012 07:07:47 +0000
Subject: [PATCH] --- yaml --- r: 328121 b: refs/heads/master c:
 404f7c9e118e0c92902afe1853d35f5638fe4a4c h: refs/heads/master i:   328119:
 9203d871c612e8f6d446f23280b266497f06d8e1 v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/netdevice.h | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index af7b9e09cb0c..2c98709dee0f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69b08f62e17439ee3d436faf0b9a7ca6fffb78db
+refs/heads/master: 404f7c9e118e0c92902afe1853d35f5638fe4a4c
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
index 6c131f055ab0..dd320bb22a5a 100644
--- a/trunk/include/linux/netdevice.h
+++ b/trunk/include/linux/netdevice.h
@@ -338,18 +338,16 @@ struct napi_struct {
 
 	unsigned long		state;
 	int			weight;
+	unsigned int		gro_count;
 	int			(*poll)(struct napi_struct *, int);
 #ifdef CONFIG_NETPOLL
 	spinlock_t		poll_lock;
 	int			poll_owner;
 #endif
-
-	unsigned int		gro_count;
-
 	struct net_device	*dev;
-	struct list_head	dev_list;
 	struct sk_buff		*gro_list;
 	struct sk_buff		*skb;
+	struct list_head	dev_list;
 };
 
 enum {