[ovs-dev] [PATCH] dpif-netdev: Fix windows build.

[Daniele Di Proietto]

Thanks, pushed to master




On 19/10/2016 14:51, "Sairam Venugopal" <vsairam at vmware.com> wrote:

>Acked-by: Sairam Venugopal <vsairam at vmware.com>
>
>
>On 10/19/16, 1:50 PM, "Daniele Di Proietto" <diproiettod at vmware.com> wrote:
>
>>OVS_ALIGNED_VAR(...) should be at the beginning of a definition, as
>>the example in include/openvswitch/compiler.h shows.
>>
>>Fixes: 38ee0814978c ("dpif-netdev: Cache align netdev_flow_keys.")
>>Reported-by: Joe Stringer <joe at ovn.org>
>>Signed-off-by: Daniele Di Proietto <diproiettod at vmware.com>
>>---
>> lib/dpif-netdev.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>>diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
>>index 8fd98ba..5049b40 100644
>>--- a/lib/dpif-netdev.c
>>+++ b/lib/dpif-netdev.c
>>@@ -4166,7 +4166,7 @@ dp_netdev_input__(struct dp_netdev_pmd_thread *pmd,
>>     /* Sparse or MSVC doesn't like variable length array. */
>>     enum { PKT_ARRAY_SIZE = NETDEV_MAX_BURST };
>> #endif
>>-    struct netdev_flow_key keys[PKT_ARRAY_SIZE]
>>OVS_ALIGNED_VAR(CACHE_LINE_SIZE);
>>+    OVS_ALIGNED_VAR(CACHE_LINE_SIZE) struct netdev_flow_key
>>keys[PKT_ARRAY_SIZE];
>>     struct packet_batch_per_flow batches[PKT_ARRAY_SIZE];
>>     long long now = time_msec();
>>     size_t newcnt, n_batches, i;
>>-- 
>>2.9.3
>>
>>_______________________________________________
>>dev mailing list
>>dev at openvswitch.org
>>https://urldefense.proofpoint.com/v2/url?u=http-3A__openvswitch.org_mailma
>>n_listinfo_dev&d=CwIGaQ&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs&r=Dc
>>ruz40PROJ40ROzSpxyQSLw6fcrOWpJgEcEmNR3JEQ&m=9G-306KzD4JzLJoDuBiO39_CkyssGT
>>O_eDMnviCOPhA&s=5ifhmVSgfNxAZq48MJ11MsVW0XN6ellv6Rgz-ko3-Ow&e= 
>