diff options
| author | Jarno Rajahalme <jrajahalme@nicira.com> | 2013-10-23 01:40:44 -0700 |
|---|---|---|
| committer | Jesse Gross <jesse@nicira.com> | 2013-11-01 18:43:45 -0700 |
| commit | df23e9f642830f10c505c8a3d57772ad1238c701 (patch) | |
| tree | 5b20e4e91e2a66381931bf1a35e3533274f91767 /net | |
| parent | 3cdb35b074142c915a463c535839886ae08fdfd4 (diff) | |
| download | kernel-common-df23e9f642830f10c505c8a3d57772ad1238c701.tar.gz kernel-common-df23e9f642830f10c505c8a3d57772ad1238c701.tar.bz2 kernel-common-df23e9f642830f10c505c8a3d57772ad1238c701.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/openvswitch/datapath.c | 2 | ||||
| -rw-r--r-- | net/openvswitch/flow.c | 8 | ||||
| -rw-r--r-- | net/openvswitch/flow.h | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 5bc5a4e64758..1408adc2a2a7 100644 --- 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 617810f1a21e..b73c7680a3d2 100644 --- 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 098fd1db6a23..204e0ccd116d 100644 --- 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 { |