From: Ben Pfaff <blp@nicira.com>
Date: Tue, 27 Mar 2012 17:20:56 +0000 (-0700)
Subject: dpif-netdev: Correct type of struct dp_netdev_flow's 'tcp_flags' member.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c808e39518f563ff03d6d01323cb05b17312568;p=openvswitch

dpif-netdev: Correct type of struct dp_netdev_flow's 'tcp_flags' member.

TCP flags fit in 8 bits so this type seems more appropriate.

Fixes the following "sparse" warnings introduced by commit 734ec5ec1349
(packet: Add additional TCP flags extraction on IPv6.):

dpif-netdev.c:630: warning: incorrect type in assignment (different base types)
dpif-netdev.c:630:    expected unsigned char [unsigned] [usertype] tcp_flags
dpif-netdev.c:630:    got restricted __be16 [usertype] tcp_flags
dpif-netdev.c:979: warning: invalid assignment: |=
dpif-netdev.c:979:    left side has type restricted __be16
dpif-netdev.c:979:    right side has type unsigned char

CC: Jesse Gross <jesse@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
index 8381a897..16860870 100644
--- a/lib/dpif-netdev.c
+++ b/lib/dpif-netdev.c
@@ -113,7 +113,7 @@ struct dp_netdev_flow {
     long long int used;         /* Last used time, in monotonic msecs. */
     long long int packet_count; /* Number of packets matched. */
     long long int byte_count;   /* Number of bytes matched. */
-    ovs_be16 tcp_flags;         /* Bitwise-OR of seen tcp_flags values. */
+    uint8_t tcp_flags;          /* Bitwise-OR of seen tcp_flags values. */
 
     /* Actions. */
     struct nlattr *actions;