diff options
| author | Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2015-09-29 12:07:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-30 00:31:59 -0400 |
| commit | e23b002b23dfdcd12ca982fbc57dcb071a1fee62 (patch) | |
| tree | 05d3b783a60d565ad57ee8fe24341db6ca9f87bc /net/switchdev | |
| parent | 79b0eb2aadfefaecb34c84453bd44d3264c4c781 (diff) | |
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>
Diffstat (limited to 'net/switchdev')
| -rw-r--r-- | net/switchdev/switchdev.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index 00ee547ba45b..56d34edc7442 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c | |||
| @@ -484,8 +484,7 @@ struct switchdev_vlan_dump { | |||
| 484 | u16 end; | 484 | u16 end; |
| 485 | }; | 485 | }; |
| 486 | 486 | ||
| 487 | static int switchdev_port_vlan_dump_put(struct net_device *dev, | 487 | static int switchdev_port_vlan_dump_put(struct switchdev_vlan_dump *dump) |
| 488 | struct switchdev_vlan_dump *dump) | ||
| 489 | { | 488 | { |
| 490 | struct bridge_vlan_info vinfo; | 489 | struct bridge_vlan_info vinfo; |
| 491 | 490 | ||
| @@ -531,7 +530,7 @@ static int switchdev_port_vlan_dump_cb(struct net_device *dev, | |||
| 531 | for (dump->begin = dump->end = vlan->vid_begin; | 530 | for (dump->begin = dump->end = vlan->vid_begin; |
| 532 | dump->begin <= vlan->vid_end; | 531 | dump->begin <= vlan->vid_end; |
| 533 | dump->begin++, dump->end++) { | 532 | dump->begin++, dump->end++) { |
| 534 | err = switchdev_port_vlan_dump_put(dev, dump); | 533 | err = switchdev_port_vlan_dump_put(dump); |
| 535 | if (err) | 534 | if (err) |
| 536 | return err; | 535 | return err; |
| 537 | } | 536 | } |
| @@ -543,7 +542,7 @@ static int switchdev_port_vlan_dump_cb(struct net_device *dev, | |||
| 543 | /* prepend */ | 542 | /* prepend */ |
| 544 | dump->begin = vlan->vid_begin; | 543 | dump->begin = vlan->vid_begin; |
| 545 | } else { | 544 | } else { |
| 546 | err = switchdev_port_vlan_dump_put(dev, dump); | 545 | err = switchdev_port_vlan_dump_put(dump); |
| 547 | dump->flags = vlan->flags; | 546 | dump->flags = vlan->flags; |
| 548 | dump->begin = vlan->vid_begin; | 547 | dump->begin = vlan->vid_begin; |
| 549 | dump->end = vlan->vid_end; | 548 | dump->end = vlan->vid_end; |
| @@ -555,7 +554,7 @@ static int switchdev_port_vlan_dump_cb(struct net_device *dev, | |||
| 555 | /* append */ | 554 | /* append */ |
| 556 | dump->end = vlan->vid_end; | 555 | dump->end = vlan->vid_end; |
| 557 | } else { | 556 | } else { |
| 558 | err = switchdev_port_vlan_dump_put(dev, dump); | 557 | err = switchdev_port_vlan_dump_put(dump); |
| 559 | dump->flags = vlan->flags; | 558 | dump->flags = vlan->flags; |
| 560 | dump->begin = vlan->vid_begin; | 559 | dump->begin = vlan->vid_begin; |
| 561 | dump->end = vlan->vid_end; | 560 | dump->end = vlan->vid_end; |
| @@ -588,7 +587,7 @@ static int switchdev_port_vlan_fill(struct sk_buff *skb, struct net_device *dev, | |||
| 588 | goto err_out; | 587 | goto err_out; |
| 589 | if (filter_mask & RTEXT_FILTER_BRVLAN_COMPRESSED) | 588 | if (filter_mask & RTEXT_FILTER_BRVLAN_COMPRESSED) |
| 590 | /* last one */ | 589 | /* last one */ |
| 591 | err = switchdev_port_vlan_dump_put(dev, &dump); | 590 | err = switchdev_port_vlan_dump_put(&dump); |
| 592 | } | 591 | } |
| 593 | 592 | ||
| 594 | err_out: | 593 | err_out: |
