From: Mat Martineau <mathew.j.martineau@linux.intel.com>
To: netdev@vger.kernel.org, mptcp@lists.01.org
Cc: Mat Martineau <mathew.j.martineau@linux.intel.com>
Subject: [PATCH net-next 02/11] sock: Make sk_protocol a 16-bit value
Date: Fri, 13 Dec 2019 15:00:13 -0800 [thread overview]
Message-ID: <20191213230022.28144-3-mathew.j.martineau@linux.intel.com> (raw)
In-Reply-To: <20191213230022.28144-1-mathew.j.martineau@linux.intel.com>
Match the 16-bit width of skbuff->protocol. Fills an 8-bit hole so
sizeof(struct sock) does not change.
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
---
include/net/sock.h | 4 ++--
include/trace/events/sock.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/net/sock.h b/include/net/sock.h
index 81dc811aad2e..9dd225f62012 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -456,10 +456,10 @@ struct sock {
sk_no_check_tx : 1,
sk_no_check_rx : 1,
sk_userlocks : 4,
- sk_protocol : 8,
+ sk_pacing_shift : 8,
sk_type : 16;
+ u16 sk_protocol;
u16 sk_gso_max_segs;
- u8 sk_pacing_shift;
unsigned long sk_lingertime;
struct proto *sk_prot_creator;
rwlock_t sk_callback_lock;
diff --git a/include/trace/events/sock.h b/include/trace/events/sock.h
index 51fe9f6719eb..3ff12b90048d 100644
--- a/include/trace/events/sock.h
+++ b/include/trace/events/sock.h
@@ -147,7 +147,7 @@ TRACE_EVENT(inet_sock_set_state,
__field(__u16, sport)
__field(__u16, dport)
__field(__u16, family)
- __field(__u8, protocol)
+ __field(__u16, protocol)
__array(__u8, saddr, 4)
__array(__u8, daddr, 4)
__array(__u8, saddr_v6, 16)
--
2.24.1
next prev parent reply other threads:[~2019-12-13 23:01 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-13 23:00 [PATCH net-next 00/11] Multipath TCP: Prerequisites Mat Martineau
2019-12-13 23:00 ` [PATCH net-next 01/11] net: Make sock protocol value checks more specific Mat Martineau
2019-12-13 23:00 ` Mat Martineau [this message]
2019-12-13 23:16 ` [PATCH net-next 02/11] sock: Make sk_protocol a 16-bit value Eric Dumazet
2019-12-14 0:06 ` Mat Martineau
2019-12-13 23:00 ` [PATCH net-next 03/11] tcp: Define IPPROTO_MPTCP Mat Martineau
2019-12-13 23:00 ` [PATCH net-next 04/11] tcp: Add MPTCP option number Mat Martineau
2019-12-13 23:00 ` [PATCH net-next 05/11] tcp, ulp: Add clone operation to tcp_ulp_ops Mat Martineau
2019-12-13 23:00 ` [PATCH net-next 06/11] mptcp: Add MPTCP to skb extensions Mat Martineau
2019-12-13 23:00 ` [PATCH net-next 07/11] tcp: Prevent coalesce/collapse when skb has MPTCP extensions Mat Martineau
2019-12-13 23:00 ` [PATCH net-next 08/11] tcp: Export TCP functions and ops struct Mat Martineau
2019-12-13 23:00 ` [PATCH net-next 09/11] tcp: Check for filled TCP option space before SACK Mat Martineau
2019-12-13 23:22 ` Eric Dumazet
2019-12-14 0:28 ` Mat Martineau
2019-12-16 12:52 ` [MPTCP] " Paolo Abeni
2019-12-16 16:55 ` Eric Dumazet
2019-12-16 17:28 ` Paolo Abeni
2019-12-13 23:00 ` [PATCH net-next 10/11] tcp: clean ext on tx recycle Mat Martineau
2019-12-13 23:00 ` [PATCH net-next 11/11] skb: add helpers to allocate ext independently from sk_buff Mat Martineau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191213230022.28144-3-mathew.j.martineau@linux.intel.com \
--to=mathew.j.martineau@linux.intel.com \
--cc=mptcp@lists.01.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).