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 tag 'remoteproc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad...
[firefly-linux-kernel-4.4.55.git]
/
net
/
8021q
/
vlanproc.c
diff --git
a/net/8021q/vlanproc.c
b/net/8021q/vlanproc.c
index dc526ec965e45e6f219fe708836483e480bc9fde..1d0e89213a28e8e9200a2ead740c6980f9be46c5 100644
(file)
--- a/
net/8021q/vlanproc.c
+++ b/
net/8021q/vlanproc.c
@@
-93,7
+93,7
@@
static const struct file_operations vlan_fops = {
static int vlandev_seq_open(struct inode *inode, struct file *file)
{
static int vlandev_seq_open(struct inode *inode, struct file *file)
{
- return single_open(file, vlandev_seq_show, PDE
(inode)->data
);
+ return single_open(file, vlandev_seq_show, PDE
_DATA(inode)
);
}
static const struct file_operations vlandev_fops = {
}
static const struct file_operations vlandev_fops = {
@@
-184,14
+184,9
@@
int vlan_proc_add_dev(struct net_device *vlandev)
*/
int vlan_proc_rem_dev(struct net_device *vlandev)
{
*/
int vlan_proc_rem_dev(struct net_device *vlandev)
{
- struct vlan_net *vn = net_generic(dev_net(vlandev), vlan_net_id);
-
/** NOTE: This will consume the memory pointed to by dent, it seems. */
/** NOTE: This will consume the memory pointed to by dent, it seems. */
- if (vlan_dev_priv(vlandev)->dent) {
- remove_proc_entry(vlan_dev_priv(vlandev)->dent->name,
- vn->proc_vlan_dir);
- vlan_dev_priv(vlandev)->dent = NULL;
- }
+ proc_remove(vlan_dev_priv(vlandev)->dent);
+ vlan_dev_priv(vlandev)->dent = NULL;
return 0;
}
return 0;
}