redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

net: switchdev: remove dev in port_vlan_dump_put 

The static switchdev_port_vlan_dump_put function does not need the
net_device parameter, so remove it.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
steinar/wifi_calib_4_9_kernel
Vivien Didelot 2015-09-29 12:07:13 -04:00 committed by David S. Miller
parent 79b0eb2aad
commit e23b002b23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/switchdev/switchdev.c
View File

@ -484,8 +484,7 @@ struct switchdev_vlan_dump {
u16 end;
};
static int switchdev_port_vlan_dump_put(struct net_device *dev,
struct switchdev_vlan_dump *dump)
static int switchdev_port_vlan_dump_put(struct switchdev_vlan_dump *dump)
{
struct bridge_vlan_info vinfo;
@ -531,7 +530,7 @@ static int switchdev_port_vlan_dump_cb(struct net_device *dev,
for (dump->begin = dump->end = vlan->vid_begin;
dump->begin <= vlan->vid_end;
dump->begin++, dump->end++) {
err = switchdev_port_vlan_dump_put(dev, dump);
err = switchdev_port_vlan_dump_put(dump);
if (err)
return err;
}
@ -543,7 +542,7 @@ static int switchdev_port_vlan_dump_cb(struct net_device *dev,
/* prepend */
dump->begin = vlan->vid_begin;
} else {
err = switchdev_port_vlan_dump_put(dev, dump);
err = switchdev_port_vlan_dump_put(dump);
dump->flags = vlan->flags;
dump->begin = vlan->vid_begin;
dump->end = vlan->vid_end;
@ -555,7 +554,7 @@ static int switchdev_port_vlan_dump_cb(struct net_device *dev,
/* append */
dump->end = vlan->vid_end;
} else {
err = switchdev_port_vlan_dump_put(dev, dump);
err = switchdev_port_vlan_dump_put(dump);
dump->flags = vlan->flags;
dump->begin = vlan->vid_begin;
dump->end = vlan->vid_end;
@ -588,7 +587,7 @@ static int switchdev_port_vlan_fill(struct sk_buff *skb, struct net_device *dev,
goto err_out;
if (filter_mask & RTEXT_FILTER_BRVLAN_COMPRESSED)
/* last one */
err = switchdev_port_vlan_dump_put(dev, &dump);
err = switchdev_port_vlan_dump_put(&dump);
}
err_out: