Page MenuHomeFreeBSD
Files F142600351

D39024.diff
No OneTemporary
Actions

D39024.diff
View Options

diff --git a/sys/net/if_infiniband.c b/sys/net/if_infiniband.c
--- a/sys/net/if_infiniband.c
+++ b/sys/net/if_infiniband.c
@@ -128,6 +128,9 @@
struct infiniband_header *ibh;
struct ether_header eh;
+ if (!bpf_peers_present(ifp->if_bpf))
+ return;
+
if (mb->m_len < sizeof(*ibh))
return;
@@ -439,7 +442,7 @@
}
/* Let BPF have it before we strip the header. */
- INFINIBAND_BPF_MTAP(ifp, m);
+ infiniband_bpf_mtap(ifp, m);
/* Allow monitor mode to claim this frame, after stats are updated. */
if (ifp->if_flags & IFF_MONITOR) {
diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c
--- a/sys/net/if_lagg.c
+++ b/sys/net/if_lagg.c
@@ -2154,7 +2154,7 @@
return (ENXIO);
}
- INFINIBAND_BPF_MTAP(ifp, m);
+ infiniband_bpf_mtap(ifp, m);
error = lagg_proto_start(sc, m);
NET_EPOCH_EXIT(et);
@@ -2222,7 +2222,7 @@
return (NULL);
}
- INFINIBAND_BPF_MTAP(scifp, m);
+ infiniband_bpf_mtap(scifp, m);
m = lagg_proto_input(sc, lp, m);
if (m != NULL && (scifp->if_flags & IFF_MONITOR) != 0) {
diff --git a/sys/net/infiniband.h b/sys/net/infiniband.h
--- a/sys/net/infiniband.h
+++ b/sys/net/infiniband.h
@@ -41,14 +41,6 @@
#define INFINIBAND_IS_MULTICAST(addr) \
((addr)[4] == 0xff)
-#define INFINIBAND_BPF_MTAP(_ifp, _m) \
-do { \
- if (bpf_peers_present((_ifp)->if_bpf)) { \
- M_ASSERTVALID(_m); \
- infiniband_bpf_mtap(_ifp, _m); \
- } \
-} while (0)
-
struct infiniband_header {
uint8_t ib_hwaddr[INFINIBAND_ADDR_LEN];
uint16_t ib_protocol; /* big endian */
diff --git a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
--- a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -747,7 +747,7 @@
IFQ_DRV_DEQUEUE(&dev->if_snd, mb);
if (mb == NULL)
break;
- INFINIBAND_BPF_MTAP(dev, mb);
+ infiniband_bpf_mtap(dev, mb);
ipoib_send_one(priv, mb);
}
}

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 22, 10:08 AM (17 m, 59 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27840946
Default Alt Text
D39024.diff (1 KB)

Event Timeline