Skip to content

Commit 61f96e6

Browse files
committed
Merge tag 'net-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/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 ...
2 parents 9636452 + 94f68c0 commit 61f96e6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+864
-442
lines changed

CREDITS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3670,6 +3670,10 @@ S: 149 Union St.
36703670
S: Kingston, Ontario
36713671
S: Canada K7L 2P4
36723672

3673+
N: Pravin B Shelar
3674+
E: pshelar@ovn.org
3675+
D: Open vSwitch maintenance and contributions
3676+
36733677
N: John Shifflett
36743678
E: john@geolog.com
36753679
E: jshiffle@netcom.com

Documentation/netlink/specs/rt_addr.yaml

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -78,45 +78,46 @@ definitions:
7878
attribute-sets:
7979
-
8080
name: addr-attrs
81+
name-prefix: ifa-
8182
attributes:
8283
-
83-
name: ifa-address
84+
name: address
8485
type: binary
8586
display-hint: ipv4
8687
-
87-
name: ifa-local
88+
name: local
8889
type: binary
8990
display-hint: ipv4
9091
-
91-
name: ifa-label
92+
name: label
9293
type: string
9394
-
94-
name: ifa-broadcast
95+
name: broadcast
9596
type: binary
9697
display-hint: ipv4
9798
-
98-
name: ifa-anycast
99+
name: anycast
99100
type: binary
100101
-
101-
name: ifa-cacheinfo
102+
name: cacheinfo
102103
type: binary
103104
struct: ifa-cacheinfo
104105
-
105-
name: ifa-multicast
106+
name: multicast
106107
type: binary
107108
-
108-
name: ifa-flags
109+
name: flags
109110
type: u32
110111
enum: ifa-flags
111112
enum-as-flags: true
112113
-
113-
name: ifa-rt-priority
114+
name: rt-priority
114115
type: u32
115116
-
116-
name: ifa-target-netnsid
117+
name: target-netnsid
117118
type: binary
118119
-
119-
name: ifa-proto
120+
name: proto
120121
type: u8
121122

122123

@@ -137,10 +138,10 @@ operations:
137138
- ifa-prefixlen
138139
- ifa-scope
139140
- ifa-index
140-
- ifa-address
141-
- ifa-label
142-
- ifa-local
143-
- ifa-cacheinfo
141+
- address
142+
- label
143+
- local
144+
- cacheinfo
144145
-
145146
name: deladdr
146147
doc: Remove address
@@ -154,8 +155,8 @@ operations:
154155
- ifa-prefixlen
155156
- ifa-scope
156157
- ifa-index
157-
- ifa-address
158-
- ifa-local
158+
- address
159+
- local
159160
-
160161
name: getaddr
161162
doc: Dump address information.
@@ -169,7 +170,7 @@ operations:
169170
value: 20
170171
attributes: *ifaddr-all
171172
-
172-
name: getmaddrs
173+
name: getmulticast
173174
doc: Get / dump IPv4/IPv6 multicast addresses.
174175
attribute-set: addr-attrs
175176
fixed-header: ifaddrmsg
@@ -182,11 +183,12 @@ operations:
182183
reply:
183184
value: 58
184185
attributes: &mcaddr-attrs
185-
- ifa-multicast
186-
- ifa-cacheinfo
186+
- multicast
187+
- cacheinfo
187188
dump:
188189
request:
189190
value: 58
191+
attributes:
190192
- ifa-family
191193
reply:
192194
value: 58

0 commit comments

Comments
 (0)