Commit 11015cf7 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez

crda: make usage of regdb.h exclusive to reglib.c

The only other remaining user of regdb.h is regdbdump tool
but as I see it this utility can exist in either a reglib
library, or on each OS for its own specific adaptation of
the reglib code. For now we just make regdbump use the local
copy of nl80211.h. Later the reglib library can have its own
print / dump utility if we deem it necessary.
Signed-off-by: 's avatarLuis R. Rodriguez <mcgrof@frijolero.org>
parent 1dce4105
......@@ -2,6 +2,9 @@
#include <stdio.h>
#include <string.h>
#include <arpa/inet.h>
#include "nl80211.h"
#include "reglib.h"
static void print_reg_rule(struct ieee80211_reg_rule *rule)
......@@ -29,23 +32,23 @@ static void print_reg_rule(struct ieee80211_reg_rule *rule)
else
printf("N/A)");
if (rule->flags & RRF_NO_OFDM)
if (rule->flags & NL80211_RRF_NO_OFDM)
printf(", NO-OFDM");
if (rule->flags & RRF_NO_CCK)
if (rule->flags & NL80211_RRF_NO_CCK)
printf(", NO-CCK");
if (rule->flags & RRF_NO_INDOOR)
if (rule->flags & NL80211_RRF_NO_INDOOR)
printf(", NO-INDOOR");
if (rule->flags & RRF_NO_OUTDOOR)
if (rule->flags & NL80211_RRF_NO_OUTDOOR)
printf(", NO-OUTDOOR");
if (rule->flags & RRF_DFS)
if (rule->flags & NL80211_RRF_DFS)
printf(", DFS");
if (rule->flags & RRF_PTP_ONLY)
if (rule->flags & NL80211_RRF_PTP_ONLY)
printf(", PTP-ONLY");
if (rule->flags & RRF_PTMP_ONLY)
if (rule->flags & NL80211_RRF_PTMP_ONLY)
printf(", PTMP-ONLY");
if (rule->flags & RRF_PASSIVE_SCAN)
if (rule->flags & NL80211_RRF_PASSIVE_SCAN)
printf(", PASSIVE-SCAN");
if (rule->flags & RRF_NO_IBSS)
if (rule->flags & NL80211_RRF_NO_IBSS)
printf(", NO-IBSS");
printf("\n");
......
......@@ -13,6 +13,7 @@
#include <arpa/inet.h> /* ntohl */
#include "reglib.h"
#include "regdb.h"
#ifdef USE_OPENSSL
#include <openssl/objects.h>
......
......@@ -4,8 +4,6 @@
#include <stdlib.h>
#include <stdint.h>
#include "regdb.h"
/* Common regulatory structures, functions and helpers */
/* This matches the kernel's data structures */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment