hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tipc: rename struct tipc_skb_cb member handle to bytes_read 

In this commit, we rename handle to bytes_read indicating the
purpose of the member.

Signed-off-by: Parthasarathy Bhuvaragan <parthasarathy.bhuvaragan@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Parthasarathy Bhuvaragan 2016-11-01 14:02:37 +01:00 committed by David S. Miller
parent cb5da847af
commit ba8aebe943
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/tipc/msg.h
View File

@ -95,7 +95,7 @@ struct plist;
#define TIPC_MEDIA_INFO_OFFSET 5 #define TIPC_MEDIA_INFO_OFFSET 5
struct tipc_skb_cb { struct tipc_skb_cb {
void *handle; u32 bytes_read;
struct sk_buff *tail; struct sk_buff *tail;
bool validated; bool validated;
bool wakeup_pending; bool wakeup_pending;

18
net/tipc/socket.c
View File

@ -465,7 +465,7 @@ static int tipc_release(struct socket *sock)
skb = __skb_dequeue(&sk->sk_receive_queue); skb = __skb_dequeue(&sk->sk_receive_queue);
if (skb == NULL) if (skb == NULL)
break; break;
if (TIPC_SKB_CB(skb)->handle != NULL) if (TIPC_SKB_CB(skb)->bytes_read)
kfree_skb(skb); kfree_skb(skb);
else { else {
if ((sock->state == SS_CONNECTING) || if ((sock->state == SS_CONNECTING) ||
@ -1435,7 +1435,7 @@ static int tipc_recv_stream(struct socket *sock, struct msghdr *m,
struct tipc_msg *msg; struct tipc_msg *msg;
long timeo; long timeo;
unsigned int sz; unsigned int sz;
int sz_to_copy, target, needed; int target;
int sz_copied = 0; int sz_copied = 0;
u32 err; u32 err;
int res = 0, hlen; int res = 0, hlen;
@ -1483,11 +1483,13 @@ restart:
/* Capture message data (if valid) & compute return value (always) */ /* Capture message data (if valid) & compute return value (always) */
if (!err) { if (!err) {
u32 offset = (u32)(unsigned long)(TIPC_SKB_CB(buf)->handle); u32 offset = TIPC_SKB_CB(buf)->bytes_read;
u32 needed;
int sz_to_copy;
sz -= offset; sz -= offset;
needed = (buf_len - sz_copied); needed = (buf_len - sz_copied);
sz_to_copy = (sz <= needed) ? sz : needed; sz_to_copy = min(sz, needed);
res = skb_copy_datagram_msg(buf, hlen + offset, m, sz_to_copy); res = skb_copy_datagram_msg(buf, hlen + offset, m, sz_to_copy);
if (res) if (res)
@ -1497,8 +1499,8 @@ restart:
if (sz_to_copy < sz) { if (sz_to_copy < sz) {
if (!(flags & MSG_PEEK)) if (!(flags & MSG_PEEK))
TIPC_SKB_CB(buf)->handle = TIPC_SKB_CB(buf)->bytes_read =
(void *)(unsigned long)(offset + sz_to_copy); offset + sz_to_copy;
goto exit; goto exit;
} }
} else { } else {
@ -1742,7 +1744,7 @@ static bool filter_rcv(struct sock *sk, struct sk_buff *skb,
} }
/* Enqueue message */ /* Enqueue message */
TIPC_SKB_CB(skb)->handle = NULL; TIPC_SKB_CB(skb)->bytes_read = 0;
__skb_queue_tail(&sk->sk_receive_queue, skb); __skb_queue_tail(&sk->sk_receive_queue, skb);
skb_set_owner_r(skb, sk); skb_set_owner_r(skb, sk);
@ -2177,7 +2179,7 @@ restart:
/* Disconnect and send a 'FIN+' or 'FIN-' message to peer */ /* Disconnect and send a 'FIN+' or 'FIN-' message to peer */
skb = __skb_dequeue(&sk->sk_receive_queue); skb = __skb_dequeue(&sk->sk_receive_queue);
if (skb) { if (skb) {
if (TIPC_SKB_CB(skb)->handle != NULL) { if (TIPC_SKB_CB(skb)->bytes_read) {
kfree_skb(skb); kfree_skb(skb);
goto restart; goto restart;
} }