X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fflow.c;h=9a94d0ba8d28971e5430e9bdc3dbc1c0657a03b9;hb=883b106184656ff004f15c7872de31433918c94f;hp=16b576ab674fd527c4b4d30aaec23ea94b8bb34f;hpb=de3f65ea52d60d70b104d852dbc752cb48ccf8f1;p=openvswitch

diff --git a/datapath/flow.c b/datapath/flow.c
index 16b576ab..9a94d0ba 100644
--- a/datapath/flow.c
+++ b/datapath/flow.c
@@ -1,12 +1,13 @@
 /*
  * Distributed under the terms of the GNU GPL version 2.
- * Copyright (c) 2007, 2008, 2009 Nicira Networks.
+ * Copyright (c) 2007, 2008, 2009, 2010 Nicira Networks.
  *
  * Significant portions of this file may be copied from parts of the Linux
  * kernel, by Linus Torvalds and others.
  */
 
 #include "flow.h"
+#include "datapath.h"
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/if_ether.h>
@@ -24,6 +25,7 @@
 #include <linux/tcp.h>
 #include <linux/udp.h>
 #include <linux/icmp.h>
+#include <net/inet_ecn.h>
 #include <net/ip.h>
 
 #include "compat.h"
@@ -231,6 +233,7 @@ int flow_extract(struct sk_buff *skb, u16 in_port, struct odp_flow_key *key)
 		struct vlan_hdr *vh = (struct vlan_hdr*)(skb->data + nh_ofs);
 		key->dl_type = vh->h_vlan_encapsulated_proto;
 		key->dl_vlan = vh->h_vlan_TCI & htons(VLAN_VID_MASK);
+		key->dl_vlan_pcp = (ntohs(vh->h_vlan_TCI) & VLAN_PCP_MASK) >> VLAN_PCP_SHIFT;
 		nh_ofs += sizeof(struct vlan_hdr);
 	}
 	memcpy(key->dl_src, eth->h_source, ETH_ALEN);
@@ -243,6 +246,7 @@ int flow_extract(struct sk_buff *skb, u16 in_port, struct odp_flow_key *key)
 		int th_ofs = nh_ofs + nh->ihl * 4;
 		key->nw_src = nh->saddr;
 		key->nw_dst = nh->daddr;
+		key->nw_tos = nh->tos & ~INET_ECN_MASK;
 		key->nw_proto = nh->protocol;
 		skb_set_transport_header(skb, th_ofs);
 
@@ -293,7 +297,7 @@ int flow_extract(struct sk_buff *skb, u16 in_port, struct odp_flow_key *key)
 
 		arp = (struct arp_eth_header *)skb_network_header(skb);
 
-		if (arp->ar_hrd == htons(1)
+		if (arp->ar_hrd == htons(ARPHRD_ETHER)
 				&& arp->ar_pro == htons(ETH_P_IP)
 				&& arp->ar_hln == ETH_ALEN
 				&& arp->ar_pln == 4) {
@@ -332,16 +336,3 @@ void flow_exit(void)
 {
 	kmem_cache_destroy(flow_cache);
 }
-
-void print_flow(const struct odp_flow_key *key)
-{
-#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"
-#define MAC_ARG(x) ((u8*)(x))[0],((u8*)(x))[1],((u8*)(x))[2],((u8*)(x))[3],((u8*)(x))[4],((u8*)(x))[5]
-	printk("port%04x:vlan%d mac"MAC_FMT"->"MAC_FMT" "
-	   "type%04x proto%d ip%x->%x port%d->%d\n",
-	   key->in_port, ntohs(key->dl_vlan),
-	   MAC_ARG(key->dl_src), MAC_ARG(key->dl_dst),
-	   ntohs(key->dl_type), key->nw_proto,
-	   key->nw_src, key->nw_dst,
-	   ntohs(key->tp_src), ntohs(key->tp_dst));
-}