--- zzzz-none-000/linux-2.6.28.10/net/ipv6/ipv6_sockglue.c	2009-05-02 18:54:43.000000000 +0000
+++ puma5-6360-529/linux-2.6.28.10/net/ipv6/ipv6_sockglue.c	2010-01-19 14:12:20.000000000 +0000
@@ -255,6 +255,13 @@
 		retv = 0;
 		break;
 
+#ifdef CONFIG_TI_IP_PKTINFO_SOCKOPT
+    case TI_IPV6_PKTINFO:
+		np->rxopt.bits.ti_rxinfo = valbool;
+		retv = 0;
+		break;
+#endif
+
 	case IPV6_RECVHOPLIMIT:
 		if (optlen < sizeof(int))
 			goto e_inval;
@@ -966,6 +973,12 @@
 		val = np->rxopt.bits.rxoinfo;
 		break;
 
+#ifdef CONFIG_TI_IP_PKTINFO_SOCKOPT
+    case TI_IPV6_PKTINFO:
+		val = np->rxopt.bits.ti_rxinfo;
+		break;
+#endif
+
 	case IPV6_RECVHOPLIMIT:
 		val = np->rxopt.bits.rxhlim;
 		break;