← 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/net_namespace.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/net_namespace.h
17
17
#define register_pernet_device rpl_register_pernet_gen_device
18
18
#define unregister_pernet_device rpl_unregister_pernet_gen_device
19
19
 
20
 
int compat_init_net(struct net *net, struct rpl_pernet_operations *pnet);
21
 
void compat_exit_net(struct net *net, struct rpl_pernet_operations *pnet);
 
20
#define compat_init_net ovs_compat_init_net
 
21
int ovs_compat_init_net(struct net *net, struct rpl_pernet_operations *pnet);
 
22
#define compat_exit_net ovs_compat_exit_net
 
23
void ovs_compat_exit_net(struct net *net, struct rpl_pernet_operations *pnet);
22
24
 
23
25
#define DEFINE_COMPAT_PNET_REG_FUNC(TYPE)                                       \
24
26
                                                                        \