Skip to content

Commit f5bb327

Browse files
LKomaryanskiylorc
LKomaryanskiy
authored and
lorc
committed
net: renesas: rswitch: cosmetic fix naming for rdev and ndev
In some places, rswitch_device and net_device have the same naming - just "dev" that complicates code. This patch aligns naming for rswitch code - rdev for rswitch_device and ndev for net_device. Reviewed-by: Dmytro Firsov <[email protected]> Acked-by: Volodymyr Babchuk <[email protected]> Signed-off-by: Leonid Komarianskyi <[email protected]>
1 parent a6155fd commit f5bb327

File tree

5 files changed

+85
-84
lines changed

5 files changed

+85
-84
lines changed

‎drivers/net/ethernet/renesas/rswitch.c

Lines changed: 58 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,7 @@ struct rswitch_ipv4_route {
944944
u32 subnet;
945945
u32 mask;
946946
struct fib_nh *nh;
947-
struct rswitch_device *dev;
947+
struct rswitch_device *rdev;
948948
struct list_head param_list;
949949
struct list_head list;
950950
};
@@ -2504,15 +2504,15 @@ static int rswitch_setup_tc_block_cb(enum tc_setup_type type,
25042504
void *type_data,
25052505
void *cb_priv)
25062506
{
2507-
struct net_device *dev = cb_priv;
2507+
struct net_device *ndev = cb_priv;
25082508

25092509
switch (type) {
25102510
case TC_SETUP_CLSU32:
2511-
return rswitch_setup_tc_cls_u32(dev, type_data);
2511+
return rswitch_setup_tc_cls_u32(ndev, type_data);
25122512
case TC_SETUP_CLSFLOWER:
2513-
return rswitch_setup_tc_flower(dev, type_data);
2513+
return rswitch_setup_tc_flower(ndev, type_data);
25142514
case TC_SETUP_CLSMATCHALL:
2515-
return rswitch_setup_tc_matchall(dev, type_data);
2515+
return rswitch_setup_tc_matchall(ndev, type_data);
25162516
default:
25172517
return -EOPNOTSUPP;
25182518
}
@@ -2636,9 +2636,10 @@ const struct net_device_ops rswitch_netdev_ops = {
26362636
// .ndo_change_mtu = eth_change_mtu,
26372637
};
26382638

2639-
static int rswitch_add_ipv4_dst_route(struct rswitch_ipv4_route *routing_list, struct rswitch_device *dev, u32 ip)
2639+
static int rswitch_add_ipv4_dst_route(struct rswitch_ipv4_route *routing_list,
2640+
struct rswitch_device *rdev, u32 ip)
26402641
{
2641-
struct rswitch_private *priv = dev->priv;
2642+
struct rswitch_private *priv = rdev->priv;
26422643
struct l3_ipv4_fwd_param_list *param_list;
26432644
struct rswitch_pf_param pf_param = {0};
26442645
int ret = 0;
@@ -2653,7 +2654,7 @@ static int rswitch_add_ipv4_dst_route(struct rswitch_ipv4_route *routing_list, s
26532654
goto free_param_list;
26542655
}
26552656

2656-
pf_param.rdev = dev;
2657+
pf_param.rdev = rdev;
26572658
pf_param.all_sources = true;
26582659

26592660
/* Match only packets with IPv4 EtherType */
@@ -2674,15 +2675,15 @@ static int rswitch_add_ipv4_dst_route(struct rswitch_ipv4_route *routing_list, s
26742675
param_list->param->priv = priv;
26752676
param_list->param->dv = BIT(priv->gwca.index);
26762677
param_list->param->slv = 0x3F;
2677-
param_list->param->csd = dev->rx_default_chain->index;
2678+
param_list->param->csd = rdev->rx_default_chain->index;
26782679
param_list->param->frame_type = LTHSLP0NONE;
26792680
param_list->param->enable_sub_dst = true;
26802681
param_list->param->l23_info.priv = priv;
26812682
param_list->param->l23_info.update_ttl = true;
26822683
param_list->param->l23_info.update_dst_mac = true;
26832684
param_list->param->l23_info.routing_port_valid = 0x3F;
26842685
param_list->param->l23_info.routing_number = rswitch_rn_get(priv);
2685-
memcpy(param_list->param->l23_info.dst_mac, dev->ndev->dev_addr, ETH_ALEN);
2686+
memcpy(param_list->param->l23_info.dst_mac, rdev->ndev->dev_addr, ETH_ALEN);
26862687

26872688
ret = rswitch_add_l3fwd(param_list->param);
26882689
if (ret)
@@ -2707,17 +2708,17 @@ static void rswitch_fib_event_add(struct rswitch_fib_event_work *fib_work)
27072708
{
27082709
struct fib_entry_notifier_info fen = fib_work->fen_info;
27092710
struct rswitch_ipv4_route *new_routing_list;
2710-
struct rswitch_device *dev;
2711+
struct rswitch_device *rdev;
27112712
struct fib_nh *nh;
27122713

27132714
nh = fib_info_nh(fen.fi, 0);
27142715

27152716
if (fen.type != RTN_UNICAST)
27162717
return;
27172718

2718-
dev = get_dev_by_ip(fib_work->priv, be32_to_cpu(nh->nh_saddr), false);
2719+
rdev = get_dev_by_ip(fib_work->priv, be32_to_cpu(nh->nh_saddr), false);
27192720
/* Do not offload routes, related to VMQs (etha equal to NULL and not vlan device) */
2720-
if (!dev || (dev->etha == NULL && !is_vlan_dev(dev->ndev)))
2721+
if (!rdev || (!rdev->etha && !is_vlan_dev(rdev->ndev)))
27212722
return;
27222723

27232724
new_routing_list = kzalloc(sizeof(*new_routing_list), GFP_KERNEL);
@@ -2727,12 +2728,12 @@ static void rswitch_fib_event_add(struct rswitch_fib_event_work *fib_work)
27272728
new_routing_list->ip = be32_to_cpu(nh->nh_saddr);
27282729
new_routing_list->mask = be32_to_cpu(inet_make_mask(fen.dst_len));
27292730
new_routing_list->subnet = fen.dst;
2730-
new_routing_list->dev = dev;
2731+
new_routing_list->rdev = rdev;
27312732
INIT_LIST_HEAD(&new_routing_list->param_list);
27322733

2733-
mutex_lock(&dev->priv->ipv4_forward_lock);
2734-
list_add(&new_routing_list->list, &dev->routing_list);
2735-
mutex_unlock(&dev->priv->ipv4_forward_lock);
2734+
mutex_lock(&rdev->priv->ipv4_forward_lock);
2735+
list_add(&new_routing_list->list, &rdev->routing_list);
2736+
mutex_unlock(&rdev->priv->ipv4_forward_lock);
27362737

27372738
/*
27382739
* Route with zeroed subnet is default route. It does not need a PF entry
@@ -2741,15 +2742,15 @@ static void rswitch_fib_event_add(struct rswitch_fib_event_work *fib_work)
27412742
if (!new_routing_list->subnet)
27422743
return;
27432744

2744-
if (!rswitch_add_ipv4_dst_route(new_routing_list, dev, be32_to_cpu(nh->nh_saddr)))
2745+
if (!rswitch_add_ipv4_dst_route(new_routing_list, rdev, be32_to_cpu(nh->nh_saddr)))
27452746
nh->fib_nh_flags |= RTNH_F_OFFLOAD;
27462747
new_routing_list->nh = nh;
27472748
}
27482749

27492750
static void rswitch_fib_event_remove(struct rswitch_fib_event_work *fib_work)
27502751
{
27512752
struct fib_entry_notifier_info fen = fib_work->fen_info;
2752-
struct rswitch_device *dev;
2753+
struct rswitch_device *rdev;
27532754
struct fib_nh *nh;
27542755
struct list_head *cur, *tmp;
27552756
struct rswitch_ipv4_route *routing_list;
@@ -2761,12 +2762,12 @@ static void rswitch_fib_event_remove(struct rswitch_fib_event_work *fib_work)
27612762
if (fen.type != RTN_UNICAST)
27622763
return;
27632764

2764-
dev = get_dev_by_ip(fib_work->priv, be32_to_cpu(nh->nh_saddr), false);
2765-
if (!dev)
2765+
rdev = get_dev_by_ip(fib_work->priv, be32_to_cpu(nh->nh_saddr), false);
2766+
if (!rdev)
27662767
return;
27672768

2768-
mutex_lock(&dev->priv->ipv4_forward_lock);
2769-
list_for_each(cur, &dev->routing_list) {
2769+
mutex_lock(&rdev->priv->ipv4_forward_lock);
2770+
list_for_each(cur, &rdev->routing_list) {
27702771
routing_list = list_entry(cur, struct rswitch_ipv4_route, list);
27712772
if (routing_list->subnet == fen.dst && routing_list->ip == be32_to_cpu(nh->nh_saddr)) {
27722773
route_found = true;
@@ -2776,7 +2777,7 @@ static void rswitch_fib_event_remove(struct rswitch_fib_event_work *fib_work)
27762777

27772778
/* There is nothing to free */
27782779
if (!route_found) {
2779-
mutex_unlock(&dev->priv->ipv4_forward_lock);
2780+
mutex_unlock(&rdev->priv->ipv4_forward_lock);
27802781
return;
27812782
}
27822783

@@ -2789,7 +2790,7 @@ static void rswitch_fib_event_remove(struct rswitch_fib_event_work *fib_work)
27892790
}
27902791

27912792
list_del(&routing_list->list);
2792-
mutex_unlock(&dev->priv->ipv4_forward_lock);
2793+
mutex_unlock(&rdev->priv->ipv4_forward_lock);
27932794

27942795
kfree(routing_list);
27952796
}
@@ -3704,7 +3705,7 @@ static void rswitch_add_ipv4_forward_all_types(struct l3_ipv4_fwd_param *param,
37043705
struct rswitch_ipv4_route *routing_list)
37053706
{
37063707
struct l3_ipv4_fwd_param_list *param_list[RSWITCH_FRAME_TYPE_NUM] = {0};
3707-
struct rswitch_private *priv = routing_list->dev->priv;
3708+
struct rswitch_private *priv = routing_list->rdev->priv;
37083709
int i;
37093710

37103711
for (i = 0; i < RSWITCH_FRAME_TYPE_NUM; i++) {
@@ -3791,8 +3792,8 @@ static struct rswitch_ipv4_route *rswitch_get_route(struct rswitch_private *priv
37913792
static void rswitch_forward_work(struct work_struct *work)
37923793
{
37933794
struct rswitch_forward_work *fwd_work;
3794-
struct rswitch_device *dev;
3795-
struct rswitch_device *real_dev;
3795+
struct rswitch_device *rdev;
3796+
struct rswitch_device *real_rdev;
37963797
struct net_device *real_ndev;
37973798
struct rswitch_ipv4_route *routing_list = NULL;
37983799
struct l3_ipv4_fwd_param param = {0};
@@ -3808,16 +3809,16 @@ static void rswitch_forward_work(struct work_struct *work)
38083809
if (!routing_list)
38093810
goto free;
38103811

3811-
dev = routing_list->dev;
3812-
if (rswitch_ipv4_resolve(dev, fwd_work->dst_ip, mac))
3812+
rdev = routing_list->rdev;
3813+
if (rswitch_ipv4_resolve(rdev, fwd_work->dst_ip, mac))
38133814
goto free;
38143815

3815-
if (is_vlan_dev(dev->ndev)) {
3816-
real_ndev = vlan_dev_real_dev(dev->ndev);
3817-
real_dev = netdev_priv(real_ndev);
3818-
param.dv = BIT(real_dev->port);
3816+
if (is_vlan_dev(rdev->ndev)) {
3817+
real_ndev = vlan_dev_real_dev(rdev->ndev);
3818+
real_rdev = netdev_priv(real_ndev);
3819+
param.dv = BIT(real_rdev->port);
38193820
} else {
3820-
param.dv = BIT(dev->port);
3821+
param.dv = BIT(rdev->port);
38213822
}
38223823
param.csd = 0;
38233824
param.enable_sub_dst = false;
@@ -4056,9 +4057,9 @@ static void rswitch_deinit(struct rswitch_private *priv)
40564057
rswitch_desc_free(priv);
40574058
}
40584059

4059-
static int vlan_dev_register(struct net_device *dev)
4060+
static int vlan_dev_register(struct net_device *ndev)
40604061
{
4061-
struct net_device *real_dev;
4062+
struct net_device *real_rdev;
40624063
struct rswitch_net *rn;
40634064
struct rswitch_private *priv;
40644065
struct rswitch_device *rdev, *parent_rdev;
@@ -4067,12 +4068,12 @@ static int vlan_dev_register(struct net_device *dev)
40674068
rn = net_generic(&init_net, rswitch_net_id);
40684069
priv = rn->priv;
40694070

4070-
real_dev = vlan_dev_real_dev(dev);
4071+
real_rdev = vlan_dev_real_dev(ndev);
40714072

4072-
if (!ndev_is_tsn_dev(real_dev, priv))
4073+
if (!ndev_is_tsn_dev(real_rdev, priv))
40734074
return 0;
40744075

4075-
parent_rdev = netdev_priv(real_dev);
4076+
parent_rdev = netdev_priv(real_rdev);
40764077

40774078
rdev = kzalloc(sizeof(*rdev), GFP_KERNEL);
40784079
if (!rdev)
@@ -4081,9 +4082,9 @@ static int vlan_dev_register(struct net_device *dev)
40814082
* but for proper chain mapping R-Switch driver requires real device parent. So we need to
40824083
* save pointer to ndev->dev.parent and restore it for proper kernel deinit ndev.
40834084
*/
4084-
rdev->vlan_parent = dev->dev.parent;
4085-
dev->dev.parent = real_dev->dev.parent;
4086-
rdev->ndev = dev;
4085+
rdev->vlan_parent = ndev->dev.parent;
4086+
ndev->dev.parent = real_rdev->dev.parent;
4087+
rdev->ndev = ndev;
40874088
rdev->priv = priv;
40884089
INIT_LIST_HEAD(&rdev->routing_list);
40894090
INIT_LIST_HEAD(&rdev->tc_u32_list);
@@ -4098,19 +4099,19 @@ static int vlan_dev_register(struct net_device *dev)
40984099
list_add(&rdev->list, &priv->rdev_list);
40994100
write_unlock(&priv->rdev_list_lock);
41004101

4101-
ret = rswitch_txdmac_init(dev, priv, -1);
4102+
ret = rswitch_txdmac_init(ndev, priv, -1);
41024103
if (ret)
41034104
goto err_tx;
4104-
ret = rswitch_rxdmac_init(dev, priv, -1);
4105+
ret = rswitch_rxdmac_init(ndev, priv, -1);
41054106
if (ret)
41064107
goto err_rx;
41074108

4108-
netif_napi_add(dev, &rdev->napi, rswitch_poll, 64);
4109-
netdev_info(dev, "MAC address %pMn", dev->dev_addr);
4109+
netif_napi_add(ndev, &rdev->napi, rswitch_poll, 64);
4110+
netdev_info(ndev, "MAC address %pMn", ndev->dev_addr);
41104111
napi_enable(&rdev->napi);
41114112
return 0;
41124113
err_rx:
4113-
rswitch_txdmac_free(dev, priv);
4114+
rswitch_txdmac_free(ndev, priv);
41144115
err_tx:
41154116
list_del(&rdev->list);
41164117
return ret;
@@ -4140,41 +4141,41 @@ static void cleanup_all_routes(struct rswitch_device *rdev)
41404141
mutex_unlock(&rdev->priv->ipv4_forward_lock);
41414142
}
41424143

4143-
static void vlan_dev_unregister(struct net_device *dev)
4144+
static void vlan_dev_unregister(struct net_device *ndev)
41444145
{
41454146
struct rswitch_device *rdev;
41464147
struct rswitch_net *rn;
41474148
struct rswitch_private *priv;
41484149

41494150
rn = net_generic(&init_net, rswitch_net_id);
41504151
priv = rn->priv;
4151-
rdev = ndev_to_rdev(dev);
4152-
rswitch_rxdmac_free(dev, priv);
4153-
rswitch_txdmac_free(dev, priv);
4152+
rdev = ndev_to_rdev(ndev);
4153+
rswitch_rxdmac_free(ndev, priv);
4154+
rswitch_txdmac_free(ndev, priv);
41544155
napi_disable(&rdev->napi);
41554156
netif_napi_del(&rdev->napi);
41564157

41574158
cleanup_all_routes(rdev);
41584159

41594160
list_del(&rdev->list);
4160-
dev->dev.parent = rdev->vlan_parent;
4161+
ndev->dev.parent = rdev->vlan_parent;
41614162
kfree(rdev);
41624163
}
41634164

41644165
static int vlan_device_event(struct notifier_block *unused, unsigned long event,
41654166
void *ptr)
41664167
{
4167-
struct net_device *dev = netdev_notifier_info_to_dev(ptr);
4168+
struct net_device *ndev = netdev_notifier_info_to_dev(ptr);
41684169

4169-
if (!is_vlan_dev(dev))
4170+
if (!is_vlan_dev(ndev))
41704171
return NOTIFY_DONE;
41714172

41724173
switch (event) {
41734174
case NETDEV_REGISTER:
4174-
vlan_dev_register(dev);
4175+
vlan_dev_register(ndev);
41754176
break;
41764177
case NETDEV_UNREGISTER:
4177-
vlan_dev_unregister(dev);
4178+
vlan_dev_unregister(ndev);
41784179
break;
41794180
}
41804181

‎drivers/net/ethernet/renesas/rswitch_tc_filters.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ static inline void rswitch_parse_pedit(struct rswitch_tc_filter *f, struct flow_
4444
}
4545
}
4646

47-
int rswitch_setup_tc_flower(struct net_device *dev,
48-
struct flow_cls_offload *cls_flower);
47+
int rswitch_setup_tc_flower(struct net_device *ndev,
48+
struct flow_cls_offload *cls_flower);
4949

50-
int rswitch_setup_tc_cls_u32(struct net_device *dev,
51-
struct tc_cls_u32_offload *cls_u32);
50+
int rswitch_setup_tc_cls_u32(struct net_device *ndev,
51+
struct tc_cls_u32_offload *cls_u32);
5252

53-
int rswitch_setup_tc_matchall(struct net_device *dev,
54-
struct tc_cls_matchall_offload *cls_matchall);
53+
int rswitch_setup_tc_matchall(struct net_device *ndev,
54+
struct tc_cls_matchall_offload *cls_matchall);
5555

5656
#endif /* __RSWITCH_TC_FILTERS_H__ */

‎drivers/net/ethernet/renesas/rswitch_tc_flower.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -280,11 +280,11 @@ static int rswitch_tc_flower_setup_match(struct rswitch_tc_filter *f,
280280
return 0;
281281
}
282282

283-
static int rswitch_tc_flower_replace(struct net_device *dev,
284-
struct flow_cls_offload *cls_flower)
283+
static int rswitch_tc_flower_replace(struct net_device *ndev,
284+
struct flow_cls_offload *cls_flower)
285285
{
286286
struct flow_rule *rule = flow_cls_offload_flow_rule(cls_flower);
287-
struct rswitch_device *rdev = netdev_priv(dev);
287+
struct rswitch_device *rdev = netdev_priv(ndev);
288288
struct rswitch_private *priv = rdev->priv;
289289
struct rswitch_tc_filter *f;
290290
int rc;
@@ -332,10 +332,10 @@ static int rswitch_tc_flower_replace(struct net_device *dev,
332332

333333
}
334334

335-
static int rswitch_tc_flower_destroy(struct net_device *dev,
336-
struct flow_cls_offload *cls_flower)
335+
static int rswitch_tc_flower_destroy(struct net_device *ndev,
336+
struct flow_cls_offload *cls_flower)
337337
{
338-
struct rswitch_device *rdev = netdev_priv(dev);
338+
struct rswitch_device *rdev = netdev_priv(ndev);
339339
struct rswitch_tc_filter *f = NULL;
340340

341341
list_for_each_entry(f, &rdev->tc_flower_list, lh) {
@@ -351,22 +351,22 @@ static int rswitch_tc_flower_destroy(struct net_device *dev,
351351
return -ENOENT;
352352
}
353353

354-
static int rswitch_tc_flower_stats(struct net_device *dev,
355-
struct flow_cls_offload *cls_flower)
354+
static int rswitch_tc_flower_stats(struct net_device *ndev,
355+
struct flow_cls_offload *cls_flower)
356356
{
357357
return -EOPNOTSUPP;
358358
}
359359

360-
int rswitch_setup_tc_flower(struct net_device *dev,
361-
struct flow_cls_offload *cls_flower)
360+
int rswitch_setup_tc_flower(struct net_device *ndev,
361+
struct flow_cls_offload *cls_flower)
362362
{
363363
switch (cls_flower->command) {
364364
case FLOW_CLS_REPLACE:
365-
return rswitch_tc_flower_replace(dev, cls_flower);
365+
return rswitch_tc_flower_replace(ndev, cls_flower);
366366
case FLOW_CLS_DESTROY:
367-
return rswitch_tc_flower_destroy(dev, cls_flower);
367+
return rswitch_tc_flower_destroy(ndev, cls_flower);
368368
case FLOW_CLS_STATS:
369-
return rswitch_tc_flower_stats(dev, cls_flower);
369+
return rswitch_tc_flower_stats(ndev, cls_flower);
370370
default:
371371
return -EOPNOTSUPP;
372372
}

0 commit comments

Comments
 (0)