SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync code with last improvements from OpenBSD

Browse source
This commit is contained in:
purplerain 2023-10-08 20:10:59 +00:00
parent 3252c81e6b
commit cb73df2d98
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
8 changed files with 82 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sys/net/ifq.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: ifq.c,v 1.51 2023/10/05 11:08:56 bluhm Exp $ */
/* $OpenBSD: ifq.c,v 1.52 2023/10/08 07:44:52 claudio Exp $ */
/*
* Copyright (c) 2015 David Gwynne <dlg@openbsd.org>
@ -529,14 +529,6 @@ ifq_hdatalen(struct ifqueue *ifq)
return (len);
}
void
ifq_set_maxlen(struct ifqueue *ifq, unsigned int maxlen)
{
mtx_enter(&ifq->ifq_mtx);
ifq->ifq_maxlen = maxlen;
mtx_leave(&ifq->ifq_mtx);
}
unsigned int
ifq_purge(struct ifqueue *ifq)
{

12
sys/net/ifq.h
View file

@ -1,4 +1,4 @@
/* $OpenBSD: ifq.h,v 1.39 2023/10/05 11:08:56 bluhm Exp $ */
/* $OpenBSD: ifq.h,v 1.40 2023/10/08 07:44:52 claudio Exp $ */
/*
* Copyright (c) 2015 David Gwynne <dlg@openbsd.org>
@ -435,7 +435,6 @@ void ifq_deq_commit(struct ifqueue *, struct mbuf *);
void ifq_deq_rollback(struct ifqueue *, struct mbuf *);
struct mbuf *ifq_dequeue(struct ifqueue *);
int ifq_hdatalen(struct ifqueue *);
void ifq_set_maxlen(struct ifqueue *, unsigned int);
void ifq_mfreem(struct ifqueue *, struct mbuf *);
void ifq_mfreeml(struct ifqueue *, struct mbuf_list *);
unsigned int ifq_purge(struct ifqueue *);
@ -449,8 +448,9 @@ int ifq_deq_sleep(struct ifqueue *, struct mbuf **, int, int,
const char *, volatile unsigned int *,
volatile unsigned int *);
#define ifq_len(_ifq) READ_ONCE((_ifq)->ifq_len)
#define ifq_empty(_ifq) (ifq_len(_ifq) == 0)
#define ifq_len(_ifq) ((_ifq)->ifq_len)
#define ifq_empty(_ifq) (ifq_len(_ifq) == 0)
#define ifq_set_maxlen(_ifq, _l) ((_ifq)->ifq_maxlen = (_l))
static inline int
ifq_is_priq(struct ifqueue *ifq)
@ -490,8 +490,8 @@ int ifiq_input(struct ifiqueue *, struct mbuf_list *);
int ifiq_enqueue(struct ifiqueue *, struct mbuf *);
void ifiq_add_data(struct ifiqueue *, struct if_data *);
#define ifiq_len(_ifiq) READ_ONCE(ml_len(&(_ifiq)->ifiq_ml))
#define ifiq_empty(_ifiq) (ifiq_len(_ifiq) == 0)
#define ifiq_len(_ifiq) ml_len(&(_ifiq)->ifiq_ml)
#define ifiq_empty(_ifiq) ml_empty(&(_ifiq)->ifiq_ml)
#endif /* _KERNEL */