diff options
author | David S. Miller <davem@davemloft.net> | 2014-10-09 00:01:46 +0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-10-09 00:01:46 +0400 |
commit | 44783d87512999fe1450ff2cdf26c1ddc3fa5eea (patch) | |
tree | 5a49f7bcc87106c58aab068841c7e869db659126 /include/linux/fs_enet_pd.h | |
parent | 935e2218d5a0fade1645982fb034eee37f100f11 (diff) | |
parent | d43a396af0f54740c4f491a066d249b7d7467593 (diff) | |
download | linux-44783d87512999fe1450ff2cdf26c1ddc3fa5eea.tar.xz |
Merge branch 'fs_enet_napi'
Christophe Leroy says:
====================
net: fs_enet: Remove non NAPI RX and add NAPI for TX
When using a MPC8xx as a router, 'perf' shows a significant time spent in
fs_enet_interrupt() and fs_enet_start_xmit().
'perf annotate' shows that the time spent in fs_enet_start_xmit is indeed spent
between spin_unlock_irqrestore() and the following instruction, hence in
interrupt handling. This is due to the TX complete interrupt that fires after
each transmitted packet.
This patchset first remove all non NAPI handling as NAPI has become the only
mode for RX, then adds NAPI for handling TX complete.
This improves NAT TCP throughput by 21% on MPC885 with FEC.
Tested on MPC885 with FEC.
[PATCH 1/2] net: fs_enet: Remove non NAPI RX
[PATCH 2/2] net: fs_enet: Add NAPI TX
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/fs_enet_pd.h')
-rw-r--r-- | include/linux/fs_enet_pd.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/fs_enet_pd.h b/include/linux/fs_enet_pd.h index efb05961bdd8..77d783f71527 100644 --- a/include/linux/fs_enet_pd.h +++ b/include/linux/fs_enet_pd.h @@ -139,7 +139,6 @@ struct fs_platform_info { int rx_ring, tx_ring; /* number of buffers on rx */ __u8 macaddr[ETH_ALEN]; /* mac address */ int rx_copybreak; /* limit we copy small frames */ - int use_napi; /* use NAPI */ int napi_weight; /* NAPI weight */ int use_rmii; /* use RMII mode */ |