X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=lib%2Fdpif-netdev.h;h=9e2dd23fc889e8e711a062cd3659c4fa337a93b6;hb=HEAD;hp=410fcfa1554f6490d25f549562c2b06cd7f12c25;hpb=abb5943dbb8005a9de59c68e4d798fbd072d33f0;p=cascardo%2Fovs.git diff --git a/lib/dpif-netdev.h b/lib/dpif-netdev.h index 410fcfa15..9e2dd23fc 100644 --- a/lib/dpif-netdev.h +++ b/lib/dpif-netdev.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. + * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2015 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ #include #include "dpif.h" #include "openvswitch/types.h" -#include "ofpbuf.h" +#include "dp-packet.h" #include "packets.h" #ifdef __cplusplus @@ -33,13 +33,15 @@ extern "C" { * headers to be aligned on a 4-byte boundary. */ enum { DP_NETDEV_HEADROOM = 2 + VLAN_HEADER_LEN }; -static inline void dp_packet_pad(struct ofpbuf *b) +static inline void dp_packet_pad(struct dp_packet *p) { - if (ofpbuf_size(b) < ETH_TOTAL_MIN) { - ofpbuf_put_zeros(b, ETH_TOTAL_MIN - ofpbuf_size(b)); + if (dp_packet_size(p) < ETH_TOTAL_MIN) { + dp_packet_put_zeros(p, ETH_TOTAL_MIN - dp_packet_size(p)); } } +bool dpif_is_netdev(const struct dpif *); + #define NR_QUEUE 1 #define NR_PMD_THREADS 1