Skip to content

Commit

Permalink
ice: basic support for VLAN in subfunctions
Browse files Browse the repository at this point in the history
Implement add / delete vlan for subfunction type VSI.

Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
  • Loading branch information
Michal Swiatkowski authored and Tony Nguyen committed Sep 6, 2024
1 parent 7cde474 commit 0c6a3cb
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 0 deletions.
1 change: 1 addition & 0 deletions drivers/net/ethernet/intel/ice/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ ice-y := ice_main.o \
devlink/devlink.o \
devlink/devlink_port.o \
ice_sf_eth.o \
ice_sf_vsi_vlan_ops.o \
ice_ddp.o \
ice_fw_update.o \
ice_lag.o \
Expand Down
21 changes: 21 additions & 0 deletions drivers/net/ethernet/intel/ice/ice_sf_vsi_vlan_ops.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// SPDX-License-Identifier: GPL-2.0
/* Copyright (c) 2023, Intel Corporation. */

#include "ice_vsi_vlan_ops.h"
#include "ice_vsi_vlan_lib.h"
#include "ice_vlan_mode.h"
#include "ice.h"
#include "ice_sf_vsi_vlan_ops.h"

void ice_sf_vsi_init_vlan_ops(struct ice_vsi *vsi)
{
struct ice_vsi_vlan_ops *vlan_ops;

if (ice_is_dvm_ena(&vsi->back->hw))
vlan_ops = &vsi->outer_vlan_ops;
else
vlan_ops = &vsi->inner_vlan_ops;

vlan_ops->add_vlan = ice_vsi_add_vlan;
vlan_ops->del_vlan = ice_vsi_del_vlan;
}
13 changes: 13 additions & 0 deletions drivers/net/ethernet/intel/ice/ice_sf_vsi_vlan_ops.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (c) 2023, Intel Corporation. */

#ifndef _ICE_SF_VSI_VLAN_OPS_H_
#define _ICE_SF_VSI_VLAN_OPS_H_

#include "ice_vsi_vlan_ops.h"

struct ice_vsi;

void ice_sf_vsi_init_vlan_ops(struct ice_vsi *vsi);

#endif /* _ICE_SF_VSI_VLAN_OPS_H_ */
4 changes: 4 additions & 0 deletions drivers/net/ethernet/intel/ice/ice_vsi_vlan_ops.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include "ice_pf_vsi_vlan_ops.h"
#include "ice_vf_vsi_vlan_ops.h"
#include "ice_sf_vsi_vlan_ops.h"
#include "ice_lib.h"
#include "ice.h"

Expand Down Expand Up @@ -77,6 +78,9 @@ void ice_vsi_init_vlan_ops(struct ice_vsi *vsi)
case ICE_VSI_VF:
ice_vf_vsi_init_vlan_ops(vsi);
break;
case ICE_VSI_SF:
ice_sf_vsi_init_vlan_ops(vsi);
break;
default:
dev_dbg(ice_pf_to_dev(vsi->back), "%s does not support VLAN operations\n",
ice_vsi_type_str(vsi->type));
Expand Down

0 comments on commit 0c6a3cb

Please sign in to comment.