projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-3.20' of git://linux-nfs.org/~bfields/linux
[firefly-linux-kernel-4.4.55.git]
/
net
/
8021q
/
vlanproc.h
diff --git
a/net/8021q/vlanproc.h
b/net/8021q/vlanproc.h
index da542cacc5a5ea3980a80286a96d79d1828da2f0..063f60a3d5cc2ee05c724dd76e647596d677fddf 100644
(file)
--- a/
net/8021q/vlanproc.h
+++ b/
net/8021q/vlanproc.h
@@
-2,15
+2,17
@@
#define __BEN_VLAN_PROC_INC__
#ifdef CONFIG_PROC_FS
#define __BEN_VLAN_PROC_INC__
#ifdef CONFIG_PROC_FS
-int vlan_proc_init(void);
+struct net;
+
+int vlan_proc_init(struct net *net);
int vlan_proc_rem_dev(struct net_device *vlandev);
int vlan_proc_add_dev(struct net_device *vlandev);
int vlan_proc_rem_dev(struct net_device *vlandev);
int vlan_proc_add_dev(struct net_device *vlandev);
-void vlan_proc_cleanup(
void
);
+void vlan_proc_cleanup(
struct net *net
);
#else /* No CONFIG_PROC_FS */
#else /* No CONFIG_PROC_FS */
-#define vlan_proc_init(
)
(0)
-#define vlan_proc_cleanup(
)
do {} while (0)
+#define vlan_proc_init(
net)
(0)
+#define vlan_proc_cleanup(
net)
do {} while (0)
#define vlan_proc_add_dev(dev) ({(void)(dev), 0; })
#define vlan_proc_rem_dev(dev) ({(void)(dev), 0; })
#endif
#define vlan_proc_add_dev(dev) ({(void)(dev), 0; })
#define vlan_proc_rem_dev(dev) ({(void)(dev), 0; })
#endif