diff --git a/[refs] b/[refs]
index 574426b67660..6ee95ae36d46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a57334e95e4fb132acca05bdc0efa2f9dda194af
+refs/heads/master: 6e50e8a2136f1a90de251c653226ded447c5c915
diff --git a/trunk/include/linux/if_phonet.h b/trunk/include/linux/if_phonet.h
index 7e989216ec17..d70034bcec05 100644
--- a/trunk/include/linux/if_phonet.h
+++ b/trunk/include/linux/if_phonet.h
@@ -5,14 +5,15 @@
  *
  * Copyright (C) 2008 Nokia Corporation. All rights reserved.
  */
+#ifndef LINUX_IF_PHONET_H
+#define LINUX_IF_PHONET_H
 
-#define PHONET_HEADER_LEN	8	/* Phonet header length */
-
-#define PHONET_MIN_MTU		6
-/* 6 bytes header + 65535 bytes payload */
-#define PHONET_MAX_MTU		65541
+#define PHONET_MIN_MTU		6	/* pn_length = 0 */
+#define PHONET_MAX_MTU		65541	/* pn_length = 0xffff */
 #define PHONET_DEV_MTU		PHONET_MAX_MTU
 
 #ifdef __KERNEL__
 extern struct header_ops phonet_header_ops;
 #endif
+
+#endif