--- zzzz-none-000/linux-4.1.52/net/ipv4/fib_trie.c	2018-05-28 02:26:45.000000000 +0000
+++ bcm63-7530ax-731/linux-4.1.52/net/ipv4/fib_trie.c	2022-03-02 11:37:13.000000000 +0000
@@ -2433,9 +2433,13 @@
 static struct key_vector *fib_route_get_idx(struct fib_route_iter *iter,
 					    loff_t pos)
 {
+#if !defined(CONFIG_BCM_KF_MISC_BACKPORTS)
 	struct fib_table *tb = iter->main_tb;
+#endif
 	struct key_vector *l, **tp = &iter->tnode;
+#if !defined(CONFIG_BCM_KF_MISC_BACKPORTS)
 	struct trie *t;
+#endif
 	t_key key;
 
 	/* use cache location of next-to-find key */
@@ -2443,8 +2447,10 @@
 		pos -= iter->pos;
 		key = iter->key;
 	} else {
+#if !defined(CONFIG_BCM_KF_MISC_BACKPORTS)
 		t = (struct trie *)tb->tb_data;
 		iter->tnode = t->kv;
+#endif
 		iter->pos = 0;
 		key = 0;
 	}
@@ -2485,12 +2491,18 @@
 		return NULL;
 
 	iter->main_tb = tb;
+#if defined(CONFIG_BCM_KF_MISC_BACKPORTS)
+	t = (struct trie *)tb->tb_data;
+	iter->tnode = t->kv;
+#endif
 
 	if (*pos != 0)
 		return fib_route_get_idx(iter, *pos);
 
+#if !defined(CONFIG_BCM_KF_MISC_BACKPORTS)
 	t = (struct trie *)tb->tb_data;
 	iter->tnode = t->kv;
+#endif
 	iter->pos = 0;
 	iter->key = 0;