vrouter compilation failure for ubuntu 3.13.0-36-generic

[Anand H. Krishnan]

DKMS make.log for vrouter-1.11+20140910 for kernel 3.13.0-36-generic (x86_64)
Wed Sep 24 17:53:52 UTC 2014
make: Entering directory `/var/lib/dkms/vrouter/1.11+20140910/build'
make -C /lib/modules/3.13.0-36-generic/build M=/var/lib/dkms/vrouter/1.11+20140910/build modules
make[1]: Entering directory `/usr/src/linux-headers-3.13.0-36-generic'
  CC [M] /var/lib/dkms/vrouter/1.11+20140910/build/linux/vrouter_mod.o
In file included from /var/lib/dkms/vrouter/1.11+20140910/build/linux/vrouter_mod.c:11:0:
include/linux/skbuff.h:754:24: error: redefinition of <E2><80><98>skb_get_hash<E2><80><99>
 #define skb_get_rxhash skb_get_hash
                        ^
/var/lib/dkms/vrouter/1.11+20140910/build/include/vr_compat.h:25:1: note: in expansion of macro <E2><80><98>skb_get_rxhash<E2><80><99>
 skb_get_rxhash(struct sk_buff *skb)
 ^
include/linux/skbuff.h:747:21: note: previous definition of <E2><80><98>skb_get_hash<E2><80><99> was here
 static inline __u32 skb_get_hash(struct sk_buff *skb)
                     ^
make[2]: *** [/var/lib/dkms/vrouter/1.11+20140910/build/linux/vrouter_mod.o] Error 1
make[1]: *** [_module_/var/lib/dkms/vrouter/1.11+20140910/build] Error 2
make[1]: Leaving directory `/usr/src/linux-headers-3.13.0-36-generic'
make: *** [default] Error 2
make: Leaving directory `/var/lib/dkms/vrouter/1.11+20140910/build'

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/3095
Committed: http://github.org/Juniper/contrail-vrouter/commit/c6bab0328707c3fe4d9ce8d18a73e9e40c1a0bc5
Submitter: Zuul
Branch: master

commit c6bab0328707c3fe4d9ce8d18a73e9e40c1a0bc5
Author: anandhk-juniper <email address hidden>
Date: Thu Sep 25 00:49:21 2014 +0530

Fix compilation failure for ubuntu 3.13.0-36-generic (and above)

From 3.13.0-36, ubuntu did

while keeping the kernel version the same as 3.13.0-32. The only option
that was left then was to check for definition of skb_get_rxhash

Change-Id: Idd76936ee87904f37af17528dc9df88194fb2110
Closes Bug:1373574

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/3132
Committed: http://github.org/Juniper/contrail-vrouter/commit/8a8c89668f6dda62e56b81779be42d45435d078c
Submitter: Zuul
Branch: R1.06

commit 8a8c89668f6dda62e56b81779be42d45435d078c
Author: anandhk-juniper <email address hidden>
Date: Thu Sep 25 00:49:21 2014 +0530

Fix compilation failure for ubuntu 3.13.0-36-generic (and above)

From 3.13.0-36, ubuntu did

while keeping the kernel version the same as 3.13.0-32. The only option
that was left then was to check for definition of skb_get_rxhash

Closes Bug:1373574
Change-Id: Idd76936ee87904f37af17528dc9df88194fb2110
(cherry picked from commit c6bab0328707c3fe4d9ce8d18a73e9e40c1a0bc5)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/3131
Committed: http://github.org/Juniper/contrail-vrouter/commit/0bd9ac6939b5e5f5798c33e126f5b44783c13c27
Submitter: Zuul
Branch: R1.10

commit 0bd9ac6939b5e5f5798c33e126f5b44783c13c27
Author: anandhk-juniper <email address hidden>
Date: Thu Sep 25 00:49:21 2014 +0530

Fix compilation failure for ubuntu 3.13.0-36-generic (and above)

From 3.13.0-36, ubuntu did

while keeping the kernel version the same as 3.13.0-32. The only option
that was left then was to check for definition of skb_get_rxhash

Closes Bug:1373574
Change-Id: Idd76936ee87904f37af17528dc9df88194fb2110
(cherry picked from commit c6bab0328707c3fe4d9ce8d18a73e9e40c1a0bc5)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/3188
Committed: http://github.org/Juniper/contrail-vrouter/commit/6e527c4a238838857e3cfa3824cc00d1f9e52d60
Submitter: Zuul
Branch: R1.05

commit 6e527c4a238838857e3cfa3824cc00d1f9e52d60
Author: anandhk-juniper <email address hidden>
Date: Thu Sep 25 00:49:21 2014 +0530

Fix compilation failure for ubuntu 3.13.0-36-generic (and above)

From 3.13.0-36, ubuntu did

while keeping the kernel version the same as 3.13.0-32. The only option
that was left then was to check for definition of skb_get_rxhash

Closes Bug:1373574
Change-Id: Idd76936ee87904f37af17528dc9df88194fb2110
(cherry picked from commit c6bab0328707c3fe4d9ce8d18a73e9e40c1a0bc5)

[John Deatherage (routelastresort)]

This obviously also affects 3.13.0-37 (what I'm on) and beyond, but the fix works great!

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/3692
Committed: http://github.org/Juniper/contrail-vrouter/commit/06bdd00f3f46177e49fc1f7bea9b5f1d1e7c9263
Submitter: Zuul
Branch: master

commit 06bdd00f3f46177e49fc1f7bea9b5f1d1e7c9263
Author: Ananth Suryanarayana <email address hidden>
Date: Mon Oct 13 13:24:20 2014 -0700

commit cb097ef4c40af67ebe726d5da5c25d5bccb5658b
Author: Raja Sivaramakrishnan <email address hidden>
Date: Mon Oct 6 15:47:48 2014 -0700

Ensure "scons vrouter" builds uvrouter and utils too (to avoid build breaks)

Fixes bug 1374188.

commit 9c97927bff3f50f462570a83b7d45a570c58c9be
Author: Divakar <email address hidden>
Date: Sun Oct 5 02:28:37 2014 -0700

Bug:#1377581. Formatting Bridge table display

commit ff17558202d5c4b288b0443756025224e656c584
Author: Divakar <email address hidden>
Date: Mon Sep 29 09:37:07 2014 -0700

Fix for https://bugs.launchpad.net/juniperopenstack/+bug/1372262 a separate port list of link local ser

commit e457cab426f370476bc24c14e63d49ae30d1cbd3
Author: Wojciech Zmuda <email address hidden>
Date: Mon Sep 29 16:30:11 2014 +0200

Fix "symbol vrouter_dbg undefined" and "symbol vr_inet_vrf_stats undefined" errors.
Errors occured while loading vrouter.ko module on FreeBSD.

commit 78306f449e0de38f572d50044c8b98d49cda9a0b
Author: Wojciech Zmuda <email address hidden>
Date: Wed Sep 24 10:49:11 2014 +0200

Fix coding-style and formatting of latest commit.
Author: Wojciech Zmuda

commit f6f8f7930918808d3be33d6df9033ea2b73ab0da
Author: Ganesan Prabhakaran <email address hidden>
Date: Thu Sep 25 16:21:10 2014 -0700

Fix build issue in mainline

commit 23a2aac703cc2b781ee94e15fe740dead85b72a9
Author: ashoksingh <email address hidden>
Date: Thu Sep 25 17:32:56 2014 +0530

IPv6 changes
(on behalf of Prabhakaran)

commit c6bab0328707c3fe4d9ce8d18a73e9e40c1a0bc5
Author: anandhk-juniper <email address hidden>
Date: Thu Sep 25 00:49:21 2014 +0530

Fix compilation failure for ubuntu 3.13.0-36-generic (and above)

From 3.13.0-36, ubuntu did

while keeping the kernel version the same as 3.13.0-32. The only option
that was left then was to check for definition of skb_get_rxhash
Closes Bug:1373574

Change-Id: I55ed2fa036d4a0a68de9386ff7c9cf5d91bb1ef5