| Message ID | 20210211121239.728-7-zajec5@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e3948811720341f99cd5cb4a8a650473400ec4f8 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | bcm4908_enet: post-review fixes | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | success | CCed 5 of 5 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 1 this patch: 1 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 34 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 1 this patch: 1 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
On 2/11/21 4:12 AM, Rafał Miłecki wrote: > From: Rafał Miłecki <rafal@milecki.pl> > > 1. Fix "ensable" typo noticed by Andrew > 2. Fix chipset name in the struct net_device_ops variable > > Suggested-by: Andrew Lunn <andrew@lunn.ch> > Signed-off-by: Rafał Miłecki <rafal@milecki.pl> > Reviewed-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
diff --git a/drivers/net/ethernet/broadcom/bcm4908_enet.c b/drivers/net/ethernet/broadcom/bcm4908_enet.c index 7d619aa9410a..47c1b7d827c5 100644 --- a/drivers/net/ethernet/broadcom/bcm4908_enet.c +++ b/drivers/net/ethernet/broadcom/bcm4908_enet.c @@ -328,8 +328,8 @@ static int bcm4908_enet_dma_init(struct bcm4908_enet *enet) return 0; } -static void bcm4908_enet_dma_tx_ring_ensable(struct bcm4908_enet *enet, - struct bcm4908_enet_dma_ring *ring) +static void bcm4908_enet_dma_tx_ring_enable(struct bcm4908_enet *enet, + struct bcm4908_enet_dma_ring *ring) { enet_write(enet, ring->cfg_block + ENET_DMA_CH_CFG, ENET_DMA_CH_CFG_ENABLE); } @@ -519,7 +519,7 @@ static int bcm4908_enet_start_xmit(struct sk_buff *skb, struct net_device *netde buf_desc->addr = cpu_to_le32((uint32_t)slot->dma_addr); buf_desc->ctl = cpu_to_le32(tmp); - bcm4908_enet_dma_tx_ring_ensable(enet, &enet->tx_ring); + bcm4908_enet_dma_tx_ring_enable(enet, &enet->tx_ring); if (++ring->write_idx == ring->length - 1) ring->write_idx = 0; @@ -583,7 +583,7 @@ static int bcm4908_enet_poll(struct napi_struct *napi, int weight) return handled; } -static const struct net_device_ops bcm96xx_netdev_ops = { +static const struct net_device_ops bcm4908_enet_netdev_ops = { .ndo_open = bcm4908_enet_open, .ndo_stop = bcm4908_enet_stop, .ndo_start_xmit = bcm4908_enet_start_xmit, @@ -623,7 +623,7 @@ static int bcm4908_enet_probe(struct platform_device *pdev) SET_NETDEV_DEV(netdev, &pdev->dev); eth_hw_addr_random(netdev); - netdev->netdev_ops = &bcm96xx_netdev_ops; + netdev->netdev_ops = &bcm4908_enet_netdev_ops; netdev->min_mtu = ETH_ZLEN; netdev->mtu = ENET_MTU_MAX; netdev->max_mtu = ENET_MTU_MAX;