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

net/packet: remove unused parameter in prb_curr_blk_in_use(). 

This patch removes unused parameter from prb_curr_blk_in_use() method
in net/packet/af_packet.c.

Signed-off-by: Rami Rosen <rami.rosen@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Rosen, Rami 2017-05-24 18:34:11 +03:00 committed by David S. Miller
parent c9e19ea421
commit 878cd3ba37
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/packet/af_packet.c
View File

@ -196,8 +196,7 @@ static void *packet_previous_frame(struct packet_sock *po,
struct packet_ring_buffer *rb, struct packet_ring_buffer *rb,
int status); int status);
static void packet_increment_head(struct packet_ring_buffer *buff); static void packet_increment_head(struct packet_ring_buffer *buff);
static int prb_curr_blk_in_use(struct tpacket_kbdq_core *, static int prb_curr_blk_in_use(struct tpacket_block_desc *);
struct tpacket_block_desc *);
static void *prb_dispatch_next_block(struct tpacket_kbdq_core *, static void *prb_dispatch_next_block(struct tpacket_kbdq_core *,
struct packet_sock *); struct packet_sock *);
static void prb_retire_current_block(struct tpacket_kbdq_core *, static void prb_retire_current_block(struct tpacket_kbdq_core *,
@ -721,7 +720,7 @@ static void prb_retire_rx_blk_timer_expired(unsigned long data)
/* Case 1. Queue was frozen because user-space was /* Case 1. Queue was frozen because user-space was
* lagging behind. * lagging behind.
*/ */
if (prb_curr_blk_in_use(pkc, pbd)) { if (prb_curr_blk_in_use(pbd)) {
/* /*
* Ok, user-space is still behind. * Ok, user-space is still behind.
* So just refresh the timer. * So just refresh the timer.
@ -972,8 +971,7 @@ static void prb_retire_current_block(struct tpacket_kbdq_core *pkc,
} }
} }
static int prb_curr_blk_in_use(struct tpacket_kbdq_core *pkc, static int prb_curr_blk_in_use(struct tpacket_block_desc *pbd)
struct tpacket_block_desc *pbd)
{ {
return TP_STATUS_USER & BLOCK_STATUS(pbd); return TP_STATUS_USER & BLOCK_STATUS(pbd);
} }
@ -1064,7 +1062,7 @@ static void *__packet_lookup_frame_in_block(struct packet_sock *po,
* Check if that last block which caused the queue to freeze, * Check if that last block which caused the queue to freeze,
* is still in_use by user-space. * is still in_use by user-space.
*/ */
if (prb_curr_blk_in_use(pkc, pbd)) { if (prb_curr_blk_in_use(pbd)) {
/* Can't record this packet */ /* Can't record this packet */
return NULL; return NULL;
} else { } else {