projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: Add clean compat layer for dev_get_stats().
[openvswitch]
/
datapath
/
flow.c
diff --git
a/datapath/flow.c
b/datapath/flow.c
index dfbf76938e0c8f7d1979384b8b0adcb1048318f9..face40b3c9f4e4da96a0587c005db4ac8fd56502 100644
(file)
--- a/
datapath/flow.c
+++ b/
datapath/flow.c
@@
-205,8
+205,7
@@
static void parse_vlan(struct sk_buff *skb, struct odp_flow_key *key)
return;
qp = (struct qtag_prefix *) skb->data;
return;
qp = (struct qtag_prefix *) skb->data;
- key->dl_vlan = qp->tci & htons(VLAN_VID_MASK);
- key->dl_vlan_pcp = (ntohs(qp->tci) & VLAN_PCP_MASK) >> VLAN_PCP_SHIFT;
+ key->dl_tci = qp->tci | htons(ODP_TCI_PRESENT);
__skb_pull(skb, sizeof(struct qtag_prefix));
}
__skb_pull(skb, sizeof(struct qtag_prefix));
}
@@
-247,6
+246,8
@@
static __be16 parse_ethertype(struct sk_buff *skb)
* Ethernet header
* @in_port: port number on which @skb was received.
* @key: output flow key
* Ethernet header
* @in_port: port number on which @skb was received.
* @key: output flow key
+ * @is_frag: set to 1 if @skb contains an IPv4 fragment, or to 0 if @skb does
+ * not contain an IPv4 packet or if it is not a fragment.
*
* The caller must ensure that skb->len >= ETH_HLEN.
*
*
* The caller must ensure that skb->len >= ETH_HLEN.
*
@@
-267,15
+268,15
@@
static __be16 parse_ethertype(struct sk_buff *skb)
* Sets OVS_CB(skb)->is_frag to %true if @skb is an IPv4 fragment, otherwise to
* %false.
*/
* Sets OVS_CB(skb)->is_frag to %true if @skb is an IPv4 fragment, otherwise to
* %false.
*/
-int flow_extract(struct sk_buff *skb, u16 in_port, struct odp_flow_key *key)
+int flow_extract(struct sk_buff *skb, u16 in_port, struct odp_flow_key *key,
+ bool *is_frag)
{
struct ethhdr *eth;
memset(key, 0, sizeof *key);
key->tun_id = OVS_CB(skb)->tun_id;
key->in_port = in_port;
{
struct ethhdr *eth;
memset(key, 0, sizeof *key);
key->tun_id = OVS_CB(skb)->tun_id;
key->in_port = in_port;
- key->dl_vlan = htons(ODP_VLAN_NONE);
- OVS_CB(skb)->is_frag = false;
+ *is_frag = false;
/*
* We would really like to pull as many bytes as we could possibly
/*
* We would really like to pull as many bytes as we could possibly
@@
-356,9
+357,9
@@
int flow_extract(struct sk_buff *skb, u16 in_port, struct odp_flow_key *key)
key->tp_dst = htons(icmp->code);
}
}
key->tp_dst = htons(icmp->code);
}
}
- } else
{
-
OVS_CB(skb)->
is_frag = true;
- }
+ } else
+
*
is_frag = true;
+
} else if (key->dl_type == htons(ETH_P_ARP) && arphdr_ok(skb)) {
struct arp_eth_header *arp;
} else if (key->dl_type == htons(ETH_P_ARP) && arphdr_ok(skb)) {
struct arp_eth_header *arp;
@@
-370,9
+371,8
@@
int flow_extract(struct sk_buff *skb, u16 in_port, struct odp_flow_key *key)
&& arp->ar_pln == 4) {
/* We only match on the lower 8 bits of the opcode. */
&& arp->ar_pln == 4) {
/* We only match on the lower 8 bits of the opcode. */
- if (ntohs(arp->ar_op) <= 0xff)
{
+ if (ntohs(arp->ar_op) <= 0xff)
key->nw_proto = ntohs(arp->ar_op);
key->nw_proto = ntohs(arp->ar_op);
- }
if (key->nw_proto == ARPOP_REQUEST
|| key->nw_proto == ARPOP_REPLY) {
if (key->nw_proto == ARPOP_REQUEST
|| key->nw_proto == ARPOP_REPLY) {