---

yaml --- r: 328121 b: refs/heads/master c: 404f7c9 h: refs/heads/master i: 328119: 9203d87 v: v3
git-mirror · Sep 27, 2012 · 87a7560 · 87a7560
1 parent f2c5509
commit 87a7560
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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 {