diff options
| author | Pravin B Shelar <pshelar@nicira.com> | 2013-08-26 13:27:02 -0700 |
|---|---|---|
| committer | Pravin B Shelar <pshelar@nicira.com> | 2013-09-06 09:51:31 -0700 |
| commit | 3025a772a1ab6cc364a87b481b6e66b703d7bd46 (patch) | |
| tree | d13a4508620052e4a127952c43c46541e93b4866 /datapath/compat.h | |
| parent | 7615c41bfbe9594cb8b373f36b2235308c0354b3 (diff) | |
| download | openvswitch-3025a772a1ab6cc364a87b481b6e66b703d7bd46.tar.gz | |
datapath: Remove skb->mark compat code.
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Diffstat (limited to 'datapath/compat.h')
| -rw-r--r-- | datapath/compat.h | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/datapath/compat.h b/datapath/compat.h index 8457dbf31..c786b9739 100644 --- a/datapath/compat.h +++ b/datapath/compat.h @@ -72,40 +72,6 @@ static inline void skb_clear_rxhash(struct sk_buff *skb) #define SET_PARALLEL_OPS #endif - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) -#ifdef CONFIG_NETFILTER -static inline u32 skb_get_mark(struct sk_buff *skb) -{ - return skb->nfmark; -} - -static inline void skb_set_mark(struct sk_buff *skb, u32 mark) -{ - skb->nfmark = mark; -} -#else /* CONFIG_NETFILTER */ -static inline u32 skb_get_mark(struct sk_buff *skb) -{ - return 0; -} - -static inline void skb_set_mark(struct sk_buff *skb, u32 mark) -{ -} -#endif -#else /* before 2.6.20 */ -static inline u32 skb_get_mark(struct sk_buff *skb) -{ - return skb->mark; -} - -static inline void skb_set_mark(struct sk_buff *skb, u32 mark) -{ - skb->mark = mark; -} -#endif /* after 2.6.20 */ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) #define rt_dst(rt) (rt->dst) #else @@ -130,13 +96,8 @@ static inline struct rtable *find_route(struct net *net, struct flowi fl = { .nl_u = { .ip4_u = { .daddr = daddr, .saddr = *saddr, -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) - .fwmark = skb_mark, -#endif .tos = RT_TOS(tos) } }, -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) .mark = skb_mark, -#endif .proto = ipproto }; if (unlikely(ip_route_output_key(net, &rt, &fl))) |