mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
gianfar: Refactor config coalescing calls for all queues
The only place where gfar_configure_coalescing is called with an actual bitmask (other than 0xff) is in gfar_poll (on the hot path). So make gfar_configure_coalescing() static for the buffer processing path, and export gfar_configure_coalescing_all() for the remaining cases that require to set coalescing for all the queues at once (on the slow path). Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
5d9657d83a
commit
800c644bcd
3 changed files with 10 additions and 6 deletions
|
@ -341,7 +341,7 @@ static void gfar_init_mac(struct net_device *ndev)
|
|||
gfar_init_tx_rx_base(priv);
|
||||
|
||||
/* Configure the coalescing support */
|
||||
gfar_configure_coalescing(priv, 0xFF, 0xFF);
|
||||
gfar_configure_coalescing_all(priv);
|
||||
|
||||
/* set this when rx hw offload (TOE) functions are being used */
|
||||
priv->uses_rxfcb = 0;
|
||||
|
@ -1816,7 +1816,7 @@ void gfar_start(struct net_device *dev)
|
|||
dev->trans_start = jiffies; /* prevent tx timeout */
|
||||
}
|
||||
|
||||
void gfar_configure_coalescing(struct gfar_private *priv,
|
||||
static void gfar_configure_coalescing(struct gfar_private *priv,
|
||||
unsigned long tx_mask, unsigned long rx_mask)
|
||||
{
|
||||
struct gfar __iomem *regs = priv->gfargrp[0].regs;
|
||||
|
@ -1851,6 +1851,11 @@ void gfar_configure_coalescing(struct gfar_private *priv,
|
|||
}
|
||||
}
|
||||
|
||||
void gfar_configure_coalescing_all(struct gfar_private *priv)
|
||||
{
|
||||
gfar_configure_coalescing(priv, 0xFF, 0xFF);
|
||||
}
|
||||
|
||||
static int register_grp_irqs(struct gfar_priv_grp *grp)
|
||||
{
|
||||
struct gfar_private *priv = grp->priv;
|
||||
|
@ -1940,7 +1945,7 @@ int startup_gfar(struct net_device *ndev)
|
|||
|
||||
phy_start(priv->phydev);
|
||||
|
||||
gfar_configure_coalescing(priv, 0xFF, 0xFF);
|
||||
gfar_configure_coalescing_all(priv);
|
||||
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -1182,8 +1182,7 @@ extern void stop_gfar(struct net_device *dev);
|
|||
extern void gfar_halt(struct net_device *dev);
|
||||
extern void gfar_phy_test(struct mii_bus *bus, struct phy_device *phydev,
|
||||
int enable, u32 regnum, u32 read);
|
||||
extern void gfar_configure_coalescing(struct gfar_private *priv,
|
||||
unsigned long tx_mask, unsigned long rx_mask);
|
||||
extern void gfar_configure_coalescing_all(struct gfar_private *priv);
|
||||
void gfar_init_sysfs(struct net_device *dev);
|
||||
int gfar_set_features(struct net_device *dev, netdev_features_t features);
|
||||
extern void gfar_check_rx_parser_mode(struct gfar_private *priv);
|
||||
|
|
|
@ -436,7 +436,7 @@ static int gfar_scoalesce(struct net_device *dev,
|
|||
gfar_usecs2ticks(priv, cvals->tx_coalesce_usecs));
|
||||
}
|
||||
|
||||
gfar_configure_coalescing(priv, 0xFF, 0xFF);
|
||||
gfar_configure_coalescing_all(priv);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue