X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fofpbuf.h;h=85be899527eee24999bd00934677fa67aaa51a8d;hb=28c5588e8e1a8d091c5d2275232c35f2968a97fa;hp=3312e9bc1507ad205f4bddcdeb0fa77d9ec3c790;hpb=cf3b7538666cd1efa314ce4944e4efdf3dd81d99;p=sliver-openvswitch.git

diff --git a/lib/ofpbuf.h b/lib/ofpbuf.h
index 3312e9bc1..85be89952 100644
--- a/lib/ofpbuf.h
+++ b/lib/ofpbuf.h
@@ -60,18 +60,18 @@ struct ofpbuf {
 #ifdef DPDK_NETDEV
     struct rte_mbuf mbuf;       /* DPDK mbuf */
 #else
-    void *base;                 /* First byte of allocated space. */
-    void *data;                 /* First byte actually in use. */
-    uint32_t size;              /* Number of bytes in use. */
+    void *base_;                 /* First byte of allocated space. */
+    void *data_;                 /* First byte actually in use. */
+    uint32_t size_;              /* Number of bytes in use. */
 #endif
     uint32_t allocated;         /* Number of bytes allocated. */
 
     void *frame;                /* Packet frame start, or NULL. */
-    uint16_t l2_5_ofs;          /* MPLS label stack offset from 'packet', or
+    uint16_t l2_5_ofs;          /* MPLS label stack offset from 'frame', or
                                  * UINT16_MAX */
-    uint16_t l3_ofs;            /* Network-level header offset from 'packet',
+    uint16_t l3_ofs;            /* Network-level header offset from 'frame',
                                    or UINT16_MAX. */
-    uint16_t l4_ofs;            /* Transport-level header offset from 'packet',
+    uint16_t l4_ofs;            /* Transport-level header offset from 'frame',
                                    or UINT16_MAX. */
     enum ofpbuf_source source;  /* Source of memory allocated as 'base'. */
     struct list list_node;      /* Private list element for use by owner. */
@@ -389,32 +389,32 @@ static inline void ofpbuf_set_size(struct ofpbuf *b, uint32_t v)
 #else
 static inline void * ofpbuf_data(const struct ofpbuf *b)
 {
-    return b->data;
+    return b->data_;
 }
 
 static inline void ofpbuf_set_data(struct ofpbuf *b, void *d)
 {
-    b->data = d;
+    b->data_ = d;
 }
 
 static inline void * ofpbuf_base(const struct ofpbuf *b)
 {
-    return b->base;
+    return b->base_;
 }
 
 static inline void ofpbuf_set_base(struct ofpbuf *b, void *d)
 {
-    b->base = d;
+    b->base_ = d;
 }
 
 static inline uint32_t ofpbuf_size(const struct ofpbuf *b)
 {
-    return b->size;
+    return b->size_;
 }
 
 static inline void ofpbuf_set_size(struct ofpbuf *b, uint32_t v)
 {
-    b->size = v;
+    b->size_ = v;
 }
 #endif