macsec: Use helper macsec_netdev_priv for offload drivers

Now macsec on top of vlan can be offloaded to macsec offloading
devices so that VLAN tag is sent in clear text on wire i.e,
packet structure is DMAC|SMAC|VLAN|SECTAG. Offloading devices can
simply enable NETIF_F_HW_MACSEC feature in netdev->vlan_features for
this to work. But the logic in offloading drivers to retrieve the
private structure from netdev needs to be changed to check whether
the netdev received is real device or a vlan device and get private
structure accordingly. This patch changes the offloading drivers to
use helper macsec_netdev_priv instead of netdev_priv.

Signed-off-by: Subbaraya Sundeep <sbhatta@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_macsec.c b/drivers/net/ethernet/aquantia/atlantic/aq_macsec.c
index 7eb5851eb95dc3f8a948dc2783489aca6dd45530..6afff8af5e86c54def78b181959f5191a8f7690c 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/aq_macsec.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_macsec.c
@@ -289,7 +289,7 @@ static int aq_get_txsc_stats(struct aq_hw_s *hw, const int sc_idx,
 
 static int aq_mdo_dev_open(struct macsec_context *ctx)
 {
-       struct aq_nic_s *nic = netdev_priv(ctx->netdev);
+       struct aq_nic_s *nic = macsec_netdev_priv(ctx->netdev);
        int ret = 0;
 
        if (netif_carrier_ok(nic->ndev))
@@ -300,7 +300,7 @@ static int aq_mdo_dev_open(struct macsec_context *ctx)
 
 static int aq_mdo_dev_stop(struct macsec_context *ctx)
 {
-       struct aq_nic_s *nic = netdev_priv(ctx->netdev);
+       struct aq_nic_s *nic = macsec_netdev_priv(ctx->netdev);
        int i;
 
        for (i = 0; i < AQ_MACSEC_MAX_SC; i++) {
@@ -439,7 +439,7 @@ static enum aq_macsec_sc_sa sc_sa_from_num_an(const int num_an)
 
 static int aq_mdo_add_secy(struct macsec_context *ctx)
 {
-       struct aq_nic_s *nic = netdev_priv(ctx->netdev);
+       struct aq_nic_s *nic = macsec_netdev_priv(ctx->netdev);
        struct aq_macsec_cfg *cfg = nic->macsec_cfg;
        const struct macsec_secy *secy = ctx->secy;
        enum aq_macsec_sc_sa sc_sa;
@@ -474,7 +474,7 @@ static int aq_mdo_add_secy(struct macsec_context *ctx)
 
 static int aq_mdo_upd_secy(struct macsec_context *ctx)
 {
-       struct aq_nic_s *nic = netdev_priv(ctx->netdev);
+       struct aq_nic_s *nic = macsec_netdev_priv(ctx->netdev);
        const struct macsec_secy *secy = ctx->secy;
        int txsc_idx;
        int ret = 0;
@@ -528,7 +528,7 @@ static int aq_clear_txsc(struct aq_nic_s *nic, const int txsc_idx,
 
 static int aq_mdo_del_secy(struct macsec_context *ctx)
 {
-       struct aq_nic_s *nic = netdev_priv(ctx->netdev);
+       struct aq_nic_s *nic = macsec_netdev_priv(ctx->netdev);
        int ret = 0;
 
        if (!nic->macsec_cfg)
@@ -576,7 +576,7 @@ static int aq_update_txsa(struct aq_nic_s *nic, const unsigned int sc_idx,
 
 static int aq_mdo_add_txsa(struct macsec_context *ctx)
 {
-       struct aq_nic_s *nic = netdev_priv(ctx->netdev);
+       struct aq_nic_s *nic = macsec_netdev_priv(ctx->netdev);
        struct aq_macsec_cfg *cfg = nic->macsec_cfg;
        const struct macsec_secy *secy = ctx->secy;
        struct aq_macsec_txsc *aq_txsc;
@@ -603,7 +603,7 @@ static int aq_mdo_add_txsa(struct macsec_context *ctx)
 
 static int aq_mdo_upd_txsa(struct macsec_context *ctx)
 {
-       struct aq_nic_s *nic = netdev_priv(ctx->netdev);
+       struct aq_nic_s *nic = macsec_netdev_priv(ctx->netdev);
        struct aq_macsec_cfg *cfg = nic->macsec_cfg;
        const struct macsec_secy *secy = ctx->secy;
        struct aq_macsec_txsc *aq_txsc;
@@ -652,7 +652,7 @@ static int aq_clear_txsa(struct aq_nic_s *nic, struct aq_macsec_txsc *aq_txsc,
 
 static int aq_mdo_del_txsa(struct macsec_context *ctx)
 {
-       struct aq_nic_s *nic = netdev_priv(ctx->netdev);
+       struct aq_nic_s *nic = macsec_netdev_priv(ctx->netdev);
        struct aq_macsec_cfg *cfg = nic->macsec_cfg;
        int txsc_idx;
        int ret = 0;
@@ -744,7 +744,7 @@ static int aq_set_rxsc(struct aq_nic_s *nic, const u32 rxsc_idx)
 
 static int aq_mdo_add_rxsc(struct macsec_context *ctx)
 {
-       struct aq_nic_s *nic = netdev_priv(ctx->netdev);
+       struct aq_nic_s *nic = macsec_netdev_priv(ctx->netdev);
        struct aq_macsec_cfg *cfg = nic->macsec_cfg;
        const u32 rxsc_idx_max = aq_sc_idx_max(cfg->sc_sa);
        u32 rxsc_idx;
@@ -775,7 +775,7 @@ static int aq_mdo_add_rxsc(struct macsec_context *ctx)
 
 static int aq_mdo_upd_rxsc(struct macsec_context *ctx)
 {
-       struct aq_nic_s *nic = netdev_priv(ctx->netdev);
+       struct aq_nic_s *nic = macsec_netdev_priv(ctx->netdev);
        int rxsc_idx;
        int ret = 0;
 
@@ -838,7 +838,7 @@ static int aq_clear_rxsc(struct aq_nic_s *nic, const int rxsc_idx,
 
 static int aq_mdo_del_rxsc(struct macsec_context *ctx)
 {
-       struct aq_nic_s *nic = netdev_priv(ctx->netdev);
+       struct aq_nic_s *nic = macsec_netdev_priv(ctx->netdev);
        enum aq_clear_type clear_type = AQ_CLEAR_SW;
        int rxsc_idx;
        int ret = 0;
@@ -906,8 +906,8 @@ static int aq_update_rxsa(struct aq_nic_s *nic, const unsigned int sc_idx,
 
 static int aq_mdo_add_rxsa(struct macsec_context *ctx)
 {
+       struct aq_nic_s *nic = macsec_netdev_priv(ctx->netdev);
        const struct macsec_rx_sc *rx_sc = ctx->sa.rx_sa->sc;
-       struct aq_nic_s *nic = netdev_priv(ctx->netdev);
        const struct macsec_secy *secy = ctx->secy;
        struct aq_macsec_rxsc *aq_rxsc;
        int rxsc_idx;
@@ -933,8 +933,8 @@ static int aq_mdo_add_rxsa(struct macsec_context *ctx)
 
 static int aq_mdo_upd_rxsa(struct macsec_context *ctx)
 {
+       struct aq_nic_s *nic = macsec_netdev_priv(ctx->netdev);
        const struct macsec_rx_sc *rx_sc = ctx->sa.rx_sa->sc;
-       struct aq_nic_s *nic = netdev_priv(ctx->netdev);
        struct aq_macsec_cfg *cfg = nic->macsec_cfg;
        const struct macsec_secy *secy = ctx->secy;
        int rxsc_idx;
@@ -982,8 +982,8 @@ static int aq_clear_rxsa(struct aq_nic_s *nic, struct aq_macsec_rxsc *aq_rxsc,
 
 static int aq_mdo_del_rxsa(struct macsec_context *ctx)
 {
+       struct aq_nic_s *nic = macsec_netdev_priv(ctx->netdev);
        const struct macsec_rx_sc *rx_sc = ctx->sa.rx_sa->sc;
-       struct aq_nic_s *nic = netdev_priv(ctx->netdev);
        struct aq_macsec_cfg *cfg = nic->macsec_cfg;
        int rxsc_idx;
        int ret = 0;
@@ -1000,7 +1000,7 @@ static int aq_mdo_del_rxsa(struct macsec_context *ctx)
 
 static int aq_mdo_get_dev_stats(struct macsec_context *ctx)
 {
-       struct aq_nic_s *nic = netdev_priv(ctx->netdev);
+       struct aq_nic_s *nic = macsec_netdev_priv(ctx->netdev);
        struct aq_macsec_common_stats *stats = &nic->macsec_cfg->stats;
        struct aq_hw_s *hw = nic->aq_hw;
 
@@ -1020,7 +1020,7 @@ static int aq_mdo_get_dev_stats(struct macsec_context *ctx)
 
 static int aq_mdo_get_tx_sc_stats(struct macsec_context *ctx)
 {
-       struct aq_nic_s *nic = netdev_priv(ctx->netdev);
+       struct aq_nic_s *nic = macsec_netdev_priv(ctx->netdev);
        struct aq_macsec_tx_sc_stats *stats;
        struct aq_hw_s *hw = nic->aq_hw;
        struct aq_macsec_txsc *aq_txsc;
@@ -1044,7 +1044,7 @@ static int aq_mdo_get_tx_sc_stats(struct macsec_context *ctx)
 
 static int aq_mdo_get_tx_sa_stats(struct macsec_context *ctx)
 {
-       struct aq_nic_s *nic = netdev_priv(ctx->netdev);
+       struct aq_nic_s *nic = macsec_netdev_priv(ctx->netdev);
        struct aq_macsec_cfg *cfg = nic->macsec_cfg;
        struct aq_macsec_tx_sa_stats *stats;
        struct aq_hw_s *hw = nic->aq_hw;
@@ -1084,7 +1084,7 @@ static int aq_mdo_get_tx_sa_stats(struct macsec_context *ctx)
 
 static int aq_mdo_get_rx_sc_stats(struct macsec_context *ctx)
 {
-       struct aq_nic_s *nic = netdev_priv(ctx->netdev);
+       struct aq_nic_s *nic = macsec_netdev_priv(ctx->netdev);
        struct aq_macsec_cfg *cfg = nic->macsec_cfg;
        struct aq_macsec_rx_sa_stats *stats;
        struct aq_hw_s *hw = nic->aq_hw;
@@ -1129,7 +1129,7 @@ static int aq_mdo_get_rx_sc_stats(struct macsec_context *ctx)
 
 static int aq_mdo_get_rx_sa_stats(struct macsec_context *ctx)
 {
-       struct aq_nic_s *nic = netdev_priv(ctx->netdev);
+       struct aq_nic_s *nic = macsec_netdev_priv(ctx->netdev);
        struct aq_macsec_cfg *cfg = nic->macsec_cfg;
        struct aq_macsec_rx_sa_stats *stats;
        struct aq_hw_s *hw = nic->aq_hw;
@@ -1399,7 +1399,7 @@ static void aq_check_txsa_expiration(struct aq_nic_s *nic)
 #define AQ_LOCKED_MDO_DEF(mdo)                                         \
 static int aq_locked_mdo_##mdo(struct macsec_context *ctx)             \
 {                                                                      \
-       struct aq_nic_s *nic = netdev_priv(ctx->netdev);                \
+       struct aq_nic_s *nic = macsec_netdev_priv(ctx->netdev);         \
        int ret;                                                        \
        mutex_lock(&nic->macsec_mutex);                                 \
        ret = aq_mdo_##mdo(ctx);                                        \

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/cn10k_macsec.c b/drivers/net/ethernet/marvell/octeontx2/nic/cn10k_macsec.c
index a487a98eac88c2290519dceee59cce61d8d2b093..aea4c802bb9ddb8e441a687af11ff1071af2176c 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/nic/cn10k_macsec.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/cn10k_macsec.c
@@ -1053,7 +1053,7 @@ static void cn10k_mcs_sync_stats(struct otx2_nic *pfvf, struct macsec_secy *secy
 
 static int cn10k_mdo_open(struct macsec_context *ctx)
 {
-       struct otx2_nic *pfvf = netdev_priv(ctx->netdev);
+       struct otx2_nic *pfvf = macsec_netdev_priv(ctx->netdev);
        struct cn10k_mcs_cfg *cfg = pfvf->macsec_cfg;
        struct macsec_secy *secy = ctx->secy;
        struct macsec_tx_sa *sw_tx_sa;
@@ -1077,7 +1077,7 @@ static int cn10k_mdo_open(struct macsec_context *ctx)
 
 static int cn10k_mdo_stop(struct macsec_context *ctx)
 {
-       struct otx2_nic *pfvf = netdev_priv(ctx->netdev);
+       struct otx2_nic *pfvf = macsec_netdev_priv(ctx->netdev);
        struct cn10k_mcs_cfg *cfg = pfvf->macsec_cfg;
        struct cn10k_mcs_txsc *txsc;
        int err;
@@ -1095,7 +1095,7 @@ static int cn10k_mdo_stop(struct macsec_context *ctx)
 
 static int cn10k_mdo_add_secy(struct macsec_context *ctx)
 {
-       struct otx2_nic *pfvf = netdev_priv(ctx->netdev);
+       struct otx2_nic *pfvf = macsec_netdev_priv(ctx->netdev);
        struct cn10k_mcs_cfg *cfg = pfvf->macsec_cfg;
        struct macsec_secy *secy = ctx->secy;
        struct cn10k_mcs_txsc *txsc;
@@ -1129,7 +1129,7 @@ static int cn10k_mdo_add_secy(struct macsec_context *ctx)
 
 static int cn10k_mdo_upd_secy(struct macsec_context *ctx)
 {
-       struct otx2_nic *pfvf = netdev_priv(ctx->netdev);
+       struct otx2_nic *pfvf = macsec_netdev_priv(ctx->netdev);
        struct cn10k_mcs_cfg *cfg = pfvf->macsec_cfg;
        struct macsec_secy *secy = ctx->secy;
        struct macsec_tx_sa *sw_tx_sa;
@@ -1164,7 +1164,7 @@ static int cn10k_mdo_upd_secy(struct macsec_context *ctx)
 
 static int cn10k_mdo_del_secy(struct macsec_context *ctx)
 {
-       struct otx2_nic *pfvf = netdev_priv(ctx->netdev);
+       struct otx2_nic *pfvf = macsec_netdev_priv(ctx->netdev);
        struct cn10k_mcs_cfg *cfg = pfvf->macsec_cfg;
        struct cn10k_mcs_txsc *txsc;
 
@@ -1183,7 +1183,7 @@ static int cn10k_mdo_del_secy(struct macsec_context *ctx)
 
 static int cn10k_mdo_add_txsa(struct macsec_context *ctx)
 {
-       struct otx2_nic *pfvf = netdev_priv(ctx->netdev);
+       struct otx2_nic *pfvf = macsec_netdev_priv(ctx->netdev);
        struct macsec_tx_sa *sw_tx_sa = ctx->sa.tx_sa;
        struct cn10k_mcs_cfg *cfg = pfvf->macsec_cfg;
        struct macsec_secy *secy = ctx->secy;
@@ -1225,7 +1225,7 @@ static int cn10k_mdo_add_txsa(struct macsec_context *ctx)
 
 static int cn10k_mdo_upd_txsa(struct macsec_context *ctx)
 {
-       struct otx2_nic *pfvf = netdev_priv(ctx->netdev);
+       struct otx2_nic *pfvf = macsec_netdev_priv(ctx->netdev);
        struct macsec_tx_sa *sw_tx_sa = ctx->sa.tx_sa;
        struct cn10k_mcs_cfg *cfg = pfvf->macsec_cfg;
        struct macsec_secy *secy = ctx->secy;
@@ -1258,7 +1258,7 @@ static int cn10k_mdo_upd_txsa(struct macsec_context *ctx)
 
 static int cn10k_mdo_del_txsa(struct macsec_context *ctx)
 {
-       struct otx2_nic *pfvf = netdev_priv(ctx->netdev);
+       struct otx2_nic *pfvf = macsec_netdev_priv(ctx->netdev);
        struct cn10k_mcs_cfg *cfg = pfvf->macsec_cfg;
        u8 sa_num = ctx->sa.assoc_num;
        struct cn10k_mcs_txsc *txsc;
@@ -1278,7 +1278,7 @@ static int cn10k_mdo_del_txsa(struct macsec_context *ctx)
 
 static int cn10k_mdo_add_rxsc(struct macsec_context *ctx)
 {
-       struct otx2_nic *pfvf = netdev_priv(ctx->netdev);
+       struct otx2_nic *pfvf = macsec_netdev_priv(ctx->netdev);
        struct cn10k_mcs_cfg *cfg = pfvf->macsec_cfg;
        struct macsec_secy *secy = ctx->secy;
        struct cn10k_mcs_rxsc *rxsc;
@@ -1312,7 +1312,7 @@ static int cn10k_mdo_add_rxsc(struct macsec_context *ctx)
 
 static int cn10k_mdo_upd_rxsc(struct macsec_context *ctx)
 {
-       struct otx2_nic *pfvf = netdev_priv(ctx->netdev);
+       struct otx2_nic *pfvf = macsec_netdev_priv(ctx->netdev);
        struct cn10k_mcs_cfg *cfg = pfvf->macsec_cfg;
        struct macsec_secy *secy = ctx->secy;
        bool enable = ctx->rx_sc->active;
@@ -1331,7 +1331,7 @@ static int cn10k_mdo_upd_rxsc(struct macsec_context *ctx)
 
 static int cn10k_mdo_del_rxsc(struct macsec_context *ctx)
 {
-       struct otx2_nic *pfvf = netdev_priv(ctx->netdev);
+       struct otx2_nic *pfvf = macsec_netdev_priv(ctx->netdev);
        struct cn10k_mcs_cfg *cfg = pfvf->macsec_cfg;
        struct cn10k_mcs_rxsc *rxsc;
 
@@ -1349,8 +1349,8 @@ static int cn10k_mdo_del_rxsc(struct macsec_context *ctx)
 
 static int cn10k_mdo_add_rxsa(struct macsec_context *ctx)
 {
+       struct otx2_nic *pfvf = macsec_netdev_priv(ctx->netdev);
        struct macsec_rx_sc *sw_rx_sc = ctx->sa.rx_sa->sc;
-       struct otx2_nic *pfvf = netdev_priv(ctx->netdev);
        struct cn10k_mcs_cfg *cfg = pfvf->macsec_cfg;
        struct macsec_rx_sa *rx_sa = ctx->sa.rx_sa;
        u64 next_pn = rx_sa->next_pn_halves.lower;
@@ -1389,8 +1389,8 @@ static int cn10k_mdo_add_rxsa(struct macsec_context *ctx)
 
 static int cn10k_mdo_upd_rxsa(struct macsec_context *ctx)
 {
+       struct otx2_nic *pfvf = macsec_netdev_priv(ctx->netdev);
        struct macsec_rx_sc *sw_rx_sc = ctx->sa.rx_sa->sc;
-       struct otx2_nic *pfvf = netdev_priv(ctx->netdev);
        struct cn10k_mcs_cfg *cfg = pfvf->macsec_cfg;
        struct macsec_rx_sa *rx_sa = ctx->sa.rx_sa;
        u64 next_pn = rx_sa->next_pn_halves.lower;
@@ -1422,8 +1422,8 @@ static int cn10k_mdo_upd_rxsa(struct macsec_context *ctx)
 
 static int cn10k_mdo_del_rxsa(struct macsec_context *ctx)
 {
+       struct otx2_nic *pfvf = macsec_netdev_priv(ctx->netdev);
        struct macsec_rx_sc *sw_rx_sc = ctx->sa.rx_sa->sc;
-       struct otx2_nic *pfvf = netdev_priv(ctx->netdev);
        struct cn10k_mcs_cfg *cfg = pfvf->macsec_cfg;
        u8 sa_num = ctx->sa.assoc_num;
        struct cn10k_mcs_rxsc *rxsc;
@@ -1445,8 +1445,8 @@ static int cn10k_mdo_del_rxsa(struct macsec_context *ctx)
 
 static int cn10k_mdo_get_dev_stats(struct macsec_context *ctx)
 {
+       struct otx2_nic *pfvf = macsec_netdev_priv(ctx->netdev);
        struct mcs_secy_stats tx_rsp = { 0 }, rx_rsp = { 0 };
-       struct otx2_nic *pfvf = netdev_priv(ctx->netdev);
        struct cn10k_mcs_cfg *cfg = pfvf->macsec_cfg;
        struct macsec_secy *secy = ctx->secy;
        struct cn10k_mcs_txsc *txsc;
@@ -1481,7 +1481,7 @@ static int cn10k_mdo_get_dev_stats(struct macsec_context *ctx)
 
 static int cn10k_mdo_get_tx_sc_stats(struct macsec_context *ctx)
 {
-       struct otx2_nic *pfvf = netdev_priv(ctx->netdev);
+       struct otx2_nic *pfvf = macsec_netdev_priv(ctx->netdev);
        struct cn10k_mcs_cfg *cfg = pfvf->macsec_cfg;
        struct mcs_sc_stats rsp = { 0 };
        struct cn10k_mcs_txsc *txsc;
@@ -1502,7 +1502,7 @@ static int cn10k_mdo_get_tx_sc_stats(struct macsec_context *ctx)
 
 static int cn10k_mdo_get_tx_sa_stats(struct macsec_context *ctx)
 {
-       struct otx2_nic *pfvf = netdev_priv(ctx->netdev);
+       struct otx2_nic *pfvf = macsec_netdev_priv(ctx->netdev);
        struct cn10k_mcs_cfg *cfg = pfvf->macsec_cfg;
        struct mcs_sa_stats rsp = { 0 };
        u8 sa_num = ctx->sa.assoc_num;
@@ -1525,7 +1525,7 @@ static int cn10k_mdo_get_tx_sa_stats(struct macsec_context *ctx)
 
 static int cn10k_mdo_get_rx_sc_stats(struct macsec_context *ctx)
 {
-       struct otx2_nic *pfvf = netdev_priv(ctx->netdev);
+       struct otx2_nic *pfvf = macsec_netdev_priv(ctx->netdev);
        struct cn10k_mcs_cfg *cfg = pfvf->macsec_cfg;
        struct macsec_secy *secy = ctx->secy;
        struct mcs_sc_stats rsp = { 0 };
@@ -1567,8 +1567,8 @@ static int cn10k_mdo_get_rx_sc_stats(struct macsec_context *ctx)
 
 static int cn10k_mdo_get_rx_sa_stats(struct macsec_context *ctx)
 {
+       struct otx2_nic *pfvf = macsec_netdev_priv(ctx->netdev);
        struct macsec_rx_sc *sw_rx_sc = ctx->sa.rx_sa->sc;
-       struct otx2_nic *pfvf = netdev_priv(ctx->netdev);
        struct cn10k_mcs_cfg *cfg = pfvf->macsec_cfg;
        struct mcs_sa_stats rsp = { 0 };
        u8 sa_num = ctx->sa.assoc_num;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c
index 6b7b563f844a1f03d7288088b9989a7aa70c113b..592b165530ffa376031f19fa54736b345f9fc612 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c
@@ -349,15 +349,6 @@ static void mlx5e_macsec_cleanup_sa(struct mlx5e_macsec *macsec,
        sa->macsec_rule = NULL;
 }
 
-static struct mlx5e_priv *macsec_netdev_priv(const struct net_device *dev)
-{
-#if IS_ENABLED(CONFIG_VLAN_8021Q)
-       if (is_vlan_dev(dev))
-               return netdev_priv(vlan_dev_priv(dev)->real_dev);
-#endif
-       return netdev_priv(dev);
-}
-
 static int mlx5e_macsec_init_sa(struct macsec_context *ctx,
                                struct mlx5e_macsec_sa *sa,
                                bool encrypt,

diff --git a/include/net/macsec.h b/include/net/macsec.h
index 5b9c61c4d3a625d1596b24b805cc5975d5844e8a..441ed8fd4b5f6e8857d41e9d5921f65742a602af 100644 (file)
--- a/include/net/macsec.h
+++ b/include/net/macsec.h
@@ -8,6 +8,7 @@
 #define _NET_MACSEC_H_
 
 #include <linux/u64_stats_sync.h>
+#include <linux/if_vlan.h>
 #include <uapi/linux/if_link.h>
 #include <uapi/linux/if_macsec.h>
 
@@ -312,4 +313,13 @@ static inline bool macsec_send_sci(const struct macsec_secy *secy)
                (secy->n_rx_sc > 1 && !tx_sc->end_station && !tx_sc->scb);
 }
 
+static inline void *macsec_netdev_priv(const struct net_device *dev)
+{
+#if IS_ENABLED(CONFIG_VLAN_8021Q)
+       if (is_vlan_dev(dev))
+               return netdev_priv(vlan_dev_priv(dev)->real_dev);
+#endif
+       return netdev_priv(dev);
+}
+
 #endif /* _NET_MACSEC_H_ */