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
datapath: Check for Centos 6.4 backports.
[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
326abb2
..
b8b1961
100644
(file)
--- a/
datapath/linux/compat/include/linux/if_vlan.h
+++ b/
datapath/linux/compat/include/linux/if_vlan.h
@@
-1,8
+1,9
@@
#ifndef __LINUX_IF_VLAN_WRAPPER_H
#define __LINUX_IF_VLAN_WRAPPER_H 1
#ifndef __LINUX_IF_VLAN_WRAPPER_H
#define __LINUX_IF_VLAN_WRAPPER_H 1
-#include_next <linux/if_vlan.h>
#include <linux/skbuff.h>
#include <linux/skbuff.h>
+#include <linux/version.h>
+#include_next <linux/if_vlan.h>
/*
* The behavior of __vlan_put_tag() has changed over time:
/*
* The behavior of __vlan_put_tag() has changed over time:
@@
-30,7
+31,7
@@
static inline struct sk_buff *__vlan_put_tag(struct sk_buff *skb, u16 vlan_tci)
veth = (struct vlan_ethhdr *)skb_push(skb, VLAN_HLEN);
/* Move the mac addresses to the beginning of the new header. */
veth = (struct vlan_ethhdr *)skb_push(skb, VLAN_HLEN);
/* Move the mac addresses to the beginning of the new header. */
- memmove(skb->data, skb->data + VLAN_HLEN, 2 *
VLAN_
ETH_ALEN);
+ memmove(skb->data, skb->data + VLAN_HLEN, 2 * ETH_ALEN);
skb->mac_header -= VLAN_HLEN;
/* first, the ethernet type */
skb->mac_header -= VLAN_HLEN;
/* first, the ethernet type */
@@
-54,8
+55,7
@@
static inline struct sk_buff *__vlan_put_tag(struct sk_buff *skb, u16 vlan_tci)
#define VLAN_TAG_PRESENT VLAN_CFI_MASK
#endif
#define VLAN_TAG_PRESENT VLAN_CFI_MASK
#endif
-/* This function is not exported from kernel. OVS Upstreaming patch will
- * fix that. */
+#ifndef HAVE_VLAN_SET_ENCAP_PROTO
static inline void vlan_set_encap_proto(struct sk_buff *skb, struct vlan_hdr *vhdr)
{
__be16 proto;
static inline void vlan_set_encap_proto(struct sk_buff *skb, struct vlan_hdr *vhdr)
{
__be16 proto;
@@
-88,4
+88,5
@@
static inline void vlan_set_encap_proto(struct sk_buff *skb, struct vlan_hdr *vh
*/
skb->protocol = htons(ETH_P_802_2);
}
*/
skb->protocol = htons(ETH_P_802_2);
}
+#endif
#endif /* linux/if_vlan.h wrapper */
#endif /* linux/if_vlan.h wrapper */