openvswitch: Widen TCP flags handling.

Widen TCP flags handling from 7 bits (uint8_t) to 12 bits (uint16_t).
The kernel interface remains at 8 bits, which makes no functional
difference now, as none of the higher bits is currently of interest
to the userspace.

Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>

diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index 5bc5a4e6475824b894720ac72c87aa4ec1f3934a..1408adc2a2a7d2c47f4e32f71863bbd3a04cfdf2 100644 (file)
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -671,7 +671,7 @@ static int ovs_flow_cmd_fill_info(struct sw_flow *flow, struct datapath *dp,
        used = flow->used;
        stats.n_packets = flow->packet_count;
        stats.n_bytes = flow->byte_count;
-       tcp_flags = flow->tcp_flags;
+       tcp_flags = (u8)ntohs(flow->tcp_flags);
        spin_unlock_bh(&flow->lock);
 
        if (used &&

diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c
index 617810f1a21e9bb8dcfc1dbff8577cff756dbd38..b73c7680a3d2afb464b574a16838619f75a96e9f 100644 (file)
--- a/net/openvswitch/flow.c
+++ b/net/openvswitch/flow.c
@@ -58,19 +58,17 @@ u64 ovs_flow_used_time(unsigned long flow_jiffies)
        return cur_ms - idle_ms;
 }
 
-#define TCP_FLAGS_OFFSET 13
-#define TCP_FLAG_MASK 0x3f
+#define TCP_FLAGS_BE16(tp) (*(__be16 *)&tcp_flag_word(tp) & htons(0x0FFF))
 
 void ovs_flow_used(struct sw_flow *flow, struct sk_buff *skb)
 {
-       u8 tcp_flags = 0;
+       __be16 tcp_flags = 0;
 
        if ((flow->key.eth.type == htons(ETH_P_IP) ||
             flow->key.eth.type == htons(ETH_P_IPV6)) &&
            flow->key.ip.proto == IPPROTO_TCP &&
            likely(skb->len >= skb_transport_offset(skb) + sizeof(struct tcphdr))) {
-               u8 *tcp = (u8 *)tcp_hdr(skb);
-               tcp_flags = *(tcp + TCP_FLAGS_OFFSET) & TCP_FLAG_MASK;
+               tcp_flags = TCP_FLAGS_BE16(tcp_hdr(skb));
        }
 
        spin_lock(&flow->lock);

diff --git a/net/openvswitch/flow.h b/net/openvswitch/flow.h
index 098fd1db6a2331553499a87671b0704ae5ada339..204e0ccd116d3ed90be19e750321e92c38093002 100644 (file)
--- a/net/openvswitch/flow.h
+++ b/net/openvswitch/flow.h
@@ -158,7 +158,7 @@ struct sw_flow {
        unsigned long used;     /* Last used time (in jiffies). */
        u64 packet_count;       /* Number of packets matched. */
        u64 byte_count;         /* Number of bytes matched. */
-       u8 tcp_flags;           /* Union of seen TCP flags. */
+       __be16 tcp_flags;       /* Union of seen TCP flags. */
 };
 
 struct arp_eth_header {