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

Commit 02f840cb authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: do not cast dst 



dsa_ptr is not a void pointer anymore since Nov 2011, as of cf50dcc2
("dsa: Change dsa_uses_{dsa, trailer}_tags() into inline functions"),
but an explicit dsa_switch_tree pointer, thus remove the (void *) cast.

Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 73a7ece8

net/dsa/dsa2.c

+1 −1
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ static int dsa_dst_apply(struct dsa_switch_tree *dst) 
	 * sent to the tag format's receive function.

	 */

	wmb();

	dst->master_netdev->dsa_ptr = (void *)dst;

	dst->master_netdev->dsa_ptr = dst;

	dst->applied = true;



	return 0;

net/dsa/legacy.c

+1 −1
Original line number Diff line number Diff line
@@ -651,7 +651,7 @@ static int dsa_setup_dst(struct dsa_switch_tree *dst, struct net_device *dev, 
	 * sent to the tag format's receive function.

	 */

	wmb();

	dev->dsa_ptr = (void *)dst;

	dev->dsa_ptr = dst;



	return 0;

}