Skip to content

Commit b6df007

Browse files
kuba-mookuba-moo
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in net/netfilter/nf_tables_api.c. Duplicate fix in tools/testing/selftests/net/devlink_port_split.py - take the net-next version. skmsg, and L4 bpf - keep the bpf code but remove the flags and err params. Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2 parents 3f8ad50 + a118ff6 commit b6df007

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+707
-390
lines changed

‎MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12675,6 +12675,7 @@ W: http://www.netfilter.org/
1267512675
W: http://www.iptables.org/
1267612676
W: http://www.nftables.org/
1267712677
Q: http://patchwork.ozlabs.org/project/netfilter-devel/list/
12678+
C: irc://irc.libera.chat/netfilter
1267812679
T: git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
1267912680
T: git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git
1268012681
F: include/linux/netfilter*

‎drivers/atm/nicstar.c

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,15 @@ static int ns_init_card(int i, struct pci_dev *pcidev)
527527
/* Set the VPI/VCI MSb mask to zero so we can receive OAM cells */
528528
writel(0x00000000, card->membase + VPM);
529529

530+
card->intcnt = 0;
531+
if (request_irq
532+
(pcidev->irq, &ns_irq_handler, IRQF_SHARED, "nicstar", card) != 0) {
533+
pr_err("nicstar%d: can't allocate IRQ %d.\n", i, pcidev->irq);
534+
error = 9;
535+
ns_init_card_error(card, error);
536+
return error;
537+
}
538+
530539
/* Initialize TSQ */
531540
card->tsq.org = dma_alloc_coherent(&card->pcidev->dev,
532541
NS_TSQSIZE + NS_TSQ_ALIGNMENT,
@@ -753,15 +762,6 @@ static int ns_init_card(int i, struct pci_dev *pcidev)
753762

754763
card->efbie = 1;
755764

756-
card->intcnt = 0;
757-
if (request_irq
758-
(pcidev->irq, &ns_irq_handler, IRQF_SHARED, "nicstar", card) != 0) {
759-
printk("nicstar%d: can't allocate IRQ %d.\n", i, pcidev->irq);
760-
error = 9;
761-
ns_init_card_error(card, error);
762-
return error;
763-
}
764-
765765
/* Register device */
766766
card->atmdev = atm_dev_register("nicstar", &card->pcidev->dev, &atm_ops,
767767
-1, NULL);
@@ -839,10 +839,12 @@ static void ns_init_card_error(ns_dev *card, int error)
839839
dev_kfree_skb_any(hb);
840840
}
841841
if (error >= 12) {
842-
kfree(card->rsq.org);
842+
dma_free_coherent(&card->pcidev->dev, NS_RSQSIZE + NS_RSQ_ALIGNMENT,
843+
card->rsq.org, card->rsq.dma);
843844
}
844845
if (error >= 11) {
845-
kfree(card->tsq.org);
846+
dma_free_coherent(&card->pcidev->dev, NS_TSQSIZE + NS_TSQ_ALIGNMENT,
847+
card->tsq.org, card->tsq.dma);
846848
}
847849
if (error >= 10) {
848850
free_irq(card->pcidev->irq, card);

‎drivers/net/bonding/bond_main.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1600,6 +1600,14 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,
16001600
int link_reporting;
16011601
int res = 0, i;
16021602

1603+
if (slave_dev->flags & IFF_MASTER &&
1604+
!netif_is_bond_master(slave_dev)) {
1605+
NL_SET_ERR_MSG(extack, "Device with IFF_MASTER cannot be enslaved");
1606+
netdev_err(bond_dev,
1607+
"Error: Device with IFF_MASTER cannot be enslaved\n");
1608+
return -EPERM;
1609+
}
1610+
16031611
if (!bond->params.use_carrier &&
16041612
slave_dev->ethtool_ops->get_link == NULL &&
16051613
slave_ops->ndo_do_ioctl == NULL) {

‎drivers/net/can/peak_canfd/peak_canfd.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,8 +351,8 @@ static int pucan_handle_status(struct peak_canfd_priv *priv,
351351
return err;
352352
}
353353

354-
/* start network queue (echo_skb array is empty) */
355-
netif_start_queue(ndev);
354+
/* wake network queue up (echo_skb array is empty) */
355+
netif_wake_queue(ndev);
356356

357357
return 0;
358358
}

‎drivers/net/can/usb/ems_usb.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1053,14 +1053,15 @@ static void ems_usb_disconnect(struct usb_interface *intf)
10531053

10541054
if (dev) {
10551055
unregister_netdev(dev->netdev);
1056-
free_candev(dev->netdev);
10571056

10581057
unlink_all_urbs(dev);
10591058

10601059
usb_free_urb(dev->intr_urb);
10611060

10621061
kfree(dev->intr_in_buffer);
10631062
kfree(dev->tx_msg_buffer);
1063+
1064+
free_candev(dev->netdev);
10641065
}
10651066
}
10661067

‎drivers/net/dsa/mv88e6xxx/chip.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1618,9 +1618,6 @@ static int mv88e6xxx_port_check_hw_vlan(struct dsa_switch *ds, int port,
16181618
struct mv88e6xxx_vtu_entry vlan;
16191619
int i, err;
16201620

1621-
if (!vid)
1622-
return -EOPNOTSUPP;
1623-
16241621
/* DSA and CPU ports have to be members of multiple vlans */
16251622
if (dsa_is_dsa_port(ds, port) || dsa_is_cpu_port(ds, port))
16261623
return 0;
@@ -2109,6 +2106,9 @@ static int mv88e6xxx_port_vlan_add(struct dsa_switch *ds, int port,
21092106
u8 member;
21102107
int err;
21112108

2109+
if (!vlan->vid)
2110+
return 0;
2111+
21122112
err = mv88e6xxx_port_vlan_prepare(ds, port, vlan);
21132113
if (err)
21142114
return err;

‎drivers/net/dsa/sja1105/sja1105_main.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1818,6 +1818,12 @@ static int sja1105_reload_cbs(struct sja1105_private *priv)
18181818
{
18191819
int rc = 0, i;
18201820

1821+
/* The credit based shapers are only allocated if
1822+
* CONFIG_NET_SCH_CBS is enabled.
1823+
*/
1824+
if (!priv->cbs)
1825+
return 0;
1826+
18211827
for (i = 0; i < priv->info->num_cbs_shapers; i++) {
18221828
struct sja1105_cbs_entry *cbs = &priv->cbs[i];
18231829

‎drivers/net/ethernet/aeroflex/greth.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1539,10 +1539,11 @@ static int greth_of_remove(struct platform_device *of_dev)
15391539
mdiobus_unregister(greth->mdio);
15401540

15411541
unregister_netdev(ndev);
1542-
free_netdev(ndev);
15431542

15441543
of_iounmap(&of_dev->resource[0], greth->regs, resource_size(&of_dev->resource[0]));
15451544

1545+
free_netdev(ndev);
1546+
15461547
return 0;
15471548
}
15481549

‎drivers/net/ethernet/aquantia/atlantic/aq_macsec.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ struct aq_macsec_txsc {
9191
u32 hw_sc_idx;
9292
unsigned long tx_sa_idx_busy;
9393
const struct macsec_secy *sw_secy;
94-
u8 tx_sa_key[MACSEC_NUM_AN][MACSEC_KEYID_LEN];
94+
u8 tx_sa_key[MACSEC_NUM_AN][MACSEC_MAX_KEY_LEN];
9595
struct aq_macsec_tx_sc_stats stats;
9696
struct aq_macsec_tx_sa_stats tx_sa_stats[MACSEC_NUM_AN];
9797
};
@@ -101,7 +101,7 @@ struct aq_macsec_rxsc {
101101
unsigned long rx_sa_idx_busy;
102102
const struct macsec_secy *sw_secy;
103103
const struct macsec_rx_sc *sw_rxsc;
104-
u8 rx_sa_key[MACSEC_NUM_AN][MACSEC_KEYID_LEN];
104+
u8 rx_sa_key[MACSEC_NUM_AN][MACSEC_MAX_KEY_LEN];
105105
struct aq_macsec_rx_sa_stats rx_sa_stats[MACSEC_NUM_AN];
106106
};
107107

‎drivers/net/ethernet/broadcom/bcm4908_enet.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,6 @@ static int bcm4908_dma_alloc_buf_descs(struct bcm4908_enet *enet,
174174
if (!ring->slots)
175175
goto err_free_buf_descs;
176176

177-
ring->read_idx = 0;
178-
ring->write_idx = 0;
179-
180177
return 0;
181178

182179
err_free_buf_descs:
@@ -304,6 +301,9 @@ static void bcm4908_enet_dma_ring_init(struct bcm4908_enet *enet,
304301

305302
enet_write(enet, ring->st_ram_block + ENET_DMA_CH_STATE_RAM_BASE_DESC_PTR,
306303
(uint32_t)ring->dma_addr);
304+
305+
ring->read_idx = 0;
306+
ring->write_idx = 0;
307307
}
308308

309309
static void bcm4908_enet_dma_uninit(struct bcm4908_enet *enet)

‎drivers/net/ethernet/emulex/benet/be_cmds.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ int be_process_mcc(struct be_adapter *adapter)
550550
int num = 0, status = 0;
551551
struct be_mcc_obj *mcc_obj = &adapter->mcc_obj;
552552

553-
spin_lock_bh(&adapter->mcc_cq_lock);
553+
spin_lock(&adapter->mcc_cq_lock);
554554

555555
while ((compl = be_mcc_compl_get(adapter))) {
556556
if (compl->flags & CQE_FLAGS_ASYNC_MASK) {
@@ -566,7 +566,7 @@ int be_process_mcc(struct be_adapter *adapter)
566566
if (num)
567567
be_cq_notify(adapter, mcc_obj->cq.id, mcc_obj->rearm_cq, num);
568568

569-
spin_unlock_bh(&adapter->mcc_cq_lock);
569+
spin_unlock(&adapter->mcc_cq_lock);
570570
return status;
571571
}
572572

@@ -581,7 +581,9 @@ static int be_mcc_wait_compl(struct be_adapter *adapter)
581581
if (be_check_error(adapter, BE_ERROR_ANY))
582582
return -EIO;
583583

584+
local_bh_disable();
584585
status = be_process_mcc(adapter);
586+
local_bh_enable();
585587

586588
if (atomic_read(&mcc_obj->q.used) == 0)
587589
break;

‎drivers/net/ethernet/emulex/benet/be_main.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5501,7 +5501,9 @@ static void be_worker(struct work_struct *work)
55015501
* mcc completions
55025502
*/
55035503
if (!netif_running(adapter->netdev)) {
5504+
local_bh_disable();
55045505
be_process_mcc(adapter);
5506+
local_bh_enable();
55055507
goto reschedule;
55065508
}
55075509

‎drivers/net/ethernet/ezchip/nps_enet.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ static s32 nps_enet_probe(struct platform_device *pdev)
607607

608608
/* Get IRQ number */
609609
priv->irq = platform_get_irq(pdev, 0);
610-
if (!priv->irq) {
610+
if (priv->irq < 0) {
611611
dev_err(dev, "failed to retrieve <irq Rx-Tx> value from device tree\n");
612612
err = -ENODEV;
613613
goto out_netdev;
@@ -630,8 +630,7 @@ static s32 nps_enet_probe(struct platform_device *pdev)
630630
out_netif_api:
631631
netif_napi_del(&priv->napi);
632632
out_netdev:
633-
if (err)
634-
free_netdev(ndev);
633+
free_netdev(ndev);
635634

636635
return err;
637636
}
@@ -642,8 +641,8 @@ static s32 nps_enet_remove(struct platform_device *pdev)
642641
struct nps_enet_priv *priv = netdev_priv(ndev);
643642

644643
unregister_netdev(ndev);
645-
free_netdev(ndev);
646644
netif_napi_del(&priv->napi);
645+
free_netdev(ndev);
647646

648647
return 0;
649648
}

‎drivers/net/ethernet/google/gve/gve_main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1506,8 +1506,8 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
15061506

15071507
gve_write_version(&reg_bar->driver_version);
15081508
/* Get max queues to alloc etherdev */
1509-
max_rx_queues = ioread32be(&reg_bar->max_tx_queues);
1510-
max_tx_queues = ioread32be(&reg_bar->max_rx_queues);
1509+
max_tx_queues = ioread32be(&reg_bar->max_tx_queues);
1510+
max_rx_queues = ioread32be(&reg_bar->max_rx_queues);
15111511
/* Alloc and setup the netdev and priv */
15121512
dev = alloc_etherdev_mqs(sizeof(*priv), max_tx_queues, max_rx_queues);
15131513
if (!dev) {

0 commit comments

Comments
 (0)