Pull networking fixes from David Miller: 1) Fix cfg80211 deadlock, from Johannes Berg. 2) RXRPC fails to send norigications, from David Howells. 3) MPTCP RM_ADDR parsing has an off by one pointer error, fix from Geliang Tang. 4) Fix crash when using MSG_PEEK with sockmap, from Anny Hu. 5) The ucc_geth driver needs __netdev_watchdog_up exported, from Valentin Longchamp. 6) Fix hashtable memory leak in dccp, from Wang Hai. 7) Fix how nexthops are marked as FDB nexthops, from David Ahern. 8) Fix mptcp races between shutdown and recvmsg, from Paolo Abeni. 9) Fix crashes in tipc_disc_rcv(), from Tuong Lien. 10) Fix link speed reporting in iavf driver, from Brett Creeley. 11) When a channel is used for XSK and then reused again later for XSK, we forget to clear out the relevant data structures in mlx5 which causes all kinds of problems. Fix from Maxim Mikityanskiy. 12) Fix memory leak in genetlink, from Cong Wang. 13) Disallow sockmap attachments to UDP sockets, it simply won't work. From Lorenz Bauer. * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (83 commits) net: ethernet: ti: ale: fix allmulti for nu type ale net: ethernet: ti: am65-cpsw-nuss: fix ale parameters init net: atm: Remove the error message according to the atomic context bpf: Undo internal BPF_PROBE_MEM in BPF insns dump libbpf: Support pre-initializing .bss global variables tools/bpftool: Fix skeleton codegen bpf: Fix memlock accounting for sock_hash bpf: sockmap: Don't attach programs to UDP sockets bpf: tcp: Recv() should return 0 when the peer socket is closed ibmvnic: Flush existing work items before device removal genetlink: clean up family attributes allocations net: ipa: header pad field only valid for AP->modem endpoint net: ipa: program upper nibbles of sequencer type net: ipa: fix modem LAN RX endpoint id net: ipa: program metadata mask differently ionic: add pcie_print_link_status rxrpc: Fix race between incoming ACK parser and retransmitter net/mlx5: E-Switch, Fix some error pointer dereferences net/mlx5: Don't fail driver on failure to create debugfs net/mlx5e: CT: Fix ipv6 nat header rewrite actions ...
Showing the changes to include/uapi/linux (2 of 111 files). Show all
Unified · Split
| @@ -3761,6 +3761,19 @@ struct xdp_md { · 3760 unmodified lines | ||
| 3761 | 3761 | __u32 egress_ifindex; /* txq->dev->ifindex */ |
| 3762 | 3762 | }; |
| 3763 | 3763 | |
| 3764 | +/* DEVMAP map-value layout | |
| 3765 | + * | |
| 3766 | + * The struct data-layout of map-value is a configuration interface. | |
| 3767 | + * New members can only be added to the end of this structure. | |
| 3768 | + */ | |
| 3769 | +struct bpf_devmap_val { | |
| 3770 | + __u32 ifindex; /* device index */ | |
| 3771 | + union { | |
| 3772 | + int fd; /* prog fd on map write */ | |
| 3773 | + __u32 id; /* prog id on map read */ | |
| 3774 | + } bpf_prog; | |
| 3775 | +}; | |
| 3776 | + | |
| 3764 | 3777 | enum sk_action { |
| 3765 | 3778 | SK_DROP = 0, |
| 3766 | 3779 | SK_PASS, |
| @@ -794,7 +794,7 @@ · 793 unmodified lines | ||
| 794 | 794 | * various triggers. These triggers can be configured through this |
| 795 | 795 | * command with the %NL80211_ATTR_WOWLAN_TRIGGERS attribute. For |
| 796 | 796 | * more background information, see |
| 797 | − * http://wireless.kernel.org/en/users/Documentation/WoWLAN. | |
| 797 | + * https://wireless.wiki.kernel.org/en/users/Documentation/WoWLAN. | |
| 798 | 798 | * The @NL80211_CMD_SET_WOWLAN command can also be used as a notification |
| 799 | 799 | * from the driver reporting the wakeup reason. In this case, the |
| 800 | 800 | * @NL80211_ATTR_WOWLAN_TRIGGERS attribute will contain the reason |