Signed-off-by: Daniel Mierswa <[email protected]> --- package/iw/Makefile | 6 +- package/iw/patches/001-nl80211_sync.patch | 81 --------------------- package/iw/patches/110-fix_rate_calculation.patch | 11 --- 3 files changed, 3 insertions(+), 95 deletions(-) delete mode 100644 package/iw/patches/001-nl80211_sync.patch delete mode 100644 package/iw/patches/110-fix_rate_calculation.patch
diff --git a/package/iw/Makefile b/package/iw/Makefile index 2b714f8..04cbf63 100644 --- a/package/iw/Makefile +++ b/package/iw/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iw -PKG_VERSION:=0.9.22 -PKG_RELEASE:=2 +PKG_VERSION:=3.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://wireless.kernel.org/download/iw/ -PKG_MD5SUM:=561c2602c5ce7c65a590118286c0892a +PKG_MD5SUM:=a92bab831b2f86918db3c0f27f797015 PKG_BUILD_DEPENDS:=mac80211 include $(INCLUDE_DIR)/package.mk diff --git a/package/iw/patches/001-nl80211_sync.patch b/package/iw/patches/001-nl80211_sync.patch deleted file mode 100644 index a385897..0000000 --- a/package/iw/patches/001-nl80211_sync.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- a/nl80211.h -+++ b/nl80211.h -@@ -148,6 +148,10 @@ - * @NL80211_CMD_SET_MPATH: Set mesh path attributes for mesh path to - * destination %NL80211_ATTR_MAC on the interface identified by - * %NL80211_ATTR_IFINDEX. -+ * @NL80211_CMD_NEW_MPATH: Create a new mesh path for the destination given by -+ * %NL80211_ATTR_MAC via %NL80211_ATTR_MPATH_NEXT_HOP. -+ * @NL80211_CMD_DEL_MPATH: Delete a mesh path to the destination given by -+ * %NL80211_ATTR_MAC. - * @NL80211_CMD_NEW_PATH: Add a mesh path with given attributes to the - * the interface identified by %NL80211_ATTR_IFINDEX. - * @NL80211_CMD_DEL_PATH: Remove a mesh path identified by %NL80211_ATTR_MAC -@@ -612,7 +616,7 @@ enum nl80211_commands { - * consisting of a nested array. - * - * @NL80211_ATTR_MESH_ID: mesh id (1-32 bytes). -- * @NL80211_ATTR_PLINK_ACTION: action to perform on the mesh peer link. -+ * @NL80211_ATTR_STA_PLINK_ACTION: action to perform on the mesh peer link. - * @NL80211_ATTR_MPATH_NEXT_HOP: MAC address of the next hop for a mesh path. - * @NL80211_ATTR_MPATH_INFO: information about a mesh_path, part of mesh path - * info given for %NL80211_CMD_GET_MPATH, nested attribute described at -@@ -879,7 +883,9 @@ enum nl80211_commands { - * See &enum nl80211_key_default_types. - * - * @NL80211_ATTR_MESH_SETUP: Optional mesh setup parameters. These cannot be -- * changed once the mesh is active. -+ * changed once the mesh is active. -+ * @NL80211_ATTR_MESH_CONFIG: Mesh configuration parameters, a nested attribute -+ * containing attributes from &enum nl80211_meshconf_params. - * - * @NL80211_ATTR_MAX: highest attribute number currently defined - * @__NL80211_ATTR_AFTER_LAST: internal use -@@ -1225,8 +1231,6 @@ enum nl80211_rate_info { - * @NL80211_STA_INFO_INACTIVE_TIME: time since last activity (u32, msecs) - * @NL80211_STA_INFO_RX_BYTES: total received bytes (u32, from this station) - * @NL80211_STA_INFO_TX_BYTES: total transmitted bytes (u32, to this station) -- * @__NL80211_STA_INFO_AFTER_LAST: internal -- * @NL80211_STA_INFO_MAX: highest possible station info attribute - * @NL80211_STA_INFO_SIGNAL: signal strength of last received PPDU (u8, dBm) - * @NL80211_STA_INFO_TX_BITRATE: current unicast tx rate, nested attribute - * containing info as possible, see &enum nl80211_sta_info_txrate. -@@ -1236,6 +1240,13 @@ enum nl80211_rate_info { - * @NL80211_STA_INFO_TX_RETRIES: total retries (u32, to this station) - * @NL80211_STA_INFO_TX_FAILED: total failed packets (u32, to this station) - * @NL80211_STA_INFO_SIGNAL_AVG: signal strength average (u8, dBm) -+ * @NL80211_STA_INFO_LLID: the station's mesh LLID -+ * @NL80211_STA_INFO_PLID: the station's mesh PLID -+ * @NL80211_STA_INFO_PLINK_STATE: peer link state for the station -+ * @NL80211_STA_INFO_RX_BITRATE: last unicast rx rate, nested attribute -+ * containing info as possible, see &enum nl80211_sta_info_txrate. -+ * @__NL80211_STA_INFO_AFTER_LAST: internal -+ * @NL80211_STA_INFO_MAX: highest possible station info attribute - */ - enum nl80211_sta_info { - __NL80211_STA_INFO_INVALID, -@@ -1252,6 +1263,7 @@ enum nl80211_sta_info { - NL80211_STA_INFO_TX_RETRIES, - NL80211_STA_INFO_TX_FAILED, - NL80211_STA_INFO_SIGNAL_AVG, -+ NL80211_STA_INFO_RX_BITRATE, - - /* keep last */ - __NL80211_STA_INFO_AFTER_LAST, -@@ -1626,7 +1638,7 @@ enum nl80211_mntr_flags { - * @NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME: The interval of time (in TUs) - * that it takes for an HWMP information element to propagate across the mesh - * -- * @NL80211_MESHCONF_ROOTMODE: whether root mode is enabled or not -+ * @NL80211_MESHCONF_HWMP_ROOTMODE: whether root mode is enabled or not - * - * @NL80211_MESHCONF_ELEMENT_TTL: specifies the value of TTL field set at a - * source mesh point for path selection elements. -@@ -1678,6 +1690,7 @@ enum nl80211_meshconf_params { - * element that vendors will use to identify the path selection methods and - * metrics in use. - * -+ * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number - * @__NL80211_MESH_SETUP_ATTR_AFTER_LAST: Internal use - */ - enum nl80211_mesh_setup_params { diff --git a/package/iw/patches/110-fix_rate_calculation.patch b/package/iw/patches/110-fix_rate_calculation.patch deleted file mode 100644 index e7328e3..0000000 --- a/package/iw/patches/110-fix_rate_calculation.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/ibss.c -+++ b/ibss.c -@@ -104,7 +104,7 @@ static int join_ibss(struct nl80211_stat - if (*end != '\0') - return 1; - -- NLA_PUT_U32(msg, NL80211_ATTR_MCAST_RATE, (int) rate * 10); -+ NLA_PUT_U32(msg, NL80211_ATTR_MCAST_RATE, (int)(rate * 10)); - argv++; - argc--; - } -- 1.7.6 _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
