git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
datapath
/
linux
/
compat
/
flow_dissector.c
diff --git
a/datapath/linux/compat/flow_dissector.c
b/datapath/linux/compat/flow_dissector.c
index
7a0d09b
..
a8a2e52
100644
(file)
--- a/
datapath/linux/compat/flow_dissector.c
+++ b/
datapath/linux/compat/flow_dissector.c
@@
-46,7
+46,7
@@
static void iph_to_flow_copy_addrs(struct flow_keys *flow, const struct iphdr *i
memcpy(&flow->src, &iph->saddr, sizeof(flow->src) + sizeof(flow->dst));
}
memcpy(&flow->src, &iph->saddr, sizeof(flow->src) + sizeof(flow->dst));
}
-__be32 skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto)
+
static
__be32 skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto)
{
int poff = proto_ports_offset(ip_proto);
{
int poff = proto_ports_offset(ip_proto);