Fix protection against multiple inclusion of headers

[madwifi/.git] / tools / athkey.c

diff --git a/tools/athkey.c b/tools/athkey.c
index 8f91d74e847f5656a2085c3283a4650d41b097a2..daaa3cd2008d80e24518d09fae43b94711b5141d 100644 (file)
--- a/tools/athkey.c
+++ b/tools/athkey.c
@@ -63,7 +63,7 @@ static int s = -1;
 static const char *progname;
 
 static void
-checksocket()
+checksocket(void)
 {
        if (s < 0 ? (s = socket(AF_INET, SOCK_DGRAM, 0)) == -1 : 0)
                perror("socket(SOCK_DGRAM)");
@@ -113,12 +113,11 @@ set80211priv(const char *dev, int op, void *data, int len, int show_err)
                                IOCTL_ERR(IEEE80211_IOCTL_RADAR),
                                IOCTL_ERR(IEEE80211_IOCTL_SETKEY),
                                IOCTL_ERR(IEEE80211_IOCTL_DELKEY),
+                               IOCTL_ERR(IEEE80211_IOCTL_HALMAP),
                                IOCTL_ERR(IEEE80211_IOCTL_ADDMAC),
                                IOCTL_ERR(IEEE80211_IOCTL_DELMAC),
                                IOCTL_ERR(IEEE80211_IOCTL_WDSADDMAC),
                                IOCTL_ERR(IEEE80211_IOCTL_WDSDELMAC),
-                               IOCTL_ERR(IEEE80211_IOCTL_READREG),
-                               IOCTL_ERR(IEEE80211_IOCTL_WRITEREG),
                        };
                        if (IEEE80211_IOCTL_SETPARAM <= op &&
                            op <= IEEE80211_IOCTL_SETCHANLIST)
@@ -207,7 +206,7 @@ getcipher(const char *name)
 static void
 usage(void)
 {
-       fprintf(stderr, "usage: %s [-i device] keyix cipher keyval [mac]\n",
+       fprintf(stderr, "usage: %s [-i device] [-d] keyix cipher keyval [mac]\n",
                progname);
        exit(-1);
 }