forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'net-6.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/…
…git/netdev/net Pull networking fixes from Paolo Abeni: "Including fixes from bluetooth and netfilter. Current release - regressions: - net: several zerocopy flags fixes - netfilter: fix possible memory leak in nf_nat_init() - openvswitch: add missing .resv_start_op Previous releases - regressions: - neigh: fix null-ptr-deref in neigh_table_clear() - sched: fix use after free in red_enqueue() - dsa: fall back to default tagger if we can't load the one from DT - bluetooth: fix use-after-free in l2cap_conn_del() Previous releases - always broken: - netfilter: netlink notifier might race to release objects - nfc: fix potential memory leak of skb - bluetooth: fix use-after-free caused by l2cap_reassemble_sdu - bluetooth: use skb_put to set length - eth: tun: fix bugs for oversize packet when napi frags enabled - eth: lan966x: fixes for when MTU is changed - eth: dwmac-loongson: fix invalid mdio_node" * tag 'net-6.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (53 commits) vsock: fix possible infinite sleep in vsock_connectible_wait_data() vsock: remove the unused 'wait' in vsock_connectible_recvmsg() ipv6: fix WARNING in ip6_route_net_exit_late() bridge: Fix flushing of dynamic FDB entries net, neigh: Fix null-ptr-deref in neigh_table_clear() net/smc: Fix possible leaked pernet namespace in smc_init() stmmac: dwmac-loongson: fix invalid mdio_node ibmvnic: Free rwi on reset success net: mdio: fix undefined behavior in bit shift for __mdiobus_register Bluetooth: L2CAP: Fix attempting to access uninitialized memory Bluetooth: L2CAP: Fix l2cap_global_chan_by_psm Bluetooth: L2CAP: Fix accepting connection request for invalid SPSM Bluetooth: hci_conn: Fix not restoring ISO buffer count on disconnect Bluetooth: L2CAP: Fix memory leak in vhci_write Bluetooth: L2CAP: fix use-after-free in l2cap_conn_del() Bluetooth: virtio_bt: Use skb_put to set length Bluetooth: hci_conn: Fix CIS connection dst_type handling Bluetooth: L2CAP: Fix use-after-free caused by l2cap_reassemble_sdu netfilter: ipset: enforce documented limit to prevent allocating huge memory isdn: mISDN: netjet: fix wrong check of device registration ...
- Loading branch information
Showing
50 changed files
with
401 additions
and
190 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5041,7 +5041,7 @@ F: drivers/scsi/snic/ | |
|
||
CISCO VIC ETHERNET NIC DRIVER | ||
M: Christian Benvenuti <[email protected]> | ||
M: Govindarajulu Varadarajan <_govind@gmx.com> | ||
M: Satish Kharat <satishkh@cisco.com> | ||
S: Supported | ||
F: drivers/net/ethernet/cisco/enic/ | ||
|
||
|
@@ -9778,7 +9778,10 @@ S: Supported | |
F: drivers/pci/hotplug/rpaphp* | ||
|
||
IBM Power SRIOV Virtual NIC Device Driver | ||
M: Dany Madden <[email protected]> | ||
M: Haren Myneni <[email protected]> | ||
M: Rick Lindsley <[email protected]> | ||
R: Nick Child <[email protected]> | ||
R: Dany Madden <[email protected]> | ||
R: Thomas Falcon <[email protected]> | ||
L: [email protected] | ||
S: Supported | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1512,16 +1512,15 @@ static struct notifier_block adin1110_switchdev_notifier = { | |
.notifier_call = adin1110_switchdev_event, | ||
}; | ||
|
||
static void adin1110_unregister_notifiers(void *data) | ||
static void adin1110_unregister_notifiers(void) | ||
{ | ||
unregister_switchdev_blocking_notifier(&adin1110_switchdev_blocking_notifier); | ||
unregister_switchdev_notifier(&adin1110_switchdev_notifier); | ||
unregister_netdevice_notifier(&adin1110_netdevice_nb); | ||
} | ||
|
||
static int adin1110_setup_notifiers(struct adin1110_priv *priv) | ||
static int adin1110_setup_notifiers(void) | ||
{ | ||
struct device *dev = &priv->spidev->dev; | ||
int ret; | ||
|
||
ret = register_netdevice_notifier(&adin1110_netdevice_nb); | ||
|
@@ -1536,13 +1535,14 @@ static int adin1110_setup_notifiers(struct adin1110_priv *priv) | |
if (ret < 0) | ||
goto err_sdev; | ||
|
||
return devm_add_action_or_reset(dev, adin1110_unregister_notifiers, NULL); | ||
return 0; | ||
|
||
err_sdev: | ||
unregister_switchdev_notifier(&adin1110_switchdev_notifier); | ||
|
||
err_netdev: | ||
unregister_netdevice_notifier(&adin1110_netdevice_nb); | ||
|
||
return ret; | ||
} | ||
|
||
|
@@ -1613,10 +1613,6 @@ static int adin1110_probe_netdevs(struct adin1110_priv *priv) | |
if (ret < 0) | ||
return ret; | ||
|
||
ret = adin1110_setup_notifiers(priv); | ||
if (ret < 0) | ||
return ret; | ||
|
||
for (i = 0; i < priv->cfg->ports_nr; i++) { | ||
ret = devm_register_netdev(dev, priv->ports[i]->netdev); | ||
if (ret < 0) { | ||
|
@@ -1693,7 +1689,31 @@ static struct spi_driver adin1110_driver = { | |
.probe = adin1110_probe, | ||
.id_table = adin1110_spi_id, | ||
}; | ||
module_spi_driver(adin1110_driver); | ||
|
||
static int __init adin1110_driver_init(void) | ||
{ | ||
int ret; | ||
|
||
ret = adin1110_setup_notifiers(); | ||
if (ret < 0) | ||
return ret; | ||
|
||
ret = spi_register_driver(&adin1110_driver); | ||
if (ret < 0) { | ||
adin1110_unregister_notifiers(); | ||
return ret; | ||
} | ||
|
||
return 0; | ||
} | ||
|
||
static void __exit adin1110_exit(void) | ||
{ | ||
adin1110_unregister_notifiers(); | ||
spi_unregister_driver(&adin1110_driver); | ||
} | ||
module_init(adin1110_driver_init); | ||
module_exit(adin1110_exit); | ||
|
||
MODULE_DESCRIPTION("ADIN1110 Network driver"); | ||
MODULE_AUTHOR("Alexandru Tachici <[email protected]>"); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.