Cross-merge networking fixes after downstream PR. No conflicts. Adjacent changes: drivers/net/ethernet/stmicro/stmmac/common.h 38cc3c6dcc09 ("net: stmmac: protect updates of 64-bit statistics counters") fd5a6a71313e ("net: stmmac: est: Per Tx-queue error count for HLBF") c5c3e1bfc9e0 ("net: stmmac: Offload queueMaxSDU from tc-taprio") drivers/net/wireless/microchip/wilc1000/netdev.c c9013880284d ("wifi: fill in MODULE_DESCRIPTION()s for wilc1000") 328efda22af8 ("wifi: wilc1000: do not realloc workqueue everytime an interface is added") net/unix/garbage.c 11498715f266 ("af_unix: Remove io_uring code for GC.") 1279f9d9dec2 ("af_unix: Call kfree_skb() for dead unix_(sk)->oob_skb in GC.")
Showing the changes to include/uapi/linux/netfilter (1 of 427 files). Show all
Unified · Split
| @@ -289,9 +289,11 @@ enum nft_rule_attributes { · 288 unmodified lines | ||
| 289 | 289 | /** |
| 290 | 290 | * enum nft_rule_compat_flags - nf_tables rule compat flags |
| 291 | 291 | * |
| 292 | + * @NFT_RULE_COMPAT_F_UNUSED: unused | |
| 292 | 293 | * @NFT_RULE_COMPAT_F_INV: invert the check result |
| 293 | 294 | */ |
| 294 | 295 | enum nft_rule_compat_flags { |
| 296 | + NFT_RULE_COMPAT_F_UNUSED = (1 << 0), | |
| 295 | 297 | NFT_RULE_COMPAT_F_INV = (1 << 1), |
| 296 | 298 | NFT_RULE_COMPAT_F_MASK = NFT_RULE_COMPAT_F_INV, |
| 297 | 299 | }; |