Page MenuHomeFreeBSD
Differential D14628

Wrap protection frame allocation into ieee80211_alloc_prot()
ClosedPublic
Actions

Authored by avos on Mar 9 2018, 1:01 AM.
Tags
None
Referenced Files
Unknown Object (File)
Feb 23 2025, 5:25 PM
Unknown Object (File)
Feb 10 2025, 4:26 AM
Unknown Object (File)
Jan 27 2025, 7:54 PM
Unknown Object (File)
Jan 25 2025, 7:41 PM
Unknown Object (File)
Jan 24 2025, 5:19 PM
Unknown Object (File)
Jan 24 2025, 6:24 AM
Unknown Object (File)
Jan 18 2025, 9:18 PM
Unknown Object (File)
Jan 6 2025, 9:43 PM
View All 48 Files
Subscribers
imp

Details

Reviewers
adrian
Commits
rS330688: net80211: wrap protection frame allocation into ieee80211_alloc_prot()
Summary

Move copy-pasted code for RTS/CTS frame allocation into net80211.

While here, add stat / debug message for allocation failures (copied from run(4)) + return error here in bwn(4).

Test Plan

Untested; should be (mostly) no-op.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

avos created this revision.Mar 9 2018, 1:01 AM
Herald added a subscriber: imp. · View Herald TranscriptMar 9 2018, 1:01 AM
adrian accepted this revision.Mar 9 2018, 2:41 AM

It looks good! It'd be fun to try and RTS/CTS protect longer bursts, but that can always come later!

This revision is now accepted and ready to land.Mar 9 2018, 2:41 AM
Closed by commit rS330688: net80211: wrap protection frame allocation into ieee80211_alloc_prot() (authored by avos). · Explain WhyMar 9 2018, 11:34 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
head/
sys/
dev/
bwn/
78 lines
ral/
35 lines
35 lines
usb/
wlan/
32 lines
36 lines
34 lines
net80211/
33 lines
2 lines

Diff 40100

View Options

head/sys/dev/bwn/if_bwn.c

Show First 20 Lines • Show All 45 Lines • ▼ Show 20 Lines
#include <sys/poll.h> #include <sys/poll.h>
#include <sys/priv.h> #include <sys/priv.h>
#include <sys/proc.h> #include <sys/proc.h>
#include <sys/condvar.h> #include <sys/condvar.h>
#include <sys/queue.h> #include <sys/queue.h>
#include <machine/bus.h> #include <machine/bus.h>
#include <sys/random.h> #include <sys/random.h>
#include <sys/rman.h> #include <sys/rman.h>
#include <sys/sbuf.h>
#include <sys/selinfo.h> #include <sys/selinfo.h>
#include <sys/signalvar.h> #include <sys/signalvar.h>
#include <sys/smp.h> #include <sys/smp.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <sys/systm.h> #include <sys/systm.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <sys/bus.h> #include <sys/bus.h>
#include <sys/interrupt.h> #include <sys/interrupt.h>
▲ Show 20 Lines • Show All 792 Lines • ▼ Show 20 Lines
* @brief safely quotes strings that might have double quotes in them. * @brief safely quotes strings that might have double quotes in them.
* *
* The devctl protocol relies on quoted strings having matching quotes. * The devctl protocol relies on quoted strings having matching quotes.
* This routine quotes any internal quotes so the resulting string * This routine quotes any internal quotes so the resulting string
* is safe to pass to snprintf to construct, for example pnp info strings. * is safe to pass to snprintf to construct, for example pnp info strings.
* Strings are always terminated with a NUL, but may be truncated if longer * Strings are always terminated with a NUL, but may be truncated if longer
* than @p len bytes after quotes. * than @p len bytes after quotes.
* *
* @param dst Buffer to hold the string. Must be at least @p len bytes long * @param sb sbuf to place the characters into
* @param src Original buffer. * @param src Original buffer.
* @param len Length of buffer pointed to by @dst, including trailing NUL
*/ */
void void
devctl_safe_quote(char *dst, const char *src, size_t len) devctl_safe_quote_sb(struct sbuf *sb, const char *src)
{ {
char *walker = dst, *ep = dst + len - 1;
if (len == 0) while (*src != '\0') {
return; if (*src == '"' || *src == '\\')
while (src != NULL && walker < ep) sbuf_putc(sb, '\\');
{ sbuf_putc(sb, *src++);
if (*src == '"' || *src == '\\') {
if (ep - walker < 2)
break;
*walker++ = '\\';
} }
*walker++ = *src++;
}
*walker = '\0';
} }
/* End of /dev/devctl code */ /* End of /dev/devctl code */
static TAILQ_HEAD(,device) bus_data_devices; static TAILQ_HEAD(,device) bus_data_devices;
static int bus_data_generation = 1; static int bus_data_generation = 1;
static kobj_method_t null_methods[] = { static kobj_method_t null_methods[] = {
▲ Show 20 Lines • Show All 4,853 Lines • Show Last 20 Lines
View Options

head/sys/dev/ral/rt2560.c

Show First 20 Lines • Show All 45 Lines • ▼ Show 20 Lines
#include <sys/poll.h> #include <sys/poll.h>
#include <sys/priv.h> #include <sys/priv.h>
#include <sys/proc.h> #include <sys/proc.h>
#include <sys/condvar.h> #include <sys/condvar.h>
#include <sys/queue.h> #include <sys/queue.h>
#include <machine/bus.h> #include <machine/bus.h>
#include <sys/random.h> #include <sys/random.h>
#include <sys/rman.h> #include <sys/rman.h>
#include <sys/sbuf.h>
#include <sys/selinfo.h> #include <sys/selinfo.h>
#include <sys/signalvar.h> #include <sys/signalvar.h>
#include <sys/smp.h> #include <sys/smp.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <sys/systm.h> #include <sys/systm.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <sys/bus.h> #include <sys/bus.h>
#include <sys/interrupt.h> #include <sys/interrupt.h>
▲ Show 20 Lines • Show All 792 Lines • ▼ Show 20 Lines
* @brief safely quotes strings that might have double quotes in them. * @brief safely quotes strings that might have double quotes in them.
* *
* The devctl protocol relies on quoted strings having matching quotes. * The devctl protocol relies on quoted strings having matching quotes.
* This routine quotes any internal quotes so the resulting string * This routine quotes any internal quotes so the resulting string
* is safe to pass to snprintf to construct, for example pnp info strings. * is safe to pass to snprintf to construct, for example pnp info strings.
* Strings are always terminated with a NUL, but may be truncated if longer * Strings are always terminated with a NUL, but may be truncated if longer
* than @p len bytes after quotes. * than @p len bytes after quotes.
* *
* @param dst Buffer to hold the string. Must be at least @p len bytes long * @param sb sbuf to place the characters into
* @param src Original buffer. * @param src Original buffer.
* @param len Length of buffer pointed to by @dst, including trailing NUL
*/ */
void void
devctl_safe_quote(char *dst, const char *src, size_t len) devctl_safe_quote_sb(struct sbuf *sb, const char *src)
{ {
char *walker = dst, *ep = dst + len - 1;
if (len == 0) while (*src != '\0') {
return; if (*src == '"' || *src == '\\')
while (src != NULL && walker < ep) sbuf_putc(sb, '\\');
{ sbuf_putc(sb, *src++);
if (*src == '"' || *src == '\\') {
if (ep - walker < 2)
break;
*walker++ = '\\';
} }
*walker++ = *src++;
}
*walker = '\0';
} }
/* End of /dev/devctl code */ /* End of /dev/devctl code */
static TAILQ_HEAD(,device) bus_data_devices; static TAILQ_HEAD(,device) bus_data_devices;
static int bus_data_generation = 1; static int bus_data_generation = 1;
static kobj_method_t null_methods[] = { static kobj_method_t null_methods[] = {
▲ Show 20 Lines • Show All 4,853 Lines • Show Last 20 Lines
View Options

head/sys/dev/ral/rt2661.c

Show First 20 Lines • Show All 45 Lines • ▼ Show 20 Lines
#include <sys/poll.h> #include <sys/poll.h>
#include <sys/priv.h> #include <sys/priv.h>
#include <sys/proc.h> #include <sys/proc.h>
#include <sys/condvar.h> #include <sys/condvar.h>
#include <sys/queue.h> #include <sys/queue.h>
#include <machine/bus.h> #include <machine/bus.h>
#include <sys/random.h> #include <sys/random.h>
#include <sys/rman.h> #include <sys/rman.h>
#include <sys/sbuf.h>
#include <sys/selinfo.h> #include <sys/selinfo.h>
#include <sys/signalvar.h> #include <sys/signalvar.h>
#include <sys/smp.h> #include <sys/smp.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <sys/systm.h> #include <sys/systm.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <sys/bus.h> #include <sys/bus.h>
#include <sys/interrupt.h> #include <sys/interrupt.h>
▲ Show 20 Lines • Show All 792 Lines • ▼ Show 20 Lines
* @brief safely quotes strings that might have double quotes in them. * @brief safely quotes strings that might have double quotes in them.
* *
* The devctl protocol relies on quoted strings having matching quotes. * The devctl protocol relies on quoted strings having matching quotes.
* This routine quotes any internal quotes so the resulting string * This routine quotes any internal quotes so the resulting string
* is safe to pass to snprintf to construct, for example pnp info strings. * is safe to pass to snprintf to construct, for example pnp info strings.
* Strings are always terminated with a NUL, but may be truncated if longer * Strings are always terminated with a NUL, but may be truncated if longer
* than @p len bytes after quotes. * than @p len bytes after quotes.
* *
* @param dst Buffer to hold the string. Must be at least @p len bytes long * @param sb sbuf to place the characters into
* @param src Original buffer. * @param src Original buffer.
* @param len Length of buffer pointed to by @dst, including trailing NUL
*/ */
void void
devctl_safe_quote(char *dst, const char *src, size_t len) devctl_safe_quote_sb(struct sbuf *sb, const char *src)
{ {
char *walker = dst, *ep = dst + len - 1;
if (len == 0) while (*src != '\0') {
return; if (*src == '"' || *src == '\\')
while (src != NULL && walker < ep) sbuf_putc(sb, '\\');
{ sbuf_putc(sb, *src++);
if (*src == '"' || *src == '\\') {
if (ep - walker < 2)
break;
*walker++ = '\\';
} }
*walker++ = *src++;
}
*walker = '\0';
} }
/* End of /dev/devctl code */ /* End of /dev/devctl code */
static TAILQ_HEAD(,device) bus_data_devices; static TAILQ_HEAD(,device) bus_data_devices;
static int bus_data_generation = 1; static int bus_data_generation = 1;
static kobj_method_t null_methods[] = { static kobj_method_t null_methods[] = {
▲ Show 20 Lines • Show All 4,853 Lines • Show Last 20 Lines
View Options

head/sys/dev/usb/wlan/if_rum.c

Show First 20 Lines • Show All 45 Lines • ▼ Show 20 Lines
#include <sys/poll.h> #include <sys/poll.h>
#include <sys/priv.h> #include <sys/priv.h>
#include <sys/proc.h> #include <sys/proc.h>
#include <sys/condvar.h> #include <sys/condvar.h>
#include <sys/queue.h> #include <sys/queue.h>
#include <machine/bus.h> #include <machine/bus.h>
#include <sys/random.h> #include <sys/random.h>
#include <sys/rman.h> #include <sys/rman.h>
#include <sys/sbuf.h>
#include <sys/selinfo.h> #include <sys/selinfo.h>
#include <sys/signalvar.h> #include <sys/signalvar.h>
#include <sys/smp.h> #include <sys/smp.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <sys/systm.h> #include <sys/systm.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <sys/bus.h> #include <sys/bus.h>
#include <sys/interrupt.h> #include <sys/interrupt.h>
▲ Show 20 Lines • Show All 792 Lines • ▼ Show 20 Lines
* @brief safely quotes strings that might have double quotes in them. * @brief safely quotes strings that might have double quotes in them.
* *
* The devctl protocol relies on quoted strings having matching quotes. * The devctl protocol relies on quoted strings having matching quotes.
* This routine quotes any internal quotes so the resulting string * This routine quotes any internal quotes so the resulting string
* is safe to pass to snprintf to construct, for example pnp info strings. * is safe to pass to snprintf to construct, for example pnp info strings.
* Strings are always terminated with a NUL, but may be truncated if longer * Strings are always terminated with a NUL, but may be truncated if longer
* than @p len bytes after quotes. * than @p len bytes after quotes.
* *
* @param dst Buffer to hold the string. Must be at least @p len bytes long * @param sb sbuf to place the characters into
* @param src Original buffer. * @param src Original buffer.
* @param len Length of buffer pointed to by @dst, including trailing NUL
*/ */
void void
devctl_safe_quote(char *dst, const char *src, size_t len) devctl_safe_quote_sb(struct sbuf *sb, const char *src)
{ {
char *walker = dst, *ep = dst + len - 1;
if (len == 0) while (*src != '\0') {
return; if (*src == '"' || *src == '\\')
while (src != NULL && walker < ep) sbuf_putc(sb, '\\');
{ sbuf_putc(sb, *src++);
if (*src == '"' || *src == '\\') {
if (ep - walker < 2)
break;
*walker++ = '\\';
} }
*walker++ = *src++;
}
*walker = '\0';
} }
/* End of /dev/devctl code */ /* End of /dev/devctl code */
static TAILQ_HEAD(,device) bus_data_devices; static TAILQ_HEAD(,device) bus_data_devices;
static int bus_data_generation = 1; static int bus_data_generation = 1;
static kobj_method_t null_methods[] = { static kobj_method_t null_methods[] = {
▲ Show 20 Lines • Show All 4,853 Lines • Show Last 20 Lines
View Options

head/sys/dev/usb/wlan/if_run.c

Show First 20 Lines • Show All 45 Lines • ▼ Show 20 Lines
#include <sys/poll.h> #include <sys/poll.h>
#include <sys/priv.h> #include <sys/priv.h>
#include <sys/proc.h> #include <sys/proc.h>
#include <sys/condvar.h> #include <sys/condvar.h>
#include <sys/queue.h> #include <sys/queue.h>
#include <machine/bus.h> #include <machine/bus.h>
#include <sys/random.h> #include <sys/random.h>
#include <sys/rman.h> #include <sys/rman.h>
#include <sys/sbuf.h>
#include <sys/selinfo.h> #include <sys/selinfo.h>
#include <sys/signalvar.h> #include <sys/signalvar.h>
#include <sys/smp.h> #include <sys/smp.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <sys/systm.h> #include <sys/systm.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <sys/bus.h> #include <sys/bus.h>
#include <sys/interrupt.h> #include <sys/interrupt.h>
▲ Show 20 Lines • Show All 792 Lines • ▼ Show 20 Lines
* @brief safely quotes strings that might have double quotes in them. * @brief safely quotes strings that might have double quotes in them.
* *
* The devctl protocol relies on quoted strings having matching quotes. * The devctl protocol relies on quoted strings having matching quotes.
* This routine quotes any internal quotes so the resulting string * This routine quotes any internal quotes so the resulting string
* is safe to pass to snprintf to construct, for example pnp info strings. * is safe to pass to snprintf to construct, for example pnp info strings.
* Strings are always terminated with a NUL, but may be truncated if longer * Strings are always terminated with a NUL, but may be truncated if longer
* than @p len bytes after quotes. * than @p len bytes after quotes.
* *
* @param dst Buffer to hold the string. Must be at least @p len bytes long * @param sb sbuf to place the characters into
* @param src Original buffer. * @param src Original buffer.
* @param len Length of buffer pointed to by @dst, including trailing NUL
*/ */
void void
devctl_safe_quote(char *dst, const char *src, size_t len) devctl_safe_quote_sb(struct sbuf *sb, const char *src)
{ {
char *walker = dst, *ep = dst + len - 1;
if (len == 0) while (*src != '\0') {
return; if (*src == '"' || *src == '\\')
while (src != NULL && walker < ep) sbuf_putc(sb, '\\');
{ sbuf_putc(sb, *src++);
if (*src == '"' || *src == '\\') {
if (ep - walker < 2)
break;
*walker++ = '\\';
} }
*walker++ = *src++;
}
*walker = '\0';
} }
/* End of /dev/devctl code */ /* End of /dev/devctl code */
static TAILQ_HEAD(,device) bus_data_devices; static TAILQ_HEAD(,device) bus_data_devices;
static int bus_data_generation = 1; static int bus_data_generation = 1;
static kobj_method_t null_methods[] = { static kobj_method_t null_methods[] = {
▲ Show 20 Lines • Show All 4,853 Lines • Show Last 20 Lines
View Options

head/sys/dev/usb/wlan/if_ural.c

Loading...
View Options

head/sys/net80211/ieee80211_output.c

Loading...
View Options

head/sys/net80211/ieee80211_proto.h

Loading...