Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66a8e1f9 authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: move STU GetNext operation 



Extract the generic portion of code to issue an STU GetNext operation,
which will be used in other implementations.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c499a64f

drivers/net/dsa/mv88e6xxx/chip.c

+1 −13
Original line number Diff line number Diff line
@@ -1422,19 +1422,7 @@ static int _mv88e6xxx_stu_getnext(struct mv88e6xxx_chip *chip, u8 sid, 
	if (err)

		return err;



	err = mv88e6xxx_g1_vtu_sid_write(chip, &next);

	if (err)

		return err;



	err = mv88e6xxx_g1_vtu_op(chip, GLOBAL_VTU_OP_STU_GET_NEXT);

	if (err)

		return err;



	err = mv88e6xxx_g1_vtu_sid_read(chip, &next);

	if (err)

		return err;



	err = mv88e6xxx_g1_vtu_vid_read(chip, &next);

	err = mv88e6xxx_g1_vtu_stu_getnext(chip, &next);

	if (err)

		return err;

drivers/net/dsa/mv88e6xxx/global1.h

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ int mv88e6xxx_g1_vtu_op_wait(struct mv88e6xxx_chip *chip); 
int mv88e6xxx_g1_vtu_op(struct mv88e6xxx_chip *chip, u16 op);

int mv88e6xxx_g1_vtu_getnext(struct mv88e6xxx_chip *chip,

			     struct mv88e6xxx_vtu_entry *entry);

int mv88e6xxx_g1_vtu_stu_getnext(struct mv88e6xxx_chip *chip,

				 struct mv88e6xxx_vtu_entry *vtu);

int mv88e6xxx_g1_vtu_flush(struct mv88e6xxx_chip *chip);



#endif /* _MV88E6XXX_GLOBAL1_H */

drivers/net/dsa/mv88e6xxx/global1_vtu.c

+20 −0
Original line number Diff line number Diff line
@@ -174,6 +174,26 @@ int mv88e6185_g1_vtu_data_write(struct mv88e6xxx_chip *chip, 


/* VLAN Translation Unit Operations */



int mv88e6xxx_g1_vtu_stu_getnext(struct mv88e6xxx_chip *chip,

				 struct mv88e6xxx_vtu_entry *entry)

{

	int err;



	err = mv88e6xxx_g1_vtu_sid_write(chip, entry);

	if (err)

		return err;



	err = mv88e6xxx_g1_vtu_op(chip, GLOBAL_VTU_OP_STU_GET_NEXT);

	if (err)

		return err;



	err = mv88e6xxx_g1_vtu_sid_read(chip, entry);

	if (err)

		return err;



	return mv88e6xxx_g1_vtu_vid_read(chip, entry);

}



int mv88e6xxx_g1_vtu_getnext(struct mv88e6xxx_chip *chip,

			     struct mv88e6xxx_vtu_entry *entry)

{