From a39d500fb40b2e3c5e6b7f31ce0cfe03f1778074 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 23 Jul 2007 22:05:00 +0000
Subject: merge madwifi trunk changeset 2597

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8136 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/madwifi/patches/128-adhoc_memleak.patch | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'package/madwifi')

diff --git a/package/madwifi/patches/128-adhoc_memleak.patch b/package/madwifi/patches/128-adhoc_memleak.patch
index 75c226142..3fca4ef98 100644
--- a/package/madwifi/patches/128-adhoc_memleak.patch
+++ b/package/madwifi/patches/128-adhoc_memleak.patch
@@ -1,7 +1,7 @@
 Index: madwifi-ng-r2568-20070710/net80211/ieee80211_input.c
 ===================================================================
---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_input.c	2007-07-23 01:48:42.282389707 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_input.c	2007-07-23 01:48:44.214499810 +0200
+--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_input.c	2007-07-24 00:01:54.068861828 +0200
++++ madwifi-ng-r2568-20070710/net80211/ieee80211_input.c	2007-07-24 00:02:44.035709278 +0200
 @@ -2875,7 +2875,7 @@
  		}
  		if ((vap->iv_opmode == IEEE80211_M_IBSS) && 
@@ -11,3 +11,16 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_input.c
  				/* Create a new entry in the neighbor table. */
  				ni = ieee80211_add_neighbor(vap, wh, &scan);
  			} else {
+Index: madwifi-ng-r2568-20070710/net80211/ieee80211_node.c
+===================================================================
+--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_node.c	2007-07-24 00:02:51.284122342 +0200
++++ madwifi-ng-r2568-20070710/net80211/ieee80211_node.c	2007-07-24 00:03:04.540877800 +0200
+@@ -1205,7 +1205,7 @@
+ 	struct ieee80211com *ic = vap->iv_ic;
+ 	struct ieee80211_node *ni;
+ 
+-	ni = ieee80211_dup_bss(vap, wh->i_addr2, 1);
++	ni = ieee80211_dup_bss(vap, wh->i_addr2, 0);
+ 	if (ni != NULL) {
+ 		ni->ni_esslen = sp->ssid[1];
+ 		memcpy(ni->ni_essid, sp->ssid + 2, sp->ssid[1]);
-- 
cgit v1.2.3