Skip to content

Commit c1ce8ee

Browse files
rrendecgregkh
authored andcommitted
net: vxlan: rename SKB_DROP_REASON_VXLAN_NO_REMOTE
[ Upstream commit 46e0ccf ] The SKB_DROP_REASON_VXLAN_NO_REMOTE skb drop reason was introduced in the specific context of vxlan. As it turns out, there are similar cases when a packet needs to be dropped in other parts of the network stack, such as the bridge module. Rename SKB_DROP_REASON_VXLAN_NO_REMOTE and give it a more generic name, so that it can be used in other parts of the network stack. This is not a functional change, and the numeric value of the drop reason even remains unchanged. Signed-off-by: Radu Rendec <[email protected]> Reviewed-by: Ido Schimmel <[email protected]> Acked-by: Nikolay Aleksandrov <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]> Stable-dep-of: 1f5d2fd ("vxlan: Fix NPD in {arp,neigh}_reduce() when using nexthop objects") Signed-off-by: Sasha Levin <[email protected]>
1 parent 6fa0469 commit c1ce8ee

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

drivers/net/vxlan/vxlan_core.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2787,7 +2787,7 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
27872787
dev_core_stats_tx_dropped_inc(dev);
27882788
vxlan_vnifilter_count(vxlan, vni, NULL,
27892789
VXLAN_VNI_STATS_TX_DROPS, 0);
2790-
kfree_skb_reason(skb, SKB_DROP_REASON_VXLAN_NO_REMOTE);
2790+
kfree_skb_reason(skb, SKB_DROP_REASON_NO_TX_TARGET);
27912791
return NETDEV_TX_OK;
27922792
}
27932793
}
@@ -2810,7 +2810,7 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
28102810
if (fdst)
28112811
vxlan_xmit_one(skb, dev, vni, fdst, did_rsc);
28122812
else
2813-
kfree_skb_reason(skb, SKB_DROP_REASON_VXLAN_NO_REMOTE);
2813+
kfree_skb_reason(skb, SKB_DROP_REASON_NO_TX_TARGET);
28142814
}
28152815

28162816
return NETDEV_TX_OK;

drivers/net/vxlan/vxlan_mdb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1712,7 +1712,7 @@ netdev_tx_t vxlan_mdb_xmit(struct vxlan_dev *vxlan,
17121712
vxlan_xmit_one(skb, vxlan->dev, src_vni,
17131713
rcu_dereference(fremote->rd), false);
17141714
else
1715-
kfree_skb_reason(skb, SKB_DROP_REASON_VXLAN_NO_REMOTE);
1715+
kfree_skb_reason(skb, SKB_DROP_REASON_NO_TX_TARGET);
17161716

17171717
return NETDEV_TX_OK;
17181718
}

include/net/dropreason-core.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
FN(VXLAN_VNI_NOT_FOUND) \
9797
FN(MAC_INVALID_SOURCE) \
9898
FN(VXLAN_ENTRY_EXISTS) \
99-
FN(VXLAN_NO_REMOTE) \
99+
FN(NO_TX_TARGET) \
100100
FN(IP_TUNNEL_ECN) \
101101
FN(TUNNEL_TXINFO) \
102102
FN(LOCAL_MAC) \
@@ -441,8 +441,8 @@ enum skb_drop_reason {
441441
* entry or an entry pointing to a nexthop.
442442
*/
443443
SKB_DROP_REASON_VXLAN_ENTRY_EXISTS,
444-
/** @SKB_DROP_REASON_VXLAN_NO_REMOTE: no remote found for xmit */
445-
SKB_DROP_REASON_VXLAN_NO_REMOTE,
444+
/** @SKB_DROP_REASON_NO_TX_TARGET: no target found for xmit */
445+
SKB_DROP_REASON_NO_TX_TARGET,
446446
/**
447447
* @SKB_DROP_REASON_IP_TUNNEL_ECN: skb is dropped according to
448448
* RFC 6040 4.2, see __INET_ECN_decapsulate() for detail.

0 commit comments

Comments
 (0)