diff --git a/[refs] b/[refs]
index 8e4a5c399d7d..b01845587912 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 475414f6f20cb1211319f02a96ef241f716cfe1d
+refs/heads/master: a861a8b233e9024303fb8e73e465e81ad7119d5a
diff --git a/trunk/include/linux/netdev_features.h b/trunk/include/linux/netdev_features.h
index 04ac8f8433e9..20e3a1f9892d 100644
--- a/trunk/include/linux/netdev_features.h
+++ b/trunk/include/linux/netdev_features.h
@@ -12,7 +12,7 @@
 
 #include <linux/types.h>
 
-typedef u32 netdev_features_t;
+typedef u64 netdev_features_t;
 
 enum {
 	NETIF_F_SG_BIT,			/* Scatter/gather IO. */