diff options
Diffstat (limited to 'src/net/80211')
| -rw-r--r-- | src/net/80211/net80211.c | 26 | ||||
| -rw-r--r-- | src/net/80211/rc80211.c | 8 | ||||
| -rw-r--r-- | src/net/80211/sec80211.c | 12 | ||||
| -rw-r--r-- | src/net/80211/wep.c | 10 | ||||
| -rw-r--r-- | src/net/80211/wpa.c | 28 | ||||
| -rw-r--r-- | src/net/80211/wpa_ccmp.c | 12 | ||||
| -rw-r--r-- | src/net/80211/wpa_psk.c | 6 | ||||
| -rw-r--r-- | src/net/80211/wpa_tkip.c | 16 |
8 files changed, 59 insertions, 59 deletions
diff --git a/src/net/80211/net80211.c b/src/net/80211/net80211.c index 40f7ba25f..0069abaa8 100644 --- a/src/net/80211/net80211.c +++ b/src/net/80211/net80211.c @@ -1,5 +1,5 @@ /* - * The gPXE 802.11 MAC layer. + * The iPXE 802.11 MAC layer. * * Copyright (c) 2009 Joshua Oreman <oremanj@rwcr.net>. * @@ -23,15 +23,15 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <string.h> #include <byteswap.h> #include <stdlib.h> -#include <gpxe/settings.h> -#include <gpxe/if_arp.h> -#include <gpxe/ethernet.h> -#include <gpxe/ieee80211.h> -#include <gpxe/netdevice.h> -#include <gpxe/net80211.h> -#include <gpxe/sec80211.h> -#include <gpxe/timer.h> -#include <gpxe/nap.h> +#include <ipxe/settings.h> +#include <ipxe/if_arp.h> +#include <ipxe/ethernet.h> +#include <ipxe/ieee80211.h> +#include <ipxe/netdevice.h> +#include <ipxe/net80211.h> +#include <ipxe/sec80211.h> +#include <ipxe/timer.h> +#include <ipxe/nap.h> #include <unistd.h> #include <errno.h> @@ -248,7 +248,7 @@ struct setting net80211_active_setting __setting = { /** The cryptographic key to use * * For hex WEP keys, as is common, this must be entered using the - * normal gPXE method for entering hex settings; an ASCII string of + * normal iPXE method for entering hex settings; an ASCII string of * hex characters will not behave as expected. */ struct setting net80211_key_setting __setting = { @@ -459,7 +459,7 @@ static inline int net80211_rate_is_erp ( u16 rate ) * being protected and its ACK; add the results of two calls, one with * bytes = 10 and one with bytes set to the next frame's size. * - * No other frame types are currently supported by gPXE. + * No other frame types are currently supported by iPXE. */ u16 net80211_duration ( struct net80211_device *dev, int bytes, u16 rate ) { @@ -1285,7 +1285,7 @@ net80211_marshal_request_info ( struct net80211_device *dev, * @ret ctx Probe context * * Active scanning may only be used on channels 1-11 in the 2.4GHz - * band, due to gPXE's lack of a complete regulatory database. If + * band, due to iPXE's lack of a complete regulatory database. If * active scanning is used, probe packets will be sent on each * channel; this can allow association with hidden-SSID networks if * the SSID is properly specified. diff --git a/src/net/80211/rc80211.c b/src/net/80211/rc80211.c index 5bd191438..56bbc8a06 100644 --- a/src/net/80211/rc80211.c +++ b/src/net/80211/rc80211.c @@ -1,5 +1,5 @@ /* - * Simple 802.11 rate-control algorithm for gPXE. + * Simple 802.11 rate-control algorithm for iPXE. * * Copyright (c) 2009 Joshua Oreman <oremanj@rwcr.net>. * @@ -21,7 +21,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdlib.h> -#include <gpxe/net80211.h> +#include <ipxe/net80211.h> /** * @file @@ -69,11 +69,11 @@ FILE_LICENCE ( GPL2_OR_LATER ); * below some threshold, and try increasing our rate when the goodness * is very high. * - * This system is optimized for gPXE's style of usage. Because normal + * This system is optimized for iPXE's style of usage. Because normal * operation always involves receiving something, we'll make our way * to the best rate pretty quickly. We tend to follow the lead of the * sending AP in choosing rates, but we won't use rates for long that - * don't work well for us in transmission. We assume gPXE won't be + * don't work well for us in transmission. We assume iPXE won't be * running for long enough that rate patterns will change much, so we * don't have to keep time counters or the like. And if this doesn't * work well in practice there are many ways it could be tweaked. diff --git a/src/net/80211/sec80211.c b/src/net/80211/sec80211.c index c5aa1183f..69fad8ffc 100644 --- a/src/net/80211/sec80211.c +++ b/src/net/80211/sec80211.c @@ -21,9 +21,9 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdlib.h> #include <string.h> #include <errno.h> -#include <gpxe/ieee80211.h> -#include <gpxe/net80211.h> -#include <gpxe/sec80211.h> +#include <ipxe/ieee80211.h> +#include <ipxe/net80211.h> +#include <ipxe/sec80211.h> /** @file * @@ -148,8 +148,8 @@ int sec80211_install ( struct net80211_crypto **which, * @v rsnp Pointer to next descriptor count field in RSN IE * @v rsn_end Pointer to end of RSN IE * @v map Descriptor map to use - * @v tbl_start Start of linker table to examine for gPXE support - * @v tbl_end End of linker table to examine for gPXE support + * @v tbl_start Start of linker table to examine for iPXE support + * @v tbl_end End of linker table to examine for iPXE support * @ret rsnp Updated to point to first byte after descriptors * @ret map_ent Descriptor map entry of translation to use * @@ -162,7 +162,7 @@ int sec80211_install ( struct net80211_crypto **which, * will return @c NULL if the input packet is malformed, and otherwise * set @a rsnp to the first byte it has not looked at. It will return * the first cipher in the list that is supported by the current build - * of gPXE, or the first of all if none are supported. + * of iPXE, or the first of all if none are supported. * * We play rather fast and loose with type checking, because this * function is only called from two well-defined places in the diff --git a/src/net/80211/wep.c b/src/net/80211/wep.c index 1c37e0c30..3b1045525 100644 --- a/src/net/80211/wep.c +++ b/src/net/80211/wep.c @@ -18,11 +18,11 @@ FILE_LICENCE ( GPL2_OR_LATER ); -#include <gpxe/net80211.h> -#include <gpxe/sec80211.h> -#include <gpxe/crypto.h> -#include <gpxe/arc4.h> -#include <gpxe/crc32.h> +#include <ipxe/net80211.h> +#include <ipxe/sec80211.h> +#include <ipxe/crypto.h> +#include <ipxe/arc4.h> +#include <ipxe/crc32.h> #include <stdlib.h> #include <string.h> #include <errno.h> diff --git a/src/net/80211/wpa.c b/src/net/80211/wpa.c index 9bac8fe74..3e78c8d58 100644 --- a/src/net/80211/wpa.c +++ b/src/net/80211/wpa.c @@ -18,17 +18,17 @@ FILE_LICENCE ( GPL2_OR_LATER ); -#include <gpxe/net80211.h> -#include <gpxe/sec80211.h> -#include <gpxe/wpa.h> -#include <gpxe/eapol.h> -#include <gpxe/crypto.h> -#include <gpxe/arc4.h> -#include <gpxe/crc32.h> -#include <gpxe/sha1.h> -#include <gpxe/hmac.h> -#include <gpxe/list.h> -#include <gpxe/ethernet.h> +#include <ipxe/net80211.h> +#include <ipxe/sec80211.h> +#include <ipxe/wpa.h> +#include <ipxe/eapol.h> +#include <ipxe/crypto.h> +#include <ipxe/arc4.h> +#include <ipxe/crc32.h> +#include <ipxe/sha1.h> +#include <ipxe/hmac.h> +#include <ipxe/list.h> +#include <ipxe/ethernet.h> #include <stdlib.h> #include <string.h> #include <errno.h> @@ -63,7 +63,7 @@ static int wpa_fail ( struct wpa_common_ctx *ctx, int rc ) * @v crypt Cryptosystem ID * @ret crypto Cryptosystem handler structure * - * If support for @a crypt is not compiled in to gPXE, or if @a crypt + * If support for @a crypt is not compiled in to iPXE, or if @a crypt * is NET80211_CRYPT_UNKNOWN, returns @c NULL. */ static struct net80211_crypto * @@ -110,7 +110,7 @@ struct wpa_kie * wpa_find_kie ( int version ) * information element suitable for including in an association * request frame to the network identified by @c dev->associating. * If it is impossible to construct an information element consistent - * with gPXE's capabilities that is compatible with that network, or + * with iPXE's capabilities that is compatible with that network, or * if none should be sent because that network's beacon included no * security information, returns an error indication and leaves * @a ie_ret unchanged. @@ -777,7 +777,7 @@ static int wpa_handle_1_of_2 ( struct wpa_common_ctx *ctx, * So from an old WPA host, 3/4 does not contain an * encapsulated GTK. The first frame of the GK handshake * contains it, encrypted, but without a KDE wrapper, and with - * the key ID field (which gPXE doesn't use) shoved away in + * the key ID field (which iPXE doesn't use) shoved away in * the reserved bits in the info field, and the TxRx bit * stealing the Install bit's spot. */ diff --git a/src/net/80211/wpa_ccmp.c b/src/net/80211/wpa_ccmp.c index 08b1e17b6..89bb36fd8 100644 --- a/src/net/80211/wpa_ccmp.c +++ b/src/net/80211/wpa_ccmp.c @@ -18,12 +18,12 @@ FILE_LICENCE ( GPL2_OR_LATER ); -#include <gpxe/net80211.h> -#include <gpxe/crypto.h> -#include <gpxe/hmac.h> -#include <gpxe/sha1.h> -#include <gpxe/aes.h> -#include <gpxe/wpa.h> +#include <ipxe/net80211.h> +#include <ipxe/crypto.h> +#include <ipxe/hmac.h> +#include <ipxe/sha1.h> +#include <ipxe/aes.h> +#include <ipxe/wpa.h> #include <byteswap.h> #include <errno.h> diff --git a/src/net/80211/wpa_psk.c b/src/net/80211/wpa_psk.c index e75216825..780738e79 100644 --- a/src/net/80211/wpa_psk.c +++ b/src/net/80211/wpa_psk.c @@ -18,9 +18,9 @@ FILE_LICENCE ( GPL2_OR_LATER ); -#include <gpxe/net80211.h> -#include <gpxe/sha1.h> -#include <gpxe/wpa.h> +#include <ipxe/net80211.h> +#include <ipxe/sha1.h> +#include <ipxe/wpa.h> #include <errno.h> /** @file diff --git a/src/net/80211/wpa_tkip.c b/src/net/80211/wpa_tkip.c index 0cb697fa5..0a94df07e 100644 --- a/src/net/80211/wpa_tkip.c +++ b/src/net/80211/wpa_tkip.c @@ -18,14 +18,14 @@ FILE_LICENCE ( GPL2_OR_LATER ); -#include <gpxe/net80211.h> -#include <gpxe/crypto.h> -#include <gpxe/hmac.h> -#include <gpxe/sha1.h> -#include <gpxe/md5.h> -#include <gpxe/crc32.h> -#include <gpxe/arc4.h> -#include <gpxe/wpa.h> +#include <ipxe/net80211.h> +#include <ipxe/crypto.h> +#include <ipxe/hmac.h> +#include <ipxe/sha1.h> +#include <ipxe/md5.h> +#include <ipxe/crc32.h> +#include <ipxe/arc4.h> +#include <ipxe/wpa.h> #include <byteswap.h> #include <errno.h> |