[pkg-wpa-devel] r1608 - in /iw/trunk: Makefile debian/changelog debian/copyright debian/patches/add-libnl-3.0-support.patch debian/patches/dont-use-git-on-the-buildd.patch info.c nl80211.h roc.c util.c version.sh wowlan.c
slh-guest at users.alioth.debian.org
slh-guest at users.alioth.debian.org
Fri Sep 9 22:24:47 UTC 2011
Author: slh-guest
Date: Fri Sep 9 22:24:47 2011
New Revision: 1608
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1608
Log:
backport libnl-3.0 support from upstream, don't switch to libnl3 yet
because of #632790.
Added:
iw/trunk/roc.c
- copied unchanged from r1607, iw/branches/upstream/current/roc.c
Modified:
iw/trunk/Makefile
iw/trunk/debian/changelog
iw/trunk/debian/copyright
iw/trunk/debian/patches/add-libnl-3.0-support.patch
iw/trunk/debian/patches/dont-use-git-on-the-buildd.patch
iw/trunk/info.c
iw/trunk/nl80211.h
iw/trunk/util.c
iw/trunk/version.sh
iw/trunk/wowlan.c
Modified: iw/trunk/Makefile
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/Makefile?rev=1608&op=diff
==============================================================================
--- iw/trunk/Makefile (original)
+++ iw/trunk/Makefile Fri Sep 9 22:24:47 2011
@@ -18,7 +18,7 @@
interface.o ibss.o station.o survey.o util.o \
mesh.o mpath.o scan.o reg.o version.o \
reason.o status.o connect.o link.o offch.o ps.o cqm.o \
- bitrate.o wowlan.o
+ bitrate.o wowlan.o roc.o
OBJS += sections.o
ALL = iw
Modified: iw/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/debian/changelog?rev=1608&op=diff
==============================================================================
--- iw/trunk/debian/changelog (original)
+++ iw/trunk/debian/changelog Fri Sep 9 22:24:47 2011
@@ -1,6 +1,5 @@
-iw (3.0-1) unstable; urgency=low
+iw (3.1-1) unstable; urgency=low
- [ Stefan Lippers-Hollmann ]
* New upstream release.
- support wake on wlan commands.
* add myself to uploaders.
@@ -11,11 +10,10 @@
* don't use git on the buildd (Closes: #557167).
* update debian/copyright to DEP-5, r174.
* use new anonscm URIs for alioth.
- * add libnl-3.0 support, thanks to Yegor Yefremov
- <yegor_sub1 at visionsystems.de>, don't switch to libnl3 yet because of
- #632790.
+ * backport libnl-3.0 support from upstream, don't switch to libnl3 yet
+ because of #632790.
- -- Kel Modderman <kel at otaku42.de> Sun, 28 Aug 2011 20:06:11 +1000
+ -- Stefan Lippers-Hollmann <s.l-h at gmx.de> Fri, 09 Sep 2011 01:15:55 +0200
iw (0.9.19-1) unstable; urgency=low
Modified: iw/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/debian/copyright?rev=1608&op=diff
==============================================================================
--- iw/trunk/debian/copyright (original)
+++ iw/trunk/debian/copyright Fri Sep 9 22:24:47 2011
@@ -14,7 +14,7 @@
Copyright: 2006-2011, Johannes Berg <johannes at sipsolutions.net>
2008, Michael Wu <flamingice at sourmilk.net>
2008, Luis Carlos Cobo <luisca at cozybit.com>
- 2008, Michael Buesch <mb at bu3sch.de>
+ 2008, Michael Buesch <m at bues.ch>
2008-2010, Luis R. Rodriguez <lrodriguez at atheros.com>
2008-2010, Jouni Malinen <jouni.malinen at atheros.com>
2008, Colin McCabe <colin at cozybit.com>
Modified: iw/trunk/debian/patches/add-libnl-3.0-support.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/debian/patches/add-libnl-3.0-support.patch?rev=1608&op=diff
==============================================================================
--- iw/trunk/debian/patches/add-libnl-3.0-support.patch (original)
+++ iw/trunk/debian/patches/add-libnl-3.0-support.patch Fri Sep 9 22:24:47 2011
@@ -1,12 +1,10 @@
-Date: Thu, 21 Jul 2011 17:06:17 +0200
-From: Yegor Yefremov <yegor_sub1 at visionsystems.de>
-Subject: [PATCH v2] iw: add libnl-3.0 support
+From ded667b01ad0e39d6ce2490b7a721b1c1fc1d519 Mon Sep 17 00:00:00 2001
+From: Yegor Yefremov <yegor_sub1 at visionsystems.de>
+Date: Thu, 21 Jul 2011 15:06:17 +0000
+Subject: [PATCH] iw: add libnl-3.0 support
Signed-off-by: Yegor Yefremov <yegorslists at googlemail.com>
---
-Changes from v1:
-- CONFIG_LIBNL30 added
-
Makefile | 10 ++++++++++
iw.c | 7 +++----
iw.h | 3 ++-
Modified: iw/trunk/debian/patches/dont-use-git-on-the-buildd.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/debian/patches/dont-use-git-on-the-buildd.patch?rev=1608&op=diff
==============================================================================
--- iw/trunk/debian/patches/dont-use-git-on-the-buildd.patch (original)
+++ iw/trunk/debian/patches/dont-use-git-on-the-buildd.patch Fri Sep 9 22:24:47 2011
@@ -34,7 +34,7 @@
--- a/version.sh
+++ b/version.sh
@@ -3,21 +3,7 @@
- VERSION="3.0"
+ VERSION="3.1"
OUT="$1"
-if head=`git rev-parse --verify HEAD 2>/dev/null`; then
Modified: iw/trunk/info.c
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/info.c?rev=1608&op=diff
==============================================================================
--- iw/trunk/info.c (original)
+++ iw/trunk/info.c Fri Sep 9 22:24:47 2011
@@ -315,6 +315,11 @@
[NL80211_WOWLAN_TRIG_PKT_PATTERN] = {
.minlen = sizeof(struct nl80211_wowlan_pattern_support),
},
+ [NL80211_WOWLAN_TRIG_GTK_REKEY_SUPPORTED] = { .type = NLA_FLAG },
+ [NL80211_WOWLAN_TRIG_GTK_REKEY_FAILURE] = { .type = NLA_FLAG },
+ [NL80211_WOWLAN_TRIG_EAP_IDENT_REQUEST] = { .type = NLA_FLAG },
+ [NL80211_WOWLAN_TRIG_4WAY_HANDSHAKE] = { .type = NLA_FLAG },
+ [NL80211_WOWLAN_TRIG_RFKILL_RELEASE] = { .type = NLA_FLAG },
};
struct nl80211_wowlan_pattern_support *pat;
int err;
@@ -328,16 +333,26 @@
} else {
printf("\n");
if (tb_wowlan[NL80211_WOWLAN_TRIG_ANY])
- printf("\t\t * any (device continues operating)\n");
+ printf("\t\t * wake up on anything (device continues operating normally)\n");
if (tb_wowlan[NL80211_WOWLAN_TRIG_DISCONNECT])
- printf("\t\t * disconnect\n");
+ printf("\t\t * wake up on disconnect\n");
if (tb_wowlan[NL80211_WOWLAN_TRIG_MAGIC_PKT])
- printf("\t\t * magic packet\n");
+ printf("\t\t * wake up on magic packet\n");
if (tb_wowlan[NL80211_WOWLAN_TRIG_PKT_PATTERN]) {
pat = nla_data(tb_wowlan[NL80211_WOWLAN_TRIG_PKT_PATTERN]);
- printf("\t\t * up to %u patterns of %u-%u bytes\n",
+ printf("\t\t * wake up on pattern match, up to %u patterns of %u-%u bytes\n",
pat->max_patterns, pat->min_pattern_len, pat->max_pattern_len);
}
+ if (tb_wowlan[NL80211_WOWLAN_TRIG_GTK_REKEY_SUPPORTED])
+ printf("\t\t * can do GTK rekeying\n");
+ if (tb_wowlan[NL80211_WOWLAN_TRIG_GTK_REKEY_FAILURE])
+ printf("\t\t * wake up on GTK rekey failure\n");
+ if (tb_wowlan[NL80211_WOWLAN_TRIG_EAP_IDENT_REQUEST])
+ printf("\t\t * wake up on EAP identity request\n");
+ if (tb_wowlan[NL80211_WOWLAN_TRIG_4WAY_HANDSHAKE])
+ printf("\t\t * wake up on 4-way handshake\n");
+ if (tb_wowlan[NL80211_WOWLAN_TRIG_RFKILL_RELEASE])
+ printf("\t\t * wake up on rfkill release\n");
}
}
Modified: iw/trunk/nl80211.h
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/nl80211.h?rev=1608&op=diff
==============================================================================
--- iw/trunk/nl80211.h (original)
+++ iw/trunk/nl80211.h Fri Sep 9 22:24:47 2011
@@ -247,7 +247,8 @@
* passed, all channels allowed for the current regulatory domain
* are used. Extra IEs can also be passed from the userspace by
* using the %NL80211_ATTR_IE attribute.
- * @NL80211_CMD_STOP_SCHED_SCAN: stop a scheduled scan
+ * @NL80211_CMD_STOP_SCHED_SCAN: stop a scheduled scan. Returns -ENOENT
+ * if scheduled scan is not running.
* @NL80211_CMD_SCHED_SCAN_RESULTS: indicates that there are scheduled scan
* results available.
* @NL80211_CMD_SCHED_SCAN_STOPPED: indicates that the scheduled scan has
@@ -483,6 +484,14 @@
* more background information, see
* http://wireless.kernel.org/en/users/Documentation/WoWLAN.
*
+ * @NL80211_CMD_SET_REKEY_OFFLOAD: This command is used give the driver
+ * the necessary information for supporting GTK rekey offload. This
+ * feature is typically used during WoWLAN. The configuration data
+ * is contained in %NL80211_ATTR_REKEY_DATA (which is nested and
+ * contains the data in sub-attributes). After rekeying happened,
+ * this command may also be sent by the driver as an MLME event to
+ * inform userspace of the new replay counter.
+ *
* @NL80211_CMD_MAX: highest used command number
* @__NL80211_CMD_AFTER_LAST: internal use
*/
@@ -604,6 +613,8 @@
NL80211_CMD_STOP_SCHED_SCAN,
NL80211_CMD_SCHED_SCAN_RESULTS,
NL80211_CMD_SCHED_SCAN_STOPPED,
+
+ NL80211_CMD_SET_REKEY_OFFLOAD,
/* add new commands above here */
@@ -745,8 +756,12 @@
*
* @NL80211_ATTR_MAX_NUM_SCAN_SSIDS: number of SSIDs you can scan with
* a single scan request, a wiphy attribute.
+ * @NL80211_ATTR_MAX_NUM_SCHED_SCAN_SSIDS: number of SSIDs you can
+ * scan with a single scheduled scan request, a wiphy attribute.
* @NL80211_ATTR_MAX_SCAN_IE_LEN: maximum length of information elements
* that can be added to a scan request
+ * @NL80211_ATTR_MAX_SCHED_SCAN_IE_LEN: maximum length of information
+ * elements that can be added to a scheduled scan request
*
* @NL80211_ATTR_SCAN_FREQUENCIES: nested attribute with frequencies (in MHz)
* @NL80211_ATTR_SCAN_SSIDS: nested attribute with SSIDs, leave out for passive
@@ -978,8 +993,8 @@
* driving the peer link management state machine.
* @NL80211_MESH_SETUP_USERSPACE_AMPE must be enabled.
*
- * @NL80211_ATTR_WOWLAN_SUPPORTED: indicates, as part of the wiphy capabilities,
- * the supported WoWLAN triggers
+ * @NL80211_ATTR_WOWLAN_TRIGGERS_SUPPORTED: indicates, as part of the wiphy
+ * capabilities, the supported WoWLAN triggers
* @NL80211_ATTR_WOWLAN_TRIGGERS: used by %NL80211_CMD_SET_WOWLAN to
* indicate which WoW triggers should be enabled. This is also
* used by %NL80211_CMD_GET_WOWLAN to get the currently enabled WoWLAN
@@ -996,6 +1011,9 @@
* are managed in software: interfaces of these types aren't subject to
* any restrictions in their number or combinations.
*
+ * @%NL80211_ATTR_REKEY_DATA: nested attribute containing the information
+ * necessary for GTK rekeying in the device, see &enum nl80211_rekey_data.
+ *
* @NL80211_ATTR_MAX: highest attribute number currently defined
* @__NL80211_ATTR_AFTER_LAST: internal use
*/
@@ -1193,6 +1211,11 @@
NL80211_ATTR_INTERFACE_COMBINATIONS,
NL80211_ATTR_SOFTWARE_IFTYPES,
+
+ NL80211_ATTR_REKEY_DATA,
+
+ NL80211_ATTR_MAX_NUM_SCHED_SCAN_SSIDS,
+ NL80211_ATTR_MAX_SCHED_SCAN_IE_LEN,
/* add attributes here, update the policy in nl80211.c */
@@ -2239,6 +2262,16 @@
*
* In %NL80211_ATTR_WOWLAN_TRIGGERS_SUPPORTED, it is a binary attribute
* carrying a &struct nl80211_wowlan_pattern_support.
+ * @NL80211_WOWLAN_TRIG_GTK_REKEY_SUPPORTED: Not a real trigger, and cannot be
+ * used when setting, used only to indicate that GTK rekeying is supported
+ * by the device (flag)
+ * @NL80211_WOWLAN_TRIG_GTK_REKEY_FAILURE: wake up on GTK rekey failure (if
+ * done by the device) (flag)
+ * @NL80211_WOWLAN_TRIG_EAP_IDENT_REQUEST: wake up on EAP Identity Request
+ * packet (flag)
+ * @NL80211_WOWLAN_TRIG_4WAY_HANDSHAKE: wake up on 4-way handshake (flag)
+ * @NL80211_WOWLAN_TRIG_RFKILL_RELEASE: wake up when rfkill is released
+ * (on devices that have rfkill in the device) (flag)
* @NUM_NL80211_WOWLAN_TRIG: number of wake on wireless triggers
* @MAX_NL80211_WOWLAN_TRIG: highest wowlan trigger attribute number
*/
@@ -2248,6 +2281,11 @@
NL80211_WOWLAN_TRIG_DISCONNECT,
NL80211_WOWLAN_TRIG_MAGIC_PKT,
NL80211_WOWLAN_TRIG_PKT_PATTERN,
+ NL80211_WOWLAN_TRIG_GTK_REKEY_SUPPORTED,
+ NL80211_WOWLAN_TRIG_GTK_REKEY_FAILURE,
+ NL80211_WOWLAN_TRIG_EAP_IDENT_REQUEST,
+ NL80211_WOWLAN_TRIG_4WAY_HANDSHAKE,
+ NL80211_WOWLAN_TRIG_RFKILL_RELEASE,
/* keep last */
NUM_NL80211_WOWLAN_TRIG,
@@ -2361,4 +2399,28 @@
MAX_NL80211_PLINK_STATES = NUM_NL80211_PLINK_STATES - 1
};
+#define NL80211_KCK_LEN 16
+#define NL80211_KEK_LEN 16
+#define NL80211_REPLAY_CTR_LEN 8
+
+/**
+ * enum nl80211_rekey_data - attributes for GTK rekey offload
+ * @__NL80211_REKEY_DATA_INVALID: invalid number for nested attributes
+ * @NL80211_REKEY_DATA_KEK: key encryption key (binary)
+ * @NL80211_REKEY_DATA_KCK: key confirmation key (binary)
+ * @NL80211_REKEY_DATA_REPLAY_CTR: replay counter (binary)
+ * @NUM_NL80211_REKEY_DATA: number of rekey attributes (internal)
+ * @MAX_NL80211_REKEY_DATA: highest rekey attribute (internal)
+ */
+enum nl80211_rekey_data {
+ __NL80211_REKEY_DATA_INVALID,
+ NL80211_REKEY_DATA_KEK,
+ NL80211_REKEY_DATA_KCK,
+ NL80211_REKEY_DATA_REPLAY_CTR,
+
+ /* keep last */
+ NUM_NL80211_REKEY_DATA,
+ MAX_NL80211_REKEY_DATA = NUM_NL80211_REKEY_DATA - 1
+};
+
#endif /* __LINUX_NL80211_H */
Modified: iw/trunk/util.c
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/util.c?rev=1608&op=diff
==============================================================================
--- iw/trunk/util.c (original)
+++ iw/trunk/util.c Fri Sep 9 22:24:47 2011
@@ -208,6 +208,7 @@
[NL80211_CMD_FRAME_WAIT_CANCEL] = "frame_wait_cancel",
[NL80211_CMD_JOIN_MESH] = "join_mesh",
[NL80211_CMD_LEAVE_MESH] = "leave_mesh",
+ [NL80211_CMD_SET_REKEY_OFFLOAD] = "set_rekey_offload",
};
static char cmdbuf[100];
Modified: iw/trunk/version.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/version.sh?rev=1608&op=diff
==============================================================================
--- iw/trunk/version.sh (original)
+++ iw/trunk/version.sh Fri Sep 9 22:24:47 2011
@@ -1,6 +1,6 @@
#!/bin/sh
-VERSION="3.0"
+VERSION="3.1"
OUT="$1"
if head=`git rev-parse --verify HEAD 2>/dev/null`; then
Modified: iw/trunk/wowlan.c
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/wowlan.c?rev=1608&op=diff
==============================================================================
--- iw/trunk/wowlan.c (original)
+++ iw/trunk/wowlan.c Fri Sep 9 22:24:47 2011
@@ -40,6 +40,14 @@
NLA_PUT_FLAG(msg, NL80211_WOWLAN_TRIG_DISCONNECT);
else if (strcmp(argv[0], "magic-packet") == 0)
NLA_PUT_FLAG(msg, NL80211_WOWLAN_TRIG_MAGIC_PKT);
+ else if (strcmp(argv[0], "gtk-rekey-failure") == 0)
+ NLA_PUT_FLAG(msg, NL80211_WOWLAN_TRIG_GTK_REKEY_FAILURE);
+ else if (strcmp(argv[0], "eap-identity-request") == 0)
+ NLA_PUT_FLAG(msg, NL80211_WOWLAN_TRIG_EAP_IDENT_REQUEST);
+ else if (strcmp(argv[0], "4way-handshake") == 0)
+ NLA_PUT_FLAG(msg, NL80211_WOWLAN_TRIG_4WAY_HANDSHAKE);
+ else if (strcmp(argv[0], "rfkill-release") == 0)
+ NLA_PUT_FLAG(msg, NL80211_WOWLAN_TRIG_RFKILL_RELEASE);
else if (strcmp(argv[0], "patterns") == 0) {
parse_state = PS_PAT;
patterns = nlmsg_alloc();
@@ -81,7 +89,8 @@
nlmsg_free(patterns);
return err;
}
-COMMAND(wowlan, enable, "[any] [disconnect] [magic-packet] [patterns <pattern>*]",
+COMMAND(wowlan, enable, "[any] [disconnect] [magic-packet] [gtk-rekey-failure] [eap-identity-request]"
+ " [4way-handshake] [rfkill-release] [patterns <pattern>*]",
NL80211_CMD_SET_WOWLAN, 0, CIB_PHY, handle_wowlan_enable,
"Enable WoWLAN with the given triggers.\n"
"Each pattern is given as a bytestring with '-' in places where any byte\n"
@@ -128,6 +137,14 @@
printf(" * wake up on disconnect\n");
if (trig[NL80211_WOWLAN_TRIG_MAGIC_PKT])
printf(" * wake up on magic packet\n");
+ if (trig[NL80211_WOWLAN_TRIG_GTK_REKEY_FAILURE])
+ printf(" * wake up on GTK rekeying failure\n");
+ if (trig[NL80211_WOWLAN_TRIG_EAP_IDENT_REQUEST])
+ printf(" * wake up on EAP identity request\n");
+ if (trig[NL80211_WOWLAN_TRIG_4WAY_HANDSHAKE])
+ printf(" * wake up on 4-way handshake\n");
+ if (trig[NL80211_WOWLAN_TRIG_RFKILL_RELEASE])
+ printf(" * wake up on RF-kill release\n");
if (trig[NL80211_WOWLAN_TRIG_PKT_PATTERN]) {
nla_for_each_nested(pattern,
trig[NL80211_WOWLAN_TRIG_PKT_PATTERN],
More information about the Pkg-wpa-devel
mailing list