On Monday, 2 December 2024 06:05:21 GMT+1 Linus Lüssing wrote:
vlan_dyn_max = bat_priv->softif_vlan_dyn_max;vlan_dyn_count = bat_priv->softif_vlan_dyn_count;if (vid & BATADV_VLAN_HAS_TAG && !own &&vlan_dyn_max <= vlan_dyn_count) {spin_unlock_bh(&bat_priv->softif_vlan_list_lock);net_ratelimited_function(batadv_info, bat_priv->soft_iface,"not adding VLAN %d, already learned %hu VID(s)\n",batadv_print_vid(vid), vlan_dyn_max);return NULL;}
net_ratelimited_function requires "#include <linux/net.h>" in soft-interface.c
@@ -561,8 +562,9 @@ struct batadv_softif_vlan *batadv_softif_vlan_get(struct batadv_priv *bat_priv,
- otherwise.
*/ static struct batadv_softif_vlan * -batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid) +batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid, bool own) {
unsigned short vlan_dyn_max, vlan_dyn_count; struct batadv_softif_vlan *vlan; spin_lock_bh(&bat_priv->softif_vlan_list_lock);
Missing kernel-doc for new parameter "own"
@@ -597,20 +615,21 @@ batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid) /**
- batadv_softif_vlan_get_or_create() - retrieve or create a softif vlan struct
- @bat_priv: the bat priv with all the soft interface information
*/
- @addr: the mac address of the client to add
- @vid: the VLAN identifier
- Return: the softif vlan struct if found or created or NULL otherwise.
struct batadv_softif_vlan * -batadv_softif_vlan_get_or_create(struct batadv_priv *bat_priv,
unsigned short vid)+batadv_softif_vlan_get_or_create(struct batadv_priv *bat_priv, const u8 *addr,
unsigned short vid, bool own)
kernel-doc for addr was added but not for new parameter "own"
Btw. the first patch also doesn't apply at the moment.
Kind regards, Sven