diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-15 12:34:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-15 12:34:46 -0700 |
| commit | a19264d0868dfd65d7222b37ffe41068b53d473a (patch) | |
| tree | 44333f25e7c025303e9d06d47b1f2b5395bac3e7 /include/linux/udp.h | |
| parent | Merge tag '6.10-rc-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6 (diff) | |
| parent | Merge branch 'for-6.10-base-small' into for-linus (diff) | |
| download | wireguard-linux-a19264d0868dfd65d7222b37ffe41068b53d473a.tar.xz wireguard-linux-a19264d0868dfd65d7222b37ffe41068b53d473a.zip | |
Merge tag 'printk-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux
Pull printk updates from Petr Mladek:
- Use no_printk() instead of "if (0) printk()" constructs to avoid
generating printk index for messages disabled at compile time
- Remove deprecated strncpy/strcpy from printk.c
- Remove redundant CONFIG_BASE_FULL in favor of CONFIG_BASE_SMALL
* tag 'printk-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux:
printk: cleanup deprecated uses of strncpy/strcpy
printk: Remove redundant CONFIG_BASE_FULL
printk: Change type of CONFIG_BASE_SMALL to bool
printk: Fix LOG_CPU_MAX_BUF_SHIFT when BASE_SMALL is enabled
ceph: Use no_printk() helper
dyndbg: Use *no_printk() helpers
dev_printk: Add and use dev_no_printk()
printk: Let no_printk() use _printk()
Diffstat (limited to 'include/linux/udp.h')
| -rw-r--r-- | include/linux/udp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/udp.h b/include/linux/udp.h index e398e1dbd2d3..3eb3f2b9a2a0 100644 --- a/include/linux/udp.h +++ b/include/linux/udp.h @@ -24,7 +24,7 @@ static inline struct udphdr *udp_hdr(const struct sk_buff *skb) } #define UDP_HTABLE_SIZE_MIN_PERNET 128 -#define UDP_HTABLE_SIZE_MIN (CONFIG_BASE_SMALL ? 128 : 256) +#define UDP_HTABLE_SIZE_MIN (IS_ENABLED(CONFIG_BASE_SMALL) ? 128 : 256) #define UDP_HTABLE_SIZE_MAX 65536 static inline u32 udp_hashfn(const struct net *net, u32 num, u32 mask) |