From 8158183ef84613e15625bb6e7febfe163cd2dd8a Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Sun, 2 May 2010 22:27:59 -0700
Subject: [PATCH] --- yaml --- r: 194623 b: refs/heads/master c:
 cd7b5396e7e4d10c51116f59f414ff90312af8d4 h: refs/heads/master i:   194621:
 e1d0608bb39e225fb462c82d2ec9b715bb6f3ff4   194619:
 597cfe060caf5e605cd807d092442bc800806662   194615:
 7720c16bdcb63ff4aeaef9dc8f2826bdc6e072c1   194607:
 d493c8e63a8dcfff4fb695a1741627972090b2df   194591:
 f29f78fe7442e4e339ffca4d987b50221115ee3c   194559:
 d61d5ef064409d30670291ba5c4ac2b1d22636bb v: v3

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

diff --git a/[refs] b/[refs]
index e89c5c79f4bf..98c75bc3af85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dee42870a423ad485129f43cddfe7275479f11d8
+refs/heads/master: cd7b5396e7e4d10c51116f59f414ff90312af8d4
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
index c39938f8a8d8..98112fbddefd 100644
--- a/trunk/include/linux/netdevice.h
+++ b/trunk/include/linux/netdevice.h
@@ -878,7 +878,7 @@ struct net_device {
 	unsigned char		operstate; /* RFC2863 operstate */
 	unsigned char		link_mode; /* mapping policy to operstate */
 
-	unsigned		mtu;	/* interface MTU value		*/
+	unsigned int		mtu;	/* interface MTU value		*/
 	unsigned short		type;	/* interface hardware type	*/
 	unsigned short		hard_header_len;	/* hardware hdr length	*/
 
@@ -1381,10 +1381,10 @@ struct softnet_data {
 	struct sk_buff_head	process_queue;
 
 	/* stats */
-	unsigned		processed;
-	unsigned		time_squeeze;
-	unsigned		cpu_collision;
-	unsigned		received_rps;
+	unsigned int		processed;
+	unsigned int		time_squeeze;
+	unsigned int		cpu_collision;
+	unsigned int		received_rps;
 
 #ifdef CONFIG_RPS
 	struct softnet_data	*rps_ipi_list;