Skip to content

remove copies of the NAPI_POLL_WEIGHT define

Jakub Kicinski linux-arm-kernel linux-mediatek linux-omap linux-s390 linux-usb linuxppc-dev netdev xen-devel 2 versions – Applied

Status from this message: This series was applied to netdev/net-next.git (master)

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest15 patches 3 repliesApplied 15/15
  2. v114 patches 10 repliesSuperseded

Changes in v2 from the cover letter

- drop staging bits (patch 2)
- fix subject (patch 8)
- add qeth change (patch 15)

Patches in v2 All 15 applied

#Subject and filesSizeRepliesApplied
1/15eth: remove copies of the NAPI_POLL_WEIGHT definedrivers/net/ethernet/cortina/gemini.c drivers/net/ethernet/marvell/skge.c drivers/net/ethernet/marvell/sky2.c +4 more+8 -161 replyApplied
2/15eth: smsc: remove a copy of the NAPI_POLL_WEIGHT definedrivers/net/ethernet/smsc/smsc9420.c drivers/net/ethernet/smsc/smsc9420.h+1 -20 repliesApplied
3/15eth: cpsw: remove a copy of the NAPI_POLL_WEIGHT definedrivers/net/ethernet/ti/cpsw.c drivers/net/ethernet/ti/cpsw_new.c drivers/net/ethernet/ti/cpsw_priv.c +1 more+10 -110 repliesApplied
4/15eth: pch_gbe: remove a copy of the NAPI_POLL_WEIGHT definedrivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c+5 -70 repliesApplied
5/15eth: mtk_eth_soc: remove a copy of the NAPI_POLL_WEIGHT definedrivers/net/ethernet/mediatek/mtk_eth_soc.c drivers/net/ethernet/mediatek/mtk_eth_soc.h+2 -30 repliesApplied
6/15usb: lan78xx: remove a copy of the NAPI_POLL_WEIGHT definedrivers/net/usb/lan78xx.c+1 -30 repliesApplied
7/15slic: remove a copy of the NAPI_POLL_WEIGHT definedrivers/net/ethernet/alacritech/slic.h drivers/net/ethernet/alacritech/slicoss.c+1 -31 replyApplied
8/15net: bgmac: remove a copy of the NAPI_POLL_WEIGHT definedrivers/net/ethernet/broadcom/bgmac.c drivers/net/ethernet/broadcom/bgmac.h+1 -30 repliesApplied
9/15eth: atlantic: remove a copy of the NAPI_POLL_WEIGHT definedrivers/net/ethernet/aquantia/atlantic/aq_cfg.h drivers/net/ethernet/aquantia/atlantic/aq_ptp.c drivers/net/ethernet/aquantia/atlantic/aq_vec.c+2 -40 repliesApplied
10/15eth: benet: remove a copy of the NAPI_POLL_WEIGHT definedrivers/net/ethernet/emulex/benet/be.h drivers/net/ethernet/emulex/benet/be_main.c+2 -30 repliesApplied
11/15eth: gfar: remove a copy of the NAPI_POLL_WEIGHT definedrivers/net/ethernet/freescale/gianfar.c drivers/net/ethernet/freescale/gianfar.h+1 -40 repliesApplied
12/15eth: vxge: remove a copy of the NAPI_POLL_WEIGHT definedrivers/net/ethernet/neterion/vxge/vxge-main.c drivers/net/ethernet/neterion/vxge/vxge-main.h+1 -30 repliesApplied
13/15eth: spider: remove a copy of the NAPI_POLL_WEIGHT definedrivers/net/ethernet/toshiba/spider_net.c drivers/net/ethernet/toshiba/spider_net.h+1 -20 repliesApplied
14/15eth: velocity: remove a copy of the NAPI_POLL_WEIGHT definedrivers/net/ethernet/via/via-velocity.c drivers/net/ethernet/via/via-velocity.h+1 -30 repliesApplied
15/15qeth: remove a copy of the NAPI_POLL_WEIGHT definedrivers/s390/net/qeth_core.h drivers/s390/net/qeth_core_main.c drivers/s390/net/qeth_l2_main.c +1 more+3 -51 replyApplied

Reviews trailers per patch

6 of 15 patches have a Reviewed-by or Acked-by.

PatchAndy ShevchenkoFlorian FainelliGeoff LevandLino SanfilippoAlexandra WinterPaul Durrant
1/15R-b
2/15
3/15
4/15R-b
5/15
6/15
7/15A-b
8/15R-b
9/15
10/15
11/15
12/15
13/15A-b
14/15
15/15A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 6 reviewers.

Read the v2 thread

Cover letter [PATCH net-next v2 00/15] remove copies of the NAPI_POLL_WEIGHT define

netif_napi_add() takes weight as the last argument. The value of that parameter is hard to come up with and depends on many factors, so driver authors are encouraged to use NAPI_POLL_WEIGHT.

We should probably move weight to an "advanced" version of the API (__netif_napi_add()?) and simplify the life of most driver authors.

In preparation for such API changes this series removes local defines equivalent to NAPI_POLL_WEIGHT from drivers, so that a simple coccinelle / spatch script does not get thrown off by them.

v2:
- drop staging bits (patch 2)
- fix subject (patch 8)
- add qeth change (patch 15)

Jakub Kicinski (15):
eth: remove copies of the NAPI_POLL_WEIGHT define
eth: smsc: remove a copy of the NAPI_POLL_WEIGHT define
eth: cpsw: remove a copy of the NAPI_POLL_WEIGHT define
eth: pch_gbe: remove a copy of the NAPI_POLL_WEIGHT define
eth: mtk_eth_soc: remove a copy of the NAPI_POLL_WEIGHT define
usb: lan78xx: remove a copy of the NAPI_POLL_WEIGHT define
slic: remove a copy of the NAPI_POLL_WEIGHT define
net: bgmac: remove a copy of the NAPI_POLL_WEIGHT define
eth: atlantic: remove a copy of the NAPI_POLL_WEIGHT define
eth: benet: remove a copy of the NAPI_POLL_WEIGHT define
eth: gfar: remove a copy of the NAPI_POLL_WEIGHT define
eth: vxge: remove a copy of the NAPI_POLL_WEIGHT define
eth: spider: remove a copy of the NAPI_POLL_WEIGHT define
eth: velocity: remove a copy of the NAPI_POLL_WEIGHT define
qeth: remove a copy of the NAPI_POLL_WEIGHT define

 drivers/net/ethernet/alacritech/slic.h               |  2 --
 drivers/net/ethernet/alacritech/slicoss.c            |  2 +-
 drivers/net/ethernet/aquantia/atlantic/aq_cfg.h      |  2 --
 drivers/net/ethernet/aquantia/atlantic/aq_ptp.c      |  2 +-
 drivers/net/ethernet/aquantia/atlantic/aq_vec.c      |  2 +-
 drivers/net/ethernet/broadcom/bgmac.c                |  2 +-
 drivers/net/ethernet/broadcom/bgmac.h                |  2 --
 drivers/net/ethernet/cortina/gemini.c                |  4 +---
 drivers/net/ethernet/emulex/benet/be.h               |  3 +--
 drivers/net/ethernet/emulex/benet/be_main.c          |  2 +-
 drivers/net/ethernet/freescale/gianfar.c             |  2 +-
 drivers/net/ethernet/freescale/gianfar.h             |  3 ---
 drivers/net/ethernet/marvell/skge.c                  |  3 +--
 drivers/net/ethernet/marvell/sky2.c                  |  3 +--
 drivers/net/ethernet/mediatek/mtk_eth_soc.c          |  4 ++--
 drivers/net/ethernet/mediatek/mtk_eth_soc.h          |  1 -
 drivers/net/ethernet/mediatek/mtk_star_emac.c        |  3 +--
 drivers/net/ethernet/neterion/vxge/vxge-main.c       |  2 +-
 drivers/net/ethernet/neterion/vxge/vxge-main.h       |  2 --
 drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 12 +++++-------
 drivers/net/ethernet/smsc/smsc9420.c                 |  2 +-
 drivers/net/ethernet/smsc/smsc9420.h                 |  1 -
 drivers/net/ethernet/ti/cpsw.c                       |  4 ++--
 drivers/net/ethernet/ti/cpsw_new.c                   |  4 ++--
 drivers/net/ethernet/ti/cpsw_priv.c                  | 12 ++++++------
 drivers/net/ethernet/ti/cpsw_priv.h                  |  1 -
 drivers/net/ethernet/ti/davinci_emac.c               |  3 +--
 drivers/net/ethernet/ti/netcp_core.c                 |  5 ++---
 drivers/net/ethernet/toshiba/spider_net.c            |  2 +-
 drivers/net/ethernet/toshiba/spider_net.h            |  1 -
 drivers/net/ethernet/via/via-velocity.c              |  3 +--
 drivers/net/ethernet/via/via-velocity.h              |  1 -
 drivers/net/usb/lan78xx.c                            |  4 +---
 drivers/net/xen-netback/interface.c                  |  3 +--
 drivers/s390/net/qeth_core.h                         |  2 --
 drivers/s390/net/qeth_core_main.c                    |  2 +-
 drivers/s390/net/qeth_l2_main.c                      |  2 +-
 drivers/s390/net/qeth_l3_main.c                      |  2 +-
 38 files changed, 40 insertions(+), 72 deletions(-)
Signature · 1 line
2.34.1