The branch stable/13 has been updated by zlei:
URL:
https://cgit.FreeBSD.org/src/commit/?id=7b657faa655ceba6965a8873add57b079b910690
commit 7b657faa655ceba6965a8873add57b079b910690
Author: Zhenlei Huang <z...@freebsd.org>
AuthorDate: 2024-09-20 10:06:22 +0000
Commit: Zhenlei Huang <z...@freebsd.org>
CommitDate: 2024-09-24 05:02:29 +0000
bpf: Some style and white space cleanup
MFC after: 3 days
(cherry picked from commit 1baf6164e4d671ca1547a3096d8ce8fe69ed4e5c)
(cherry picked from commit f97d0c91eefc8568a11ad47f910cdd9dc7826a72)
---
sys/net/bpf.c | 19 +++++++++++--------
sys/net/bpf.h | 54 +++++++++++++++++++++++++++---------------------------
2 files changed, 38 insertions(+), 35 deletions(-)
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index 7aa1dfd302f4..b7c964ac8ac4 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -173,7 +173,7 @@ struct bpf_dltlist32 {
#define BIOCSETFNR32 _IOW('B', 130, struct bpf_program32)
#endif
-#define BPF_LOCK() sx_xlock(&bpf_sx)
+#define BPF_LOCK() sx_xlock(&bpf_sx)
#define BPF_UNLOCK() sx_xunlock(&bpf_sx)
#define BPF_LOCK_ASSERT() sx_assert(&bpf_sx, SA_XLOCKED)
/*
@@ -641,7 +641,10 @@ bpf_movein(struct uio *uio, int linktype, struct ifnet
*ifp, struct mbuf **mp,
if (len < hlen || len - hlen > ifp->if_mtu)
return (EMSGSIZE);
- /* Allocate a mbuf for our write, since m_get2 fails if len >= to
MJUMPAGESIZE, use m_getjcl for bigger buffers */
+ /*
+ * Allocate a mbuf for our write, since m_get2 fails if len >= to
+ * MJUMPAGESIZE, use m_getjcl for bigger buffers
+ */
if (len < MJUMPAGESIZE)
m = m_get2(len, M_WAITOK, MT_DATA, M_PKTHDR);
else if (len <= MJUM9BYTES)
@@ -1019,7 +1022,7 @@ bpfread(struct cdev *dev, struct uio *uio, int ioflag)
d->bd_state = BPF_IDLE;
while (d->bd_hbuf_in_use) {
error = mtx_sleep(&d->bd_hbuf_in_use, &d->bd_lock,
- PRINET|PCATCH, "bd_hbuf", 0);
+ PRINET | PCATCH, "bd_hbuf", 0);
if (error != 0) {
BPFD_UNLOCK(d);
return (error);
@@ -1062,7 +1065,7 @@ bpfread(struct cdev *dev, struct uio *uio, int ioflag)
BPFD_UNLOCK(d);
return (EWOULDBLOCK);
}
- error = msleep(d, &d->bd_lock, PRINET|PCATCH,
+ error = msleep(d, &d->bd_lock, PRINET | PCATCH,
"bpf", d->bd_rtout);
if (error == EINTR || error == ERESTART) {
BPFD_UNLOCK(d);
@@ -2129,7 +2132,7 @@ bpfpoll(struct cdev *dev, int events, struct thread *td)
if (devfs_get_cdevpriv((void **)&d) != 0 || d->bd_bif == NULL)
return (events &
- (POLLHUP|POLLIN|POLLRDNORM|POLLOUT|POLLWRNORM));
+ (POLLHUP | POLLIN | POLLRDNORM | POLLOUT | POLLWRNORM));
/*
* Refresh PID associated with this descriptor.
@@ -3039,7 +3042,7 @@ bpf_stats_sysctl(SYSCTL_HANDLER_ARGS)
return (error);
}
-SYSINIT(bpfdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE,bpf_drvinit,NULL);
+SYSINIT(bpfdev, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, bpf_drvinit, NULL);
#else /* !DEV_BPF && !NETGRAPH_BPF */
@@ -3087,13 +3090,13 @@ bpfdetach(struct ifnet *ifp)
u_int
bpf_filter(const struct bpf_insn *pc, u_char *p, u_int wirelen, u_int buflen)
{
- return -1; /* "no filter" behaviour */
+ return (-1); /* "no filter" behaviour */
}
int
bpf_validate(const struct bpf_insn *f, int len)
{
- return 0; /* false */
+ return (0); /* false */
}
#endif /* !DEV_BPF && !NETGRAPH_BPF */
diff --git a/sys/net/bpf.h b/sys/net/bpf.h
index 2fe8b6a78647..d6213ebd10f4 100644
--- a/sys/net/bpf.h
+++ b/sys/net/bpf.h
@@ -57,7 +57,7 @@ typedef u_int64_t bpf_u_int64;
* BPF_ALIGNMENT.
*/
#define BPF_ALIGNMENT sizeof(long)
-#define BPF_WORDALIGN(x) (((x)+(BPF_ALIGNMENT-1))&~(BPF_ALIGNMENT-1))
+#define BPF_WORDALIGN(x) (((x) + (BPF_ALIGNMENT - 1)) & ~(BPF_ALIGNMENT - 1))
#define BPF_MAXINSNS 512
#define BPF_MAXBUFSIZE 0x80000
@@ -369,8 +369,8 @@ struct bpf_insn {
/*
* Macros for insn array initializers.
*/
-#define BPF_STMT(code, k) { (u_short)(code), 0, 0, k }
-#define BPF_JUMP(code, k, jt, jf) { (u_short)(code), jt, jf, k }
+#define BPF_STMT(code, k) { (u_short)(code), 0, 0, k }
+#define BPF_JUMP(code, k, jt, jf) { (u_short)(code), jt, jf, k }
/*
* Structure to retrieve available DLTs for the interface.
@@ -416,20 +416,20 @@ struct bpf_if_ext {
struct bpfd_list bif_dlist; /* descriptor list */
};
-void bpf_bufheld(struct bpf_d *d);
-int bpf_validate(const struct bpf_insn *, int);
-void bpf_tap(struct bpf_if *, u_char *, u_int);
-void bpf_mtap(struct bpf_if *, struct mbuf *);
-void bpf_mtap2(struct bpf_if *, void *, u_int, struct mbuf *);
-void bpfattach(struct ifnet *, u_int, u_int);
-void bpfattach2(struct ifnet *, u_int, u_int, struct bpf_if **);
-void bpfdetach(struct ifnet *);
+void bpf_bufheld(struct bpf_d *d);
+int bpf_validate(const struct bpf_insn *, int);
+void bpf_tap(struct bpf_if *, u_char *, u_int);
+void bpf_mtap(struct bpf_if *, struct mbuf *);
+void bpf_mtap2(struct bpf_if *, void *, u_int, struct mbuf *);
+void bpfattach(struct ifnet *, u_int, u_int);
+void bpfattach2(struct ifnet *, u_int, u_int, struct bpf_if **);
+void bpfdetach(struct ifnet *);
#ifdef VIMAGE
-int bpf_get_bp_params(struct bpf_if *, u_int *, u_int *);
+int bpf_get_bp_params(struct bpf_if *, u_int *, u_int *);
#endif
-void bpfilterattach(int);
-u_int bpf_filter(const struct bpf_insn *, u_char *, u_int, u_int);
+void bpfilterattach(int);
+u_int bpf_filter(const struct bpf_insn *, u_char *, u_int, u_int);
static __inline bool
bpf_peers_present(struct bpf_if *bpf)
@@ -440,21 +440,21 @@ bpf_peers_present(struct bpf_if *bpf)
return (!CK_LIST_EMPTY(&ext->bif_dlist));
}
-#define BPF_TAP(_ifp,_pkt,_pktlen) do { \
- if (bpf_peers_present((_ifp)->if_bpf)) \
- bpf_tap((_ifp)->if_bpf, (_pkt), (_pktlen)); \
+#define BPF_TAP(_ifp, _pkt, _pktlen) do { \
+ if (bpf_peers_present((_ifp)->if_bpf)) \
+ bpf_tap((_ifp)->if_bpf, (_pkt), (_pktlen)); \
} while (0)
-#define BPF_MTAP(_ifp,_m) do { \
- if (bpf_peers_present((_ifp)->if_bpf)) { \
- M_ASSERTVALID(_m); \
- bpf_mtap((_ifp)->if_bpf, (_m)); \
- } \
+#define BPF_MTAP(_ifp, _m) do {
\
+ if (bpf_peers_present((_ifp)->if_bpf)) { \
+ M_ASSERTVALID(_m); \
+ bpf_mtap((_ifp)->if_bpf, (_m)); \
+ } \
} while (0)
-#define BPF_MTAP2(_ifp,_data,_dlen,_m) do { \
- if (bpf_peers_present((_ifp)->if_bpf)) { \
- M_ASSERTVALID(_m); \
- bpf_mtap2((_ifp)->if_bpf,(_data),(_dlen),(_m)); \
- } \
+#define BPF_MTAP2(_ifp, _data, _dlen, _m) do { \
+ if (bpf_peers_present((_ifp)->if_bpf)) { \
+ M_ASSERTVALID(_m); \
+ bpf_mtap2((_ifp)->if_bpf, (_data), (_dlen), (_m)); \
+ } \
} while (0)
#endif /* _KERNEL */
