--- zzzz-none-000/linux-2.6.39.4/net/ipv6/ipv6_sockglue.c	2011-08-03 19:43:28.000000000 +0000
+++ puma6-arm-6490-729/linux-2.6.39.4/net/ipv6/ipv6_sockglue.c	2021-11-10 13:23:11.000000000 +0000
@@ -85,7 +85,7 @@
 			return 0;
 		}
 	}
-	if (new_ra == NULL) {
+	if (!new_ra) {
 		write_unlock_bh(&ip6_ra_lock);
 		return -ENOBUFS;
 	}
@@ -129,8 +129,8 @@
 	int val, valbool;
 	int retv = -ENOPROTOOPT;
 
-	if (optval == NULL)
-		val=0;
+	if (!optval)
+		val = 0;
 	else {
 		if (optlen >= sizeof(int)) {
 			if (get_user(val, (int __user *) optval))
@@ -253,6 +253,12 @@
 		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;
@@ -373,7 +379,7 @@
 		 */
 		if (optlen == 0)
 			optval = NULL;
-		else if (optval == NULL)
+		else if (!optval)
 			goto e_inval;
 		else if (optlen < sizeof(struct ipv6_opt_hdr) ||
 			 optlen & 0x7 || optlen > 8 * 255)
@@ -424,7 +430,7 @@
 
 		if (optlen == 0)
 			goto e_inval;
-		else if (optlen < sizeof(struct in6_pktinfo) || optval == NULL)
+		else if (optlen < sizeof(struct in6_pktinfo) || !optval)
 			goto e_inval;
 
 		if (copy_from_user(&pkt, optval, sizeof(struct in6_pktinfo))) {
@@ -463,7 +469,7 @@
 
 		opt = sock_kmalloc(sk, sizeof(*opt) + optlen, GFP_KERNEL);
 		retv = -ENOBUFS;
-		if (opt == NULL)
+		if (!opt)
 			break;
 
 		memset(opt, 0, sizeof(*opt));
@@ -1026,7 +1032,11 @@
 	case IPV6_RECVPKTINFO:
 		val = np->rxopt.bits.rxinfo;
 		break;
-
+#ifdef CONFIG_TI_IP_PKTINFO_SOCKOPT
+    case TI_IPV6_PKTINFO:
+		val = np->rxopt.bits.ti_rxinfo;
+		break;
+#endif
 	case IPV6_2292PKTINFO:
 		val = np->rxopt.bits.rxoinfo;
 		break;