diff options
| author | David S. Miller <davem@davemloft.net> | 2019-04-11 21:04:08 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-11 21:04:08 +0300 |
| commit | 796fff0c12b238f57868938577abc495b5b8c3aa (patch) | |
| tree | f02f6529ea09b2bb02f173e11e5c8c53abe69ab9 /include | |
| parent | 988dc4a9a3b66be75b30405a5494faf0dc7cffb6 (diff) | |
| parent | f61bca58f6c36e666c2b807697f25e5e98708162 (diff) | |
| download | linux-796fff0c12b238f57868938577abc495b5b8c3aa.tar.xz | |
Merge branch 'smc-fixes'
Ursula Braun says:
====================
net/smc: fixes 2019-04-11
here are some fixes in different areas of the smc code for the net
tree.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/sock.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 8de5ee258b93..341f8bafa0cf 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -2084,12 +2084,6 @@ static inline bool skwq_has_sleeper(struct socket_wq *wq) * @p: poll_table * * See the comments in the wq_has_sleeper function. - * - * Do not derive sock from filp->private_data here. An SMC socket establishes - * an internal TCP socket that is used in the fallback case. All socket - * operations on the SMC socket are then forwarded to the TCP socket. In case of - * poll, the filp->private_data pointer references the SMC socket because the - * TCP socket has no file assigned. */ static inline void sock_poll_wait(struct file *filp, struct socket *sock, poll_table *p) |