← Back to branch summary

~ubuntu-branches/ubuntu/wily/openvswitch/wily

« back to all changes in this revision

Viewing changes to datapath/linux/compat/include/net/ipv6.h

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2015-08-10 11:35:15 UTC
  • mfrom: (1.1.30)
  • Revision ID: package-import@ubuntu.com-20150810113515-575vj06oq29emxsn
Tags: 2.4.0~git20150810.97bab95-0ubuntu1
* New upstream snapshot from 2.4 branch:
  - d/*: Align any relevant packaging changes with upstream.
* d/*: wrap-and-sort.
* d/openvswitch-{common,vswitch}.install: Correct install location for
  bash completion files.
* d/tests/openflow.py: Explicitly use ovs-testcontroller as provided
  by 2.4.0 release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
datapath/linux/compat/include/net/ipv6.h
11
11
 
12
12
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
13
13
#define ipv6_skip_exthdr rpl_ipv6_skip_exthdr
14
 
extern int ipv6_skip_exthdr(const struct sk_buff *skb, int start,
15
 
                            u8 *nexthdrp, __be16 *frag_offp);
 
14
extern int rpl_ipv6_skip_exthdr(const struct sk_buff *skb, int start,
 
15
                                u8 *nexthdrp, __be16 *frag_offp);
16
16
#endif
17
17
 
18
18
#ifndef HAVE_IP6_FH_F_SKIP_RH
28
28
 * IP6_FH_F_SKIP_RH.
29
29
 */
30
30
#define ipv6_find_hdr rpl_ipv6_find_hdr
31
 
extern int ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset,
32
 
                         int target, unsigned short *fragoff, int *fragflg);
 
31
extern int rpl_ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset,
 
32
                             int target, unsigned short *fragoff, int *fragflg);
33
33
#endif
34
34
 
35
35
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0)