Commit b4de9051 authored by Dale Farnsworth's avatar Dale Farnsworth Committed by Jeff Garzik

[PATCH] mv643xx_eth: Whitespace cleanup

Signed-off-by: default avatarDale Farnsworth <dale@farnsworth.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 12ad74f8
...@@ -1055,7 +1055,6 @@ static inline unsigned int has_tiny_unaligned_frags(struct sk_buff *skb) ...@@ -1055,7 +1055,6 @@ static inline unsigned int has_tiny_unaligned_frags(struct sk_buff *skb)
fragp = &skb_shinfo(skb)->frags[frag]; fragp = &skb_shinfo(skb)->frags[frag];
if (fragp->size <= 8 && fragp->page_offset & 0x7) if (fragp->size <= 8 && fragp->page_offset & 0x7)
return 1; return 1;
} }
return 0; return 0;
} }
...@@ -2886,8 +2885,10 @@ static ETH_FUNC_RET_STATUS eth_port_receive(struct mv643xx_private *mp, ...@@ -2886,8 +2885,10 @@ static ETH_FUNC_RET_STATUS eth_port_receive(struct mv643xx_private *mp,
p_pkt_info->return_info = mp->rx_skb[rx_curr_desc]; p_pkt_info->return_info = mp->rx_skb[rx_curr_desc];
p_pkt_info->l4i_chk = p_rx_desc->buf_size; p_pkt_info->l4i_chk = p_rx_desc->buf_size;
/* Clean the return info field to indicate that the packet has been */ /*
/* moved to the upper layers */ * Clean the return info field to indicate that the
* packet has been moved to the upper layers
*/
mp->rx_skb[rx_curr_desc] = NULL; mp->rx_skb[rx_curr_desc] = NULL;
/* Update current index in data structure */ /* Update current index in data structure */
...@@ -3119,8 +3120,7 @@ mv643xx_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd) ...@@ -3119,8 +3120,7 @@ mv643xx_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
return 0; return 0;
} }
static void static void mv643xx_get_drvinfo(struct net_device *netdev,
mv643xx_get_drvinfo(struct net_device *netdev,
struct ethtool_drvinfo *drvinfo) struct ethtool_drvinfo *drvinfo)
{ {
strncpy(drvinfo->driver, mv643xx_driver_name, 32); strncpy(drvinfo->driver, mv643xx_driver_name, 32);
...@@ -3130,14 +3130,12 @@ mv643xx_get_drvinfo(struct net_device *netdev, ...@@ -3130,14 +3130,12 @@ mv643xx_get_drvinfo(struct net_device *netdev,
drvinfo->n_stats = MV643XX_STATS_LEN; drvinfo->n_stats = MV643XX_STATS_LEN;
} }
static int static int mv643xx_get_stats_count(struct net_device *netdev)
mv643xx_get_stats_count(struct net_device *netdev)
{ {
return MV643XX_STATS_LEN; return MV643XX_STATS_LEN;
} }
static void static void mv643xx_get_ethtool_stats(struct net_device *netdev,
mv643xx_get_ethtool_stats(struct net_device *netdev,
struct ethtool_stats *stats, uint64_t *data) struct ethtool_stats *stats, uint64_t *data)
{ {
struct mv643xx_private *mp = netdev->priv; struct mv643xx_private *mp = netdev->priv;
...@@ -3145,15 +3143,15 @@ mv643xx_get_ethtool_stats(struct net_device *netdev, ...@@ -3145,15 +3143,15 @@ mv643xx_get_ethtool_stats(struct net_device *netdev,
eth_update_mib_counters(mp); eth_update_mib_counters(mp);
for(i = 0; i < MV643XX_STATS_LEN; i++) { for (i = 0; i < MV643XX_STATS_LEN; i++) {
char *p = (char *)mp+mv643xx_gstrings_stats[i].stat_offset; char *p = (char *)mp+mv643xx_gstrings_stats[i].stat_offset;
data[i] = (mv643xx_gstrings_stats[i].sizeof_stat == data[i] = (mv643xx_gstrings_stats[i].sizeof_stat ==
sizeof(uint64_t)) ? *(uint64_t *)p : *(uint32_t *)p; sizeof(uint64_t)) ? *(uint64_t *)p : *(uint32_t *)p;
} }
} }
static void static void mv643xx_get_strings(struct net_device *netdev, uint32_t stringset,
mv643xx_get_strings(struct net_device *netdev, uint32_t stringset, uint8_t *data) uint8_t *data)
{ {
int i; int i;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment