diff options
author | Saul Wold <Saul.Wold@intel.com> | 2010-09-24 15:36:24 -0700 |
---|---|---|
committer | Saul Wold <Saul.Wold@intel.com> | 2010-09-24 16:43:21 -0700 |
commit | 239a368d5715d8f5b7733f9400339c2350c49369 (patch) | |
tree | 2953f12b45e590d9e14b6f72f8e4ee7188e41508 /meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.33-rt2860-1-2.patch | |
parent | c5b9525263dac6844d152e40acf8cee4d27b60bc (diff) | |
download | openembedded-core-239a368d5715d8f5b7733f9400339c2350c49369.tar.gz openembedded-core-239a368d5715d8f5b7733f9400339c2350c49369.tar.bz2 openembedded-core-239a368d5715d8f5b7733f9400339c2350c49369.tar.xz openembedded-core-239a368d5715d8f5b7733f9400339c2350c49369.zip |
netbook: Correct netbook build by moving netbook configuration from moblin to meta
Signed-off-by: Saul Wold <Saul.Wold@intel.com>
Diffstat (limited to 'meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.33-rt2860-1-2.patch')
-rw-r--r-- | meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.33-rt2860-1-2.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.33-rt2860-1-2.patch b/meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.33-rt2860-1-2.patch deleted file mode 100644 index e67a82652..000000000 --- a/meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.33-rt2860-1-2.patch +++ /dev/null @@ -1,48 +0,0 @@ - -We should only send SIOCGIWAP event to notify wpa_supplicant about a lost -link, not to tell it about our disassociation being done. If we send such -event in both cases, this driver will drag wpa_supplicant into an infinite -loop. - -Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> ---- - drivers/staging/rt2860/sta/assoc.c | 6 ++++-- - drivers/staging/rt2860/sta_ioctl.c | 6 ++++++ - 2 files changed, 10 insertions(+), 2 deletions(-) - --- -Index: b/drivers/staging/rt2860/sta/assoc.c -=================================================================== ---- a/drivers/staging/rt2860/sta/assoc.c 2010-01-05 11:25:22.000000000 +0100 -+++ b/drivers/staging/rt2860/sta/assoc.c 2010-01-05 18:09:34.000000000 +0100 -@@ -818,10 +818,11 @@ void MlmeDisassocReqAction(struct rt_rtm - COPY_MAC_ADDR(pAd->StaCfg.DisassocSta, pDisassocReq->Addr); - - RTMPSetTimer(&pAd->MlmeAux.DisassocTimer, Timeout); /* in mSec */ -- pAd->Mlme.AssocMachine.CurrState = DISASSOC_WAIT_RSP; - -- RtmpOSWrielessEventSend(pAd, SIOCGIWAP, -1, NULL, NULL, 0); -+ pAd->Mlme.AssocMachine.CurrState = DISASSOC_WAIT_RSP; - -+ if (INFRA_ON(pAd) || ADHOC_ON(pAd)) -+ RtmpOSWrielessEventSend(pAd, SIOCGIWAP, -1, NULL, NULL, 0); - } - - /* -Index: b/drivers/staging/rt2860/sta_ioctl.c -=================================================================== ---- a/drivers/staging/rt2860/sta_ioctl.c 2010-01-05 11:25:22.000000000 +0100 -+++ b/drivers/staging/rt2860/sta_ioctl.c 2010-01-05 12:55:16.000000000 +0100 -@@ -602,6 +602,12 @@ int rt_ioctl_siwap(struct net_device *de - DBGPRINT(RT_DEBUG_TRACE, - ("MLME busy, reset MLME state machine!\n")); - } -+ -+ /* No need to set our BSSID if it's not changing */ -+ if (!memcmp(pAdapter->CommonCfg.Bssid, ap_addr->sa_data, ETH_ALEN) || -+ !memcmp(pAdapter->MlmeAux.Bssid, ap_addr->sa_data, ETH_ALEN)) -+ return 0; -+ - /* tell CNTL state machine to call NdisMSetInformationComplete() after completing */ - /* this request, because this request is initiated by NDIS. */ - pAdapter->MlmeAux.CurrReqIsFromNdis = FALSE; |