Skip to content

Commit f315296

Browse files
committed
Merge tag 'net-6.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Pull networking fixes from Paolo Abeni: "Including fixes from bluetooth and wireless. Current release - new code bugs: - wifi: nl80211: disable multi-link reconfiguration Previous releases - regressions: - gso: fix ownership in __udp_gso_segment - wifi: iwlwifi: - fix A-MSDU TSO preparation - free pages allocated when failing to build A-MSDU - ipv6: fix dst ref loop in ila lwtunnel - mptcp: fix 'scheduling while atomic' in mptcp_pm_nl_append_new_local_addr - bluetooth: add check for mgmt_alloc_skb() in mgmt_device_connected() - ethtool: allow NULL nlattrs when getting a phy_device - eth: be2net: fix sleeping while atomic bugs in be_ndo_bridge_getlink Previous releases - always broken: - core: support TCP GSO case for a few missing flags - wifi: mac80211: - fix vendor-specific inheritance - cleanup sta TXQs on flush - llc: do not use skb_get() before dev_queue_xmit() - eth: ipa: nable checksum for IPA_ENDPOINT_AP_MODEM_{RX,TX} for v4.7" * tag 'net-6.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (41 commits) net: ipv6: fix missing dst ref drop in ila lwtunnel net: ipv6: fix dst ref loop in ila lwtunnel mctp i3c: handle NULL header address net: dsa: mt7530: Fix traffic flooding for MMIO devices net-timestamp: support TCP GSO case for a few missing flags vlan: enforce underlying device type mptcp: fix 'scheduling while atomic' in mptcp_pm_nl_append_new_local_addr net: ethtool: netlink: Allow NULL nlattrs when getting a phy_device ppp: Fix KMSAN uninit-value warning with bpf net: ipa: Enable checksum for IPA_ENDPOINT_AP_MODEM_{RX,TX} for v4.7 net: ipa: Fix QSB data for v4.7 net: ipa: Fix v4.7 resource group names net: hns3: make sure ptp clock is unregister and freed if hclge_ptp_get_cycle returns an error wifi: nl80211: disable multi-link reconfiguration net: dsa: rtl8366rb: don't prompt users for LED control be2net: fix sleeping while atomic bugs in be_ndo_bridge_getlink llc: do not use skb_get() before dev_queue_xmit() wifi: cfg80211: regulatory: improve invalid hints checking caif_virtio: fix wrong pointer check in cfv_probe() net: gso: fix ownership in __udp_gso_segment ...
2 parents 1238f0a + 5da15a9 commit f315296

File tree

47 files changed

+499
-316
lines changed

Some content is hidden

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

47 files changed

+499
-316
lines changed

.mailmap

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ Antonio Quartulli <antonio@mandelbit.com> <antonio@open-mesh.com>
8888
Antonio Quartulli <antonio@mandelbit.com> <antonio.quartulli@open-mesh.com>
8989
Antonio Quartulli <antonio@mandelbit.com> <ordex@autistici.org>
9090
Antonio Quartulli <antonio@mandelbit.com> <ordex@ritirata.org>
91-
Antonio Quartulli <antonio@mandelbit.com> <antonio@openvpn.net>
9291
Antonio Quartulli <antonio@mandelbit.com> <a@unstable.cc>
9392
Anup Patel <anup@brainfault.org> <anup.patel@wdc.com>
9493
Archit Taneja <archit@ti.com>

drivers/bluetooth/btusb.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3644,6 +3644,7 @@ static ssize_t force_poll_sync_write(struct file *file,
36443644
}
36453645

36463646
static const struct file_operations force_poll_sync_fops = {
3647+
.owner = THIS_MODULE,
36473648
.open = simple_open,
36483649
.read = force_poll_sync_read,
36493650
.write = force_poll_sync_write,

drivers/net/caif/caif_virtio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@ static int cfv_probe(struct virtio_device *vdev)
745745

746746
if (cfv->vr_rx)
747747
vdev->vringh_config->del_vrhs(cfv->vdev);
748-
if (cfv->vdev)
748+
if (cfv->vq_tx)
749749
vdev->config->del_vqs(cfv->vdev);
750750
free_netdev(netdev);
751751
return err;

drivers/net/dsa/mt7530.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2591,7 +2591,8 @@ mt7531_setup_common(struct dsa_switch *ds)
25912591
if (ret < 0)
25922592
return ret;
25932593

2594-
return 0;
2594+
/* Setup VLAN ID 0 for VLAN-unaware bridges */
2595+
return mt7530_setup_vlan0(priv);
25952596
}
25962597

25972598
static int
@@ -2687,11 +2688,6 @@ mt7531_setup(struct dsa_switch *ds)
26872688
if (ret)
26882689
return ret;
26892690

2690-
/* Setup VLAN ID 0 for VLAN-unaware bridges */
2691-
ret = mt7530_setup_vlan0(priv);
2692-
if (ret)
2693-
return ret;
2694-
26952691
ds->assisted_learning_on_cpu_port = true;
26962692
ds->mtu_enforcement_ingress = true;
26972693

drivers/net/dsa/realtek/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ config NET_DSA_REALTEK_RTL8366RB
4444
Select to enable support for Realtek RTL8366RB.
4545

4646
config NET_DSA_REALTEK_RTL8366RB_LEDS
47-
bool "Support RTL8366RB LED control"
47+
bool
4848
depends on (LEDS_CLASS=y || LEDS_CLASS=NET_DSA_REALTEK_RTL8366RB)
4949
depends on NET_DSA_REALTEK_RTL8366RB
5050
default NET_DSA_REALTEK_RTL8366RB

drivers/net/ethernet/emulex/benet/be.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ struct be_adapter {
562562
struct be_dma_mem mbox_mem_alloced;
563563

564564
struct be_mcc_obj mcc_obj;
565-
struct mutex mcc_lock; /* For serializing mcc cmds to BE card */
565+
spinlock_t mcc_lock; /* For serializing mcc cmds to BE card */
566566
spinlock_t mcc_cq_lock;
567567

568568
u16 cfg_num_rx_irqs; /* configured via set-channels */

0 commit comments

Comments
 (0)