gistfile1.txt

diff -ruNw old/here/usr/src/vrouter-1.20+3150+5f38b7b/dkms.conf new/here/usr/src/vrouter-1.21+3181+2c8ab6d/dkms.conf
--- old/here/usr/src/vrouter-1.20+3150+5f38b7b/dkms.conf	2014-10-28 14:35:32.000000000 +0000
+++ new/here/usr/src/vrouter-1.21+3181+2c8ab6d/dkms.conf	2014-11-24 11:01:08.000000000 +0000
@@ -1,5 +1,5 @@
 PACKAGE_NAME=vrouter
-PACKAGE_VERSION="1.20+3150+5f38b7b"
+PACKAGE_VERSION="1.21+3181+2c8ab6d"
 MAKE[0]="'make' -C . KERNELDIR=/lib/modules/${kernelver}/build"
 CLEAN[0]="'make' -C . KERNELDIR=/lib/modules/${kernelver}/build"
 BUILT_MODULE_NAME[0]="vrouter"
diff -ruNw old/here/usr/src/vrouter-1.20+3150+5f38b7b/dp-core/vr_nexthop.c new/here/usr/src/vrouter-1.21+3181+2c8ab6d/dp-core/vr_nexthop.c
--- old/here/usr/src/vrouter-1.20+3150+5f38b7b/dp-core/vr_nexthop.c	2014-10-02 12:05:51.000000000 +0000
+++ new/here/usr/src/vrouter-1.21+3181+2c8ab6d/dp-core/vr_nexthop.c	2014-11-16 23:57:03.000000000 +0000
@@ -1576,6 +1576,8 @@
         if (tmp_nh && ((tmp_nh->nh_type != NH_COMPOSITE) ||
                  (!(tmp_nh->nh_flags & NH_FLAG_COMPOSITE_FABRIC)))) {
             for (i = 1; i < nh->nh_component_cnt; i++) {
+                if (!nh->nh_component_nh[i].cnh)
+                    continue;
                 if ((nh->nh_component_nh[i].cnh->nh_type == NH_COMPOSITE) && 
                         (nh->nh_component_nh[i].cnh->nh_flags & 
                                         NH_FLAG_COMPOSITE_FABRIC)) {