History

Merge tag 'net-6.15-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Pull networking fixes from Jakub Kicinski: "Including fixes from Bluetooth and wireless. A few more fixes for the locking changes trickling in. Nothing too alarming, I suspect those will continue for another release. Other than that things are slowing down nicely. Current release - fix to a fix: - Bluetooth: hci_event: use key encryption size when its known - tools: ynl-gen: allow multi-attr without nested-attributes again Current release - regressions: - locking fixes: - lock lower level devices when updating features - eth: bnxt_en: bring back rtnl_lock() in the bnxt_open() path - devmem: fix panic when Netlink socket closes after module unload Current release - new code bugs: - eth: txgbe: fixes for FW communication on new AML devices Previous releases - always broken: - sched: flush gso_skb list too during ->change(), avoid potential null-deref on reconfig - wifi: mt76: disable NAPI on driver removal - hv_netvsc: fix error 'nvsp_rndis_pkt_complete error status: 2'" * tag 'net-6.15-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (44 commits) net: devmem: fix kernel panic when netlink socket close after module unload tsnep: fix timestamping with a stacked DSA driver net/tls: fix kernel panic when alloc_page failed bnxt_en: bring back rtnl_lock() in the bnxt_open() path mlxsw: spectrum_router: Fix use-after-free when deleting GRE net devices wifi: mac80211: Set n_channels after allocating struct cfg80211_scan_request octeontx2-pf: Do not reallocate all ntuple filters wifi: mt76: mt7925: fix missing hdr_trans_tlv command for broadcast wtbl wifi: mt76: disable napi on driver removal Drivers: hv: vmbus: Remove vmbus_sendpacket_pagebuffer() hv_netvsc: Remove rmsg_pgcnt hv_netvsc: Preserve contiguous PFN grouping in the page buffer array hv_netvsc: Use vmbus_sendpacket_mpb_desc() to send VMBus messages Drivers: hv: Allow vmbus_sendpacket_mpb_desc() to create multiple ranges octeontx2-af: Fix CGX Receive counters net: ethernet: mtk_eth_soc: fix typo for declaration MT7988 ESW capability net: libwx: Fix FW mailbox unknown command net: libwx: Fix FW mailbox reply timeout net: txgbe: Fix to calculate EEPROM checksum for AML devices octeontx2-pf: macsec: Fix incorrect max transmit size in TX secy ...

Linus Torvalds committed 1 year ago

Commit ef935652 parents 088d132 0afc44d64 files · +698 −361Browse files

Showing the changes to include (4 of 64 files). Show all

Unified · Split

4 files
  1. include/linux/hyperv.h +0 −7
  2. include/linux/micrel_phy.h +0 −1
  3. include/net/bluetooth/hci_core.h +1 −0
  4. include/net/sch_generic.h +15 −0
include/linux/hyperv.h+0−7
@@ -1167,13 +1167,6 @@ extern int vmbus_sendpacket(struct vmbus_channel *channel, · 1166 unmodified lines
1167 enum vmbus_packet_type type,1167 enum vmbus_packet_type type,
1168 u32 flags);1168 u32 flags);
1169 1169
1170extern int vmbus_sendpacket_pagebuffer(struct vmbus_channel *channel,
1171 struct hv_page_buffer pagebuffers[],
1172 u32 pagecount,
1173 void *buffer,
1174 u32 bufferlen,
1175 u64 requestid);
1176
1177extern int vmbus_sendpacket_mpb_desc(struct vmbus_channel *channel,1170extern int vmbus_sendpacket_mpb_desc(struct vmbus_channel *channel,
1178 struct vmbus_packet_mpb_array *mpb,1171 struct vmbus_packet_mpb_array *mpb,
1179 u32 desc_size,1172 u32 desc_size,
include/linux/micrel_phy.h+0−1
@@ -44,7 +44,6 @@ · 43 unmodified lines
44#define MICREL_PHY_50MHZ_CLK BIT(0)44#define MICREL_PHY_50MHZ_CLK BIT(0)
45#define MICREL_PHY_FXEN BIT(1)45#define MICREL_PHY_FXEN BIT(1)
46#define MICREL_KSZ8_P1_ERRATA BIT(2)46#define MICREL_KSZ8_P1_ERRATA BIT(2)
47#define MICREL_NO_EEE BIT(3)
48 47
49#define MICREL_KSZ9021_EXTREG_CTRL 0xB48#define MICREL_KSZ9021_EXTREG_CTRL 0xB
50#define MICREL_KSZ9021_EXTREG_DATA_WRITE 0xC49#define MICREL_KSZ9021_EXTREG_DATA_WRITE 0xC
include/net/bluetooth/hci_core.h+1−0
@@ -1798,6 +1798,7 @@ struct hci_conn_params *hci_pend_le_action_lookup(struct list_head *list, · 1797 unmodified lines
1798void hci_uuids_clear(struct hci_dev *hdev);1798void hci_uuids_clear(struct hci_dev *hdev);
1799 1799
1800void hci_link_keys_clear(struct hci_dev *hdev);1800void hci_link_keys_clear(struct hci_dev *hdev);
1801u8 *hci_conn_key_enc_size(struct hci_conn *conn);
1801struct link_key *hci_find_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr);1802struct link_key *hci_find_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr);
1802struct link_key *hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn,1803struct link_key *hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn,
1803 bdaddr_t *bdaddr, u8 *val, u8 type,1804 bdaddr_t *bdaddr, u8 *val, u8 type,
include/net/sch_generic.h+15−0
@@ -1031,6 +1031,21 @@ static inline struct sk_buff *__qdisc_dequeue_head(struct qdisc_skb_head *qh) · 1030 unmodified lines
1031 return skb;1031 return skb;
1032}1032}
1033 1033
1034static inline struct sk_buff *qdisc_dequeue_internal(struct Qdisc *sch, bool direct)
1035{
1036 struct sk_buff *skb;
1037
1038 skb = __skb_dequeue(&sch->gso_skb);
1039 if (skb) {
1040 sch->q.qlen--;
1041 return skb;
1042 }
1043 if (direct)
1044 return __qdisc_dequeue_head(&sch->q);
1045 else
1046 return sch->dequeue(sch);
1047}
1048
1034static inline struct sk_buff *qdisc_dequeue_head(struct Qdisc *sch)1049static inline struct sk_buff *qdisc_dequeue_head(struct Qdisc *sch)
1035{1050{
1036 struct sk_buff *skb = __qdisc_dequeue_head(&sch->q);1051 struct sk_buff *skb = __qdisc_dequeue_head(&sch->q);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t