History

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

Pull networking fixes from Jakub Kicinski: "Networking fixes for 5.11-rc5, including fixes from bpf, wireless, and can trees. Current release - regressions: - nfc: nci: fix the wrong NCI_CORE_INIT parameters Current release - new code bugs: - bpf: allow empty module BTFs Previous releases - regressions: - bpf: fix signed_{sub,add32}_overflows type handling - tcp: do not mess with cloned skbs in tcp_add_backlog() - bpf: prevent double bpf_prog_put call from bpf_tracing_prog_attach - bpf: don't leak memory in bpf getsockopt when optlen == 0 - tcp: fix potential use-after-free due to double kfree() - mac80211: fix encryption issues with WEP - devlink: use right genl user_ptr when handling port param get/set - ipv6: set multicast flag on the multicast route - tcp: fix TCP_USER_TIMEOUT with zero window Previous releases - always broken: - bpf: local storage helpers should check nullness of owner ptr passed - mac80211: fix incorrect strlen of .write in debugfs - cls_flower: call nla_ok() before nla_next() - skbuff: back tiny skbs with kmalloc() in __netdev_alloc_skb() too" * tag 'net-5.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (52 commits) net: systemport: free dev before on error path net: usb: cdc_ncm: don't spew notifications net: mscc: ocelot: Fix multicast to the CPU port tcp: Fix potential use-after-free due to double kfree() bpf: Fix signed_{sub,add32}_overflows type handling can: peak_usb: fix use after free bugs can: vxcan: vxcan_xmit: fix use after free bug can: dev: can_restart: fix use after free bug tcp: fix TCP socket rehash stats mis-accounting net: dsa: b53: fix an off by one in checking "vlan->vid" tcp: do not mess with cloned skbs in tcp_add_backlog() selftests: net: fib_tests: remove duplicate log test net: nfc: nci: fix the wrong NCI_CORE_INIT parameters sh_eth: Fix power down vs. is_opened flag ordering net: Disable NETIF_F_HW_TLS_RX when RXCSUM is disabled netfilter: rpfilter: mask ecn bits before fib lookup udp: mask TOS bits in udp_v4_early_demux() xsk: Clear pool even for inactive queues bpf: Fix helper bpf_map_peek_elem_proto pointing to wrong callback sh_eth: Make PHY access aware of Runtime PM to fix reboot crash ...

Linus Torvalds committed 5 years ago

Commit 75439bc2 parents 2e4ceed 535d31557 files · +380 −252Browse files

Showing the changes to include/linux (2 of 57 files). Show all

Unified · Split

2 files
  1. include/linux/mdio-bitbang.h +3 −0
  2. include/linux/usb/usbnet.h +2 −0
include/linux/mdio-bitbang.h+3−0
@@ -35,6 +35,9 @@ struct mdiobb_ctrl { · 34 unmodified lines
35 const struct mdiobb_ops *ops;35 const struct mdiobb_ops *ops;
36};36};
37 37
38int mdiobb_read(struct mii_bus *bus, int phy, int reg);
39int mdiobb_write(struct mii_bus *bus, int phy, int reg, u16 val);
40
38/* The returned bus is not yet registered with the phy layer. */41/* The returned bus is not yet registered with the phy layer. */
39struct mii_bus *alloc_mdio_bitbang(struct mdiobb_ctrl *ctrl);42struct mii_bus *alloc_mdio_bitbang(struct mdiobb_ctrl *ctrl);
40 43
include/linux/usb/usbnet.h+2−0
@@ -81,6 +81,8 @@ struct usbnet { · 80 unmodified lines
81# define EVENT_LINK_CHANGE 1181# define EVENT_LINK_CHANGE 11
82# define EVENT_SET_RX_MODE 1282# define EVENT_SET_RX_MODE 12
83# define EVENT_NO_IP_ALIGN 1383# define EVENT_NO_IP_ALIGN 13
84 u32 rx_speed; /* in bps - NOT Mbps */
85 u32 tx_speed; /* in bps - NOT Mbps */
84};86};
85 87
86static inline struct usb_driver *driver_of(struct usb_interface *intf)88static inline struct usb_driver *driver_of(struct usb_interface *intf)

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