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
/
include
/
linux
/
if_vlan.h
diff --git
a/datapath/linux/compat/include/linux/if_vlan.h
b/datapath/linux/compat/include/linux/if_vlan.h
index
b8b1961
..
730175b
100644
(file)
--- a/
datapath/linux/compat/include/linux/if_vlan.h
+++ b/
datapath/linux/compat/include/linux/if_vlan.h
@@
-5,6
+5,7
@@
#include <linux/version.h>
#include_next <linux/if_vlan.h>
#include <linux/version.h>
#include_next <linux/if_vlan.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
/*
* The behavior of __vlan_put_tag() has changed over time:
*
/*
* The behavior of __vlan_put_tag() has changed over time:
*
@@
-19,8
+20,9
@@
* to avoid the need to guess whether the version in the kernel tree is
* acceptable.
*/
* to avoid the need to guess whether the version in the kernel tree is
* acceptable.
*/
-#define __vlan_put_tag rpl_vlan_put_tag
-static inline struct sk_buff *__vlan_put_tag(struct sk_buff *skb, u16 vlan_tci)
+#define __vlan_put_tag(skb, proto, tag) rpl__vlan_put_tag(skb, tag)
+
+static inline struct sk_buff *rpl__vlan_put_tag(struct sk_buff *skb, u16 vlan_tci)
{
struct vlan_ethhdr *veth;
{
struct vlan_ethhdr *veth;
@@
-45,6
+47,16
@@
static inline struct sk_buff *__vlan_put_tag(struct sk_buff *skb, u16 vlan_tci)
return skb;
}
return skb;
}
+static inline struct sk_buff *rpl___vlan_hwaccel_put_tag(struct sk_buff *skb,
+ __be16 vlan_proto,
+ u16 vlan_tci)
+{
+ return __vlan_hwaccel_put_tag(skb, vlan_tci);
+}
+
+#define __vlan_hwaccel_put_tag rpl___vlan_hwaccel_put_tag
+
+#endif
/* All of these were introduced in a single commit preceding 2.6.33, so
* presumably all of them or none of them are present. */
/* All of these were introduced in a single commit preceding 2.6.33, so
* presumably all of them or none of them are present. */