SunnyQjm/openflow
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

unbroke kernel datapath build

Browse Source 
* split durration into secs and nsecs for updated flow_remove
This commit is contained in:
Rob Sherwood authored and Glen Gibb committed 2009-12-11 18:17:45 -08:00
1 parent ed2d28c865
commit 9b78488f60
1 file changed
+13 -3
Download Patch File Download Diff File Expand all files Collapse all files
datapath/datapath.c
+13 -3
View File
@@ -1016,7 +1016,7 @@ dp_send_port_status(struct net_bridge_port *p, uint8_t status)
}
/* Convert jiffies_64 to seconds. */
static u64 inline jiffies_64_to_secs(u64 j)
static u32 inline jiffies_64_to_secs(u64 j)
{
/* Call to do_div is necessary as we can't do a 64-bit division in a
* 32-bit kernel (at least not without linking to libgcc) */
@@ -1024,6 +1024,14 @@ static u64 inline jiffies_64_to_secs(u64 j)
return j;
}
/* Convert jiffies_64 to just the nanosec part between seconds. */
static u32 inline jiffies_64_to_nsecs(u64 j)
{
/* Call to do_div is necessary as we can't do a 64-bit division in a
* 32-bit kernel (at least not without linking to libgcc) */
return (j - jiffies_64_to_secs(j));
}
int
dp_send_flow_end(struct datapath *dp, struct sw_flow *flow,
enum ofp_flow_removed_reason reason)
@@ -1046,7 +1054,8 @@ dp_send_flow_end(struct datapath *dp, struct sw_flow *flow,
ofr->priority = htons(flow->priority);
ofr->reason = reason;
ofr->duration = htonl(jiffies_64_to_secs(get_jiffies_64()-flow->created));
ofr->duration_sec = htonl(jiffies_64_to_secs(get_jiffies_64()-flow->created));
ofr->duration_nsec = htonl(jiffies_64_to_nsecs(get_jiffies_64()-flow->created));
ofr->idle_timeout = htons(flow->idle_timeout);
ofr->packet_count = cpu_to_be64(flow->packet_count);
@@ -1444,7 +1453,8 @@ static int flow_stats_dump_callback(struct sw_flow *flow, void *private)
* while the remainder is the return value. */
duration = get_jiffies_64() - flow->created;
do_div(duration, HZ);
ofs->duration = htonl(duration);
ofs->duration_sec = htonl(jiffies_64_to_secs(duration));
ofs->duration_nsec = htonl(jiffies_64_to_nsecs(duration));
ofs->priority = htons(flow->priority);
ofs->idle_timeout = htons(flow->idle_timeout);