aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--at76_usb.c13
-rw-r--r--at76_usb.h15
2 files changed, 13 insertions, 15 deletions
diff --git a/at76_usb.c b/at76_usb.c
index a1f9131..83eb5d3 100644
--- a/at76_usb.c
+++ b/at76_usb.c
@@ -205,6 +205,15 @@ static int at76_set_iroaming(struct at76_priv *dev, int onoff);
static void at76_set_monitor_mode(struct at76_priv *dev);
static int at76_init_new_device(struct at76_priv *dev);
+/* the supported rates of this hardware, bit7 marks a basic rate */
+static const u8 hw_rates[] = { 0x82, 0x84, 0x0b, 0x16 };
+/* The frequency of each channel in MHz */
+static const long channel_frequency[] = {
+ 2412, 2417, 2422, 2427, 2432, 2437, 2442,
+ 2447, 2452, 2457, 2462, 2467, 2472, 2484
+};
+#define NUM_CHANNELS ARRAY_SIZE(channel_frequency)
+
/* Firmware download */
/* DFU states */
#define STATE_IDLE 0x00
@@ -3296,6 +3305,10 @@ SNAP (802.3 with 802.2 and SNAP headers)
<-- 3 --> <-- 2 --> <-38-1492->
*/
+static const u8 snapsig[] = { 0xaa, 0xaa, 0x03 };
+/* RFC 1042 encapsulates Ethernet frames in 802.2 SNAP (0xaa, 0xaa, 0x03) with
+ * a SNAP OID of 0 (0x00, 0x00, 0x00) */
+static const u8 rfc1042sig[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
/* Convert the 802.11 header on a packet into an ethernet-style header
* (basically, pretend we're an ethernet card receiving ethernet packets)
diff --git a/at76_usb.h b/at76_usb.h
index 411c2b5..a74b3c5 100644
--- a/at76_usb.h
+++ b/at76_usb.h
@@ -364,11 +364,6 @@ struct mib_mdomain {
u8 channel_list[14]; /* 0 for invalid channels */
} __attribute__ ((packed));
-static u8 snapsig[] = { 0xaa, 0xaa, 0x03 };
-
-/* RFC 1042 encapsulates Ethernet frames in 802.2 SNAP (0xaa, 0xaa, 0x03) with
- * a SNAP OID of 0 (0x00, 0x00, 0x00) */
-static u8 rfc1042sig[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
/* states in infrastructure mode */
enum infra_state {
@@ -643,16 +638,6 @@ struct at76_rx_radiotap {
#define MAX_RTS_THRESHOLD (MAX_FRAG_THRESHOLD + 1)
-/* The frequency of each channel in MHz */
-static const long channel_frequency[] = {
- 2412, 2417, 2422, 2427, 2432, 2437, 2442,
- 2447, 2452, 2457, 2462, 2467, 2472, 2484
-};
-#define NUM_CHANNELS ARRAY_SIZE(channel_frequency)
-
-/* the supported rates of this hardware, bit7 marks a basic rate */
-static const u8 hw_rates[4] = { 0x82, 0x84, 0x0b, 0x16 };
-
/* the max padding size for tx in bytes (see calc_padding) */
#define MAX_PADDING_SIZE 53