Skip to content

Commit

Permalink
Merge tag 'net-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/git/netdev/net

Pull networking fixes from Jakub Kicinski:
 "Including fixes from netfilter.

  Current release - regressions:

   - four fixes for the netdev per-instance locking

  Current release - new code bugs:

   - consolidate more code between existing Rx zero-copy and uring so
     that the latter doesn't miss / have to duplicate the safety checks

  Previous releases - regressions:

   - ipv6: fix omitted Netlink attributes when using SKIP_STATS

  Previous releases - always broken:

   - net: fix geneve_opt length integer overflow

   - udp: fix multiple wrap arounds of sk->sk_rmem_alloc when it
     approaches INT_MAX

   - dsa: mvpp2: add a lock to avoid corruption of the shared TCAM

   - dsa: airoha: fix issues with traffic QoS configuration / offload,
     and flow table offload

  Misc:

   - touch up the Netlink YAML specs of old families to make them usable
     for user space C codegen"

* tag 'net-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (56 commits)
  selftests: net: amt: indicate progress in the stress test
  netlink: specs: rt_route: pull the ifa- prefix out of the names
  netlink: specs: rt_addr: pull the ifa- prefix out of the names
  netlink: specs: rt_addr: fix get multi command name
  netlink: specs: rt_addr: fix the spec format / schema failures
  net: avoid false positive warnings in __net_mp_close_rxq()
  net: move mp dev config validation to __net_mp_open_rxq()
  net: ibmveth: make veth_pool_store stop hanging
  arcnet: Add NULL check in com20020pci_probe()
  ipv6: Do not consider link down nexthops in path selection
  ipv6: Start path selection from the first nexthop
  usbnet:fix NPE during rx_complete
  net: octeontx2: Handle XDP_ABORTED and XDP invalid as XDP_DROP
  net: fix geneve_opt length integer overflow
  io_uring/zcrx: fix selftests w/ updated netdev Python helpers
  selftests: net: use netdevsim in netns test
  docs: net: document netdev notifier expectations
  net: dummy: request ops lock
  netdevsim: add dummy device notifiers
  net: rename rtnl_net_debug to lock_debug
  ...
  • Loading branch information
Linus Torvalds committed Apr 4, 2025
2 parents 9636452 + 94f68c0 commit 61f96e6
Show file tree
Hide file tree
Showing 69 changed files with 864 additions and 442 deletions.
4 changes: 4 additions & 0 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -3670,6 +3670,10 @@ S: 149 Union St.
S: Kingston, Ontario
S: Canada K7L 2P4

N: Pravin B Shelar
E: pshelar@ovn.org
D: Open vSwitch maintenance and contributions

N: John Shifflett
E: john@geolog.com
E: jshiffle@netcom.com
Expand Down
42 changes: 22 additions & 20 deletions Documentation/netlink/specs/rt_addr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,45 +78,46 @@ definitions:
attribute-sets:
-
name: addr-attrs
name-prefix: ifa-
attributes:
-
name: ifa-address
name: address
type: binary
display-hint: ipv4
-
name: ifa-local
name: local
type: binary
display-hint: ipv4
-
name: ifa-label
name: label
type: string
-
name: ifa-broadcast
name: broadcast
type: binary
display-hint: ipv4
-
name: ifa-anycast
name: anycast
type: binary
-
name: ifa-cacheinfo
name: cacheinfo
type: binary
struct: ifa-cacheinfo
-
name: ifa-multicast
name: multicast
type: binary
-
name: ifa-flags
name: flags
type: u32
enum: ifa-flags
enum-as-flags: true
-
name: ifa-rt-priority
name: rt-priority
type: u32
-
name: ifa-target-netnsid
name: target-netnsid
type: binary
-
name: ifa-proto
name: proto
type: u8


Expand All @@ -137,10 +138,10 @@ operations:
- ifa-prefixlen
- ifa-scope
- ifa-index
- ifa-address
- ifa-label
- ifa-local
- ifa-cacheinfo
- address
- label
- local
- cacheinfo
-
name: deladdr
doc: Remove address
Expand All @@ -154,8 +155,8 @@ operations:
- ifa-prefixlen
- ifa-scope
- ifa-index
- ifa-address
- ifa-local
- address
- local
-
name: getaddr
doc: Dump address information.
Expand All @@ -169,7 +170,7 @@ operations:
value: 20
attributes: *ifaddr-all
-
name: getmaddrs
name: getmulticast
doc: Get / dump IPv4/IPv6 multicast addresses.
attribute-set: addr-attrs
fixed-header: ifaddrmsg
Expand All @@ -182,11 +183,12 @@ operations:
reply:
value: 58
attributes: &mcaddr-attrs
- ifa-multicast
- ifa-cacheinfo
- multicast
- cacheinfo
dump:
request:
value: 58
attributes:
- ifa-family
reply:
value: 58
Expand Down
Loading

0 comments on commit 61f96e6

Please sign in to comment.