--- zzzz-none-000/linux-2.6.39.4/include/linux/ipv6.h	2011-08-03 19:43:28.000000000 +0000
+++ puma6-arm-6490-729/linux-2.6.39.4/include/linux/ipv6.h	2021-11-10 13:23:10.000000000 +0000
@@ -153,6 +153,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;
@@ -281,6 +284,12 @@
 struct ipv6_ac_socklist;
 struct ipv6_fl_socklist;
 
+struct inet6_cork {
+	struct ipv6_txoptions *opt;
+	u8 hop_limit;
+	u8 tclass;
+};
+
 /**
  * struct ipv6_pinfo - ipv6 private area
  *
@@ -342,7 +351,13 @@
                                 rxflow:1,
 				rxtclass:1,
 				rxpmtu:1,
-				rxorigdstaddr:1;
+#ifdef CONFIG_TI_IP_PKTINFO_SOCKOPT
+				rxorigdstaddr:1,
+                ti_rxinfo:1;
+#else
+                rxorigdstaddr:1;
+#endif
+
 				/* 2 bits hole */
 		} bits;
 		__u16		all;
@@ -371,11 +386,7 @@
 	struct ipv6_txoptions	*opt;
 	struct sk_buff		*pktoptions;
 	struct sk_buff		*rxpmtu;
-	struct {
-		struct ipv6_txoptions *opt;
-		u8 hop_limit;
-		u8 tclass;
-	} cork;
+	struct inet6_cork	cork;
 };
 
 /* WARNING: don't change the layout of the members in {raw,udp,tcp}6_sock! */