/*
* 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.
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) & 0xe000) >> 13;
nh_ofs += sizeof(struct vlan_hdr);
}
memcpy(key->dl_src, eth->h_source, ETH_ALEN);
int th_ofs = nh_ofs + nh->ihl * 4;
key->nw_src = nh->saddr;
key->nw_dst = nh->daddr;
+ key->nw_tos = nh->tos & 0xfc;
key->nw_proto = nh->protocol;
skb_set_transport_header(skb, th_ofs);
{
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));
-}