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

Commit abd709c7 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ravb-small-sparse-fixes' 



Niklas Söderlund says:

====================
ravb: small sparse fixes

This are fixes that have bugged me whenever I run sparse to check my own
changes to the driver. It's based on the latest net-next tree and tested
on M3-N.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 22a001e8 e49b42fa

drivers/net/ethernet/renesas/ravb_main.c

+3 −3
Original line number Diff line number Diff line
@@ -1226,7 +1226,7 @@ static int ravb_get_sset_count(struct net_device *netdev, int sset) 
}



static void ravb_get_ethtool_stats(struct net_device *ndev,

				   struct ethtool_stats *stats, u64 *data)

				   struct ethtool_stats *estats, u64 *data)

{

	struct ravb_private *priv = netdev_priv(ndev);

	int i = 0;
@@ -1258,7 +1258,7 @@ static void ravb_get_strings(struct net_device *ndev, u32 stringset, u8 *data) 
{

	switch (stringset) {

	case ETH_SS_STATS:

		memcpy(data, *ravb_gstrings_stats, sizeof(ravb_gstrings_stats));

		memcpy(data, ravb_gstrings_stats, sizeof(ravb_gstrings_stats));

		break;

	}

}
@@ -1623,7 +1623,7 @@ static netdev_tx_t ravb_start_xmit(struct sk_buff *skb, struct net_device *ndev) 
		/* TAG and timestamp required flag */

		skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;

		desc->tagh_tsr = (ts_skb->tag >> 4) | TX_TSR;

		desc->ds_tagl |= le16_to_cpu(ts_skb->tag << 12);

		desc->ds_tagl |= cpu_to_le16(ts_skb->tag << 12);

	}



	skb_tx_timestamp(skb);