Page MenuHomeFreeBSD
Files F149734180

D54605.1790815417.diff
No OneTemporary
Actions

Size
1 KB
Referenced Files
None
Subscribers
None

D54605.1790815417.diff
View Options

diff --git a/sys/net/iflib.c b/sys/net/iflib.c
--- a/sys/net/iflib.c
+++ b/sys/net/iflib.c
@@ -485,59 +485,16 @@
iflib_fl_t ifsd_fl;
} *if_rxsd_t;
-/* multiple of word size */
-#ifdef __LP64__
-#define PKT_INFO_SIZE 7
-#define RXD_INFO_SIZE 5
-#define PKT_TYPE uint64_t
-#else
-#define PKT_INFO_SIZE 12
-#define RXD_INFO_SIZE 8
-#define PKT_TYPE uint32_t
-#endif
-#define PKT_LOOP_BOUND ((PKT_INFO_SIZE / 3) * 3)
-#define RXD_LOOP_BOUND ((RXD_INFO_SIZE / 4) * 4)
-
-typedef struct if_pkt_info_pad {
- PKT_TYPE pkt_val[PKT_INFO_SIZE];
-} *if_pkt_info_pad_t;
-typedef struct if_rxd_info_pad {
- PKT_TYPE rxd_val[RXD_INFO_SIZE];
-} *if_rxd_info_pad_t;
-
-CTASSERT(sizeof(struct if_pkt_info_pad) == sizeof(struct if_pkt_info));
-CTASSERT(sizeof(struct if_rxd_info_pad) == sizeof(struct if_rxd_info));
-
static inline void
pkt_info_zero(if_pkt_info_t pi)
{
- if_pkt_info_pad_t pi_pad;
-
- pi_pad = (if_pkt_info_pad_t)pi;
- pi_pad->pkt_val[0] = 0; pi_pad->pkt_val[1] = 0; pi_pad->pkt_val[2] = 0;
- pi_pad->pkt_val[3] = 0; pi_pad->pkt_val[4] = 0; pi_pad->pkt_val[5] = 0;
-#ifndef __LP64__
- pi_pad->pkt_val[6] = 0; pi_pad->pkt_val[7] = 0; pi_pad->pkt_val[8] = 0;
- pi_pad->pkt_val[9] = 0; pi_pad->pkt_val[10] = 0;
-#endif
+ memset(pi, 0, sizeof(*pi));
}
static inline void
rxd_info_zero(if_rxd_info_t ri)
{
- if_rxd_info_pad_t ri_pad;
- int i;
-
- ri_pad = (if_rxd_info_pad_t)ri;
- for (i = 0; i < RXD_LOOP_BOUND; i += 4) {
- ri_pad->rxd_val[i] = 0;
- ri_pad->rxd_val[i + 1] = 0;
- ri_pad->rxd_val[i + 2] = 0;
- ri_pad->rxd_val[i + 3] = 0;
- }
-#ifdef __LP64__
- ri_pad->rxd_val[RXD_INFO_SIZE - 1] = 0;
-#endif
+ memset(ri, 0, sizeof(*ri));
}
/*

File Metadata

Mime Type
text/plain
Expires
Thu, Oct 1, 12:43 AM (3 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30050246
Default Alt Text
D54605.1790815417.diff (1 KB)

Event Timeline