--- zzzz-none-000/linux-2.6.28.10/include/linux/ipv6.h	2009-05-02 18:54:43.000000000 +0000
+++ puma5-6360-529/linux-2.6.28.10/include/linux/ipv6.h	2010-01-19 14:12:20.000000000 +0000
@@ -148,6 +148,9 @@
 #endif
 	__s32		max_addresses;
 	__s32		accept_ra_defrtr;
+#ifdef CONFIG_IPV6_MULTIPLE_TABLES
+    __u32       ra_defrtr_table;
+#endif
 	__s32		accept_ra_pinfo;
 #ifdef CONFIG_IPV6_ROUTER_PREF
 	__s32		accept_ra_rtr_pref;
@@ -324,7 +327,12 @@
 				dstopts:1,
 				odstopts:1,
                                 rxflow:1,
+#ifdef CONFIG_TI_IP_PKTINFO_SOCKOPT
+				rxtclass:1,
+                ti_rxinfo:1;
+#else
 				rxtclass:1;
+#endif
 		} bits;
 		__u16		all;
 	} rxopt;