diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2025-03-18 09:45:23 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2025-03-18 09:46:36 +0100 |
| commit | c924c5e9b8c65b3a479a90e5e37d74cc8cd9fe0a (patch) | |
| tree | 9626c13418dd3770f2772980a7dacdc110c442b6 /include/linux/ipv6.h | |
| parent | 54be64fdf3ba6dbad2f5c48e466e1db43ad74bca (diff) | |
| parent | 50698b298b3995d253bd0b85ff7f60cae6f51e6a (diff) | |
| download | lwn-c924c5e9b8c65b3a479a90e5e37d74cc8cd9fe0a.tar.gz lwn-c924c5e9b8c65b3a479a90e5e37d74cc8cd9fe0a.zip | |
Merge net-next/main to resolve conflicts
There are a few conflicts between the work that went
into wireless and that's here now, resolve them.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/linux/ipv6.h')
| -rw-r--r-- | include/linux/ipv6.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index a6e2aadbb91b..5aeeed22f35b 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h @@ -207,6 +207,7 @@ struct inet6_cork { struct ipv6_txoptions *opt; u8 hop_limit; u8 tclass; + u8 dontfrag:1; }; /* struct ipv6_pinfo - ipv6 private area */ |