Skip to content

Commit

Permalink
generic: ar8216: add vtu_load_vlan field to ar8xxx_chip
Browse files Browse the repository at this point in the history
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31002 3c298f89-4303-0410-b956-a3cf2f4a3e73
  • Loading branch information
juhosg committed Mar 18, 2012
1 parent 6934b97 commit c097ab2
Showing 1 changed file with 15 additions and 4 deletions.
19 changes: 15 additions & 4 deletions target/linux/generic/files/drivers/net/phy/ar8216.c
Expand Up @@ -45,6 +45,7 @@ struct ar8xxx_chip {
u32 ingress, u32 members, u32 pvid);
int (*atu_flush)(struct ar8216_priv *priv);
void (*vtu_flush)(struct ar8216_priv *priv);
void (*vtu_load_vlan)(struct ar8216_priv *priv, u32 vid, u32 port_mask);
};

struct ar8216_priv {
Expand Down Expand Up @@ -489,6 +490,15 @@ ar8216_vtu_flush(struct ar8216_priv *priv)
ar8216_vtu_op(priv, AR8216_VTU_OP_FLUSH, 0);
}

static void
ar8216_vtu_load_vlan(struct ar8216_priv *priv, u32 vid, u32 port_mask)
{
u32 op;

op = AR8216_VTU_OP_LOAD | (vid << AR8216_VTU_VID_S);
ar8216_vtu_op(priv, op, port_mask);
}

static int
ar8216_atu_flush(struct ar8216_priv *priv)
{
Expand Down Expand Up @@ -578,10 +588,8 @@ ar8216_hw_apply(struct switch_dev *dev)
portmask[i] |= vp & ~mask;
}

ar8216_vtu_op(priv,
AR8216_VTU_OP_LOAD |
(priv->vlan_id[j] << AR8216_VTU_VID_S),
priv->vlan_table[j]);
priv->chip->vtu_load_vlan(priv, priv->vlan_id[j],
priv->vlan_table[j]);
}
} else {
/* vlan disabled:
Expand Down Expand Up @@ -768,6 +776,7 @@ static const struct ar8xxx_chip ar8216_chip = {
.setup_port = ar8216_setup_port,
.atu_flush = ar8216_atu_flush,
.vtu_flush = ar8216_vtu_flush,
.vtu_load_vlan = ar8216_vtu_load_vlan,
};

static const struct ar8xxx_chip ar8236_chip = {
Expand All @@ -776,6 +785,7 @@ static const struct ar8xxx_chip ar8236_chip = {
.setup_port = ar8236_setup_port,
.atu_flush = ar8216_atu_flush,
.vtu_flush = ar8216_vtu_flush,
.vtu_load_vlan = ar8216_vtu_load_vlan,
};

static const struct ar8xxx_chip ar8316_chip = {
Expand All @@ -784,6 +794,7 @@ static const struct ar8xxx_chip ar8316_chip = {
.setup_port = ar8216_setup_port,
.atu_flush = ar8216_atu_flush,
.vtu_flush = ar8216_vtu_flush,
.vtu_load_vlan = ar8216_vtu_load_vlan,
};

static int
Expand Down

0 comments on commit c097ab2

Please sign in to comment.