Page MenuHomeFreeBSD
Files F136288531

D31873.id94836.diff
No OneTemporary
Actions

D31873.id94836.diff
View Options

Index: sys/net/pfvar.h
===================================================================
--- sys/net/pfvar.h
+++ sys/net/pfvar.h
@@ -561,8 +561,8 @@
};
struct pf_rule_actions {
- u_int32_t qid;
- u_int32_t pqid;
+ uint16_t qid;
+ uint16_t pqid;
};
union pf_krule_ptr {
@@ -606,8 +606,8 @@
u_int32_t limit;
u_int32_t seconds;
} max_src_conn_rate;
- u_int32_t qid;
- u_int32_t pqid;
+ u_int16_t qid;
+ u_int16_t pqid;
u_int32_t nr;
u_int32_t prob;
uid_t cuid;
@@ -856,8 +856,8 @@
u_int32_t creation;
u_int32_t expire;
u_int32_t pfsync_time;
- u_int32_t qid;
- u_int32_t pqid;
+ u_int16_t qid;
+ u_int16_t pqid;
u_int16_t tag;
u_int8_t log;
};
Index: sys/netpfil/pf/pf_altq.h
===================================================================
--- sys/netpfil/pf/pf_altq.h
+++ sys/netpfil/pf/pf_altq.h
@@ -220,7 +220,7 @@
struct fairq_opts fairq_opts;
} pq_u;
- uint32_t qid; /* return value */
+ uint16_t qid; /* return value */
};
#endif /* _KERNEL */
Index: sys/netpfil/pf/pf_ioctl.c
===================================================================
--- sys/netpfil/pf/pf_ioctl.c
+++ sys/netpfil/pf/pf_ioctl.c
@@ -112,8 +112,8 @@
static int pf_commit_altq(u_int32_t);
static int pf_enable_altq(struct pf_altq *);
static int pf_disable_altq(struct pf_altq *);
-static u_int32_t pf_qname2qid(const char *);
-static void pf_qid_unref(u_int32_t);
+static uint16_t pf_qname2qid(const char *);
+static void pf_qid_unref(uint16_t);
#endif /* ALTQ */
static int pf_begin_rules(u_int32_t *, int, const char *);
static int pf_rollback_rules(u_int32_t, int, char *);
@@ -653,23 +653,23 @@
}
}
-static u_int16_t
+static uint16_t
pf_tagname2tag(const char *tagname)
{
return (tagname2tag(&V_pf_tags, tagname));
}
#ifdef ALTQ
-static u_int32_t
+static uint16_t
pf_qname2qid(const char *qname)
{
- return ((u_int32_t)tagname2tag(&V_pf_qids, qname));
+ return (tagname2tag(&V_pf_qids, qname));
}
static void
-pf_qid_unref(u_int32_t qid)
+pf_qid_unref(uint16_t qid)
{
- tag_unref(&V_pf_qids, (u_int16_t)qid);
+ tag_unref(&V_pf_qids, qid);
}
static int
Index: sys/netpfil/pf/pf_mtag.h
===================================================================
--- sys/netpfil/pf/pf_mtag.h
+++ sys/netpfil/pf/pf_mtag.h
@@ -47,7 +47,7 @@
struct pf_mtag {
void *hdr; /* saved hdr pos in mbuf, for ECN */
- u_int32_t qid; /* queue id */
+ u_int16_t qid; /* queue id */
u_int32_t qid_hash; /* queue hashid used by WFQ like algos */
u_int16_t tag; /* tag id */
u_int8_t flags;

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 18, 1:22 AM (12 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25467921
Default Alt Text
D31873.id94836.diff (2 KB)

Event Timeline