History

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

Pull networking fixes from Paolo Abeni: "Including fixes from bluetooth, bpf and wireless. Current release - regressions: - bpf: - fix wrong last sg check in sk_msg_recvmsg() - fix kernel BUG in purge_effective_progs() - mac80211: - fix possible leak in ieee80211_tx_control_port() - potential NULL dereference in ieee80211_tx_control_port() Current release - new code bugs: - nfp: fix the access to management firmware hanging Previous releases - regressions: - ip: fix triggering of 'icmp redirect' - sched: tbf: don't call qdisc_put() while holding tree lock - bpf: fix corrupted packets for XDP_SHARED_UMEM - bluetooth: hci_sync: fix suspend performance regression - micrel: fix probe failure Previous releases - always broken: - tcp: make global challenge ack rate limitation per net-ns and default disabled - tg3: fix potential hang-up on system reboot - mac802154: fix reception for no-daddr packets Misc: - r8152: add PID for the lenovo onelink+ dock" * tag 'net-6.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (56 commits) net/smc: Remove redundant refcount increase Revert "sch_cake: Return __NET_XMIT_STOLEN when consuming enqueued skb" tcp: make global challenge ack rate limitation per net-ns and default disabled tcp: annotate data-race around challenge_timestamp net: dsa: hellcreek: Print warning only once ip: fix triggering of 'icmp redirect' sch_cake: Return __NET_XMIT_STOLEN when consuming enqueued skb selftests: net: sort .gitignore file Documentation: networking: correct possessive "its" kcm: fix strp_init() order and cleanup mlxbf_gige: compute MDIO period based on i1clk ethernet: rocker: fix sleep in atomic context bug in neigh_timer_handler net: lan966x: improve error handle in lan966x_fdma_rx_get_frame() nfp: fix the access to management firmware hanging net: phy: micrel: Make the GPIO to be non-exclusive net: virtio_net: fix notification coalescing comments net/sched: fix netdevice reference leaks in attach_default_qdiscs() net: sched: tbf: don't call qdisc_put() while holding tree lock net: Use u64_stats_fetch_begin_irq() for stats fetch. net: dsa: xrs700x: Use irqsave variant for u64 stats update ...

Linus Torvalds committed 4 years ago

Commit 42e66b12 parents d330076 a8424a970 files · +478 −249Browse files

Showing the changes to include/uapi (2 of 70 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/bpf.h +1 −1
  2. include/uapi/linux/virtio_net.h +7 −7
include/uapi/linux/bpf.h+1−1
@@ -79,7 +79,7 @@ struct bpf_insn { · 78 unmodified lines
7979 /* Key of an a BPF_MAP_TYPE_LPM_TRIE entry */
8080 struct bpf_lpm_trie_key {
8181 __u32 prefixlen; /* up to 32 for AF_INET, 128 for AF_INET6 */
82− __u8 data[]; /* Arbitrary size */
82+ __u8 data[0]; /* Arbitrary size */
8383 };
8484
8585 struct bpf_cgroup_storage_key {
include/uapi/linux/virtio_net.h+7−7
@@ -56,7 +56,7 @@ · 55 unmodified lines
5656 #define VIRTIO_NET_F_MQ 22 /* Device supports Receive Flow
5757 * Steering */
5858 #define VIRTIO_NET_F_CTRL_MAC_ADDR 23 /* Set MAC address */
59−#define VIRTIO_NET_F_NOTF_COAL 53 /* Guest can handle notifications coalescing */
59+#define VIRTIO_NET_F_NOTF_COAL 53 /* Device supports notifications coalescing */
6060 #define VIRTIO_NET_F_HASH_REPORT 57 /* Supports hash report */
6161 #define VIRTIO_NET_F_RSS 60 /* Supports RSS RX steering */
6262 #define VIRTIO_NET_F_RSC_EXT 61 /* extended coalescing info */
@@ -364,24 +364,24 @@ struct virtio_net_hash_config { · 301 unmodified lines
364364 */
365365 #define VIRTIO_NET_CTRL_NOTF_COAL 6
366366 /*
367− * Set the tx-usecs/tx-max-packets patameters.
368− * tx-usecs - Maximum number of usecs to delay a TX notification.
369− * tx-max-packets - Maximum number of packets to send before a TX notification.
367+ * Set the tx-usecs/tx-max-packets parameters.
370368 */
371369 struct virtio_net_ctrl_coal_tx {
370+ /* Maximum number of packets to send before a TX notification */
372371 __le32 tx_max_packets;
372+ /* Maximum number of usecs to delay a TX notification */
373373 __le32 tx_usecs;
374374 };
375375
376376 #define VIRTIO_NET_CTRL_NOTF_COAL_TX_SET 0
377377
378378 /*
379− * Set the rx-usecs/rx-max-packets patameters.
380− * rx-usecs - Maximum number of usecs to delay a RX notification.
381− * rx-max-frames - Maximum number of packets to receive before a RX notification.
379+ * Set the rx-usecs/rx-max-packets parameters.
382380 */
383381 struct virtio_net_ctrl_coal_rx {
382+ /* Maximum number of packets to receive before a RX notification */
384383 __le32 rx_max_packets;
384+ /* Maximum number of usecs to delay a RX notification */
385385 __le32 rx_usecs;
386386 };
387387

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