* Re: [PATCH] cls_rsvp.h was outdated
From: David Miller @ 2011-09-15 19:06 UTC (permalink / raw)
To: igorm; +Cc: netdev, linux-kernel
In-Reply-To: <59e0c7c0ba5282f35b101e7058fb27fa.squirrel@kondor.etf.bg.ac.rs>
From: "Igor Maravić" <igorm@etf.rs>
Date: Tue, 30 Aug 2011 15:12:55 +0200
> File cls_rsvp.h in /net/sched was outdated. I'm sending you patch for this
> file.
>
> Signed-off-by: Igor Maravić <igorm@etf.rs>
Patch applied, thanks.
^ permalink raw reply
* Re: [PATCH 0/8] bnx2x: fixes
From: David Miller @ 2011-09-15 19:06 UTC (permalink / raw)
To: dmitry; +Cc: netdev
In-Reply-To: <1314698926-24525-1-git-send-email-dmitry@broadcom.com>
From: "Dmitry Kravkov" <dmitry@broadcom.com>
Date: Tue, 30 Aug 2011 13:08:38 +0300
> Please consider appling the series of bnx2x fixes to 'net'
All applied, thanks Dmitry.
^ permalink raw reply
* Re: [PATCH v2] tcp: Change possible SYN flooding messages
From: David Miller @ 2011-09-15 19:06 UTC (permalink / raw)
To: eric.dumazet; +Cc: therbert, netdev
In-Reply-To: <1314710504.2935.21.camel@edumazet-HP-Compaq-6005-Pro-SFF-PC>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 30 Aug 2011 15:21:44 +0200
> "Possible SYN flooding on port xxxx " messages can fill logs on servers.
>
> Change logic to log the message only once per listener, and add two new
> SNMP counters to track :
>
> TCPReqQFullDoCookies : number of times a SYNCOOKIE was replied to client
>
> TCPReqQFullDrop : number of times a SYN request was dropped because
> syncookies were not enabled.
>
> Based on a prior patch from Tom Herbert, and suggestions from David.
>
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Applied, thanks Eric.
^ permalink raw reply
* Re: [PATCH] Documentation: networking: dmfe.txt: Remove the maintainer of orphan filesystem
From: David Miller @ 2011-09-15 19:07 UTC (permalink / raw)
To: marcos.mage; +Cc: rdunlap, netdev, linux-doc
In-Reply-To: <1314718437-5794-1-git-send-email-marcos.mage@gmail.com>
From: Marcos Paulo de Souza <marcos.mage@gmail.com>
Date: Tue, 30 Aug 2011 12:33:57 -0300
> The dmfe module is a orphan driver, and with this was removed the maintainer
> of the documentation.
>
> Signed-off-by: Marcos Paulo de Souza <marcos.mage@gmail.com>
Applied, but I changed "orphan filesystem" to "orphan networking driver"
since last time I checked dmfe is not a filesystem :)
^ permalink raw reply
* Re: [PATCH] net: Make flow cache namespace-aware
From: David Miller @ 2011-09-15 19:08 UTC (permalink / raw)
To: david.ward; +Cc: netdev, whydna
In-Reply-To: <1314806727-5340-1-git-send-email-david.ward@ll.mit.edu>
From: David Ward <david.ward@ll.mit.edu>
Date: Wed, 31 Aug 2011 12:05:27 -0400
> flow_cache_lookup will return a cached object (or null pointer) that the
> resolver (i.e. xfrm_policy_lookup) previously found for another namespace
> using the same key/family/dir. Instead, make the namespace part of what
> identifies entries in the cache.
>
> As before, flow_entry_valid will return 0 for entries where the namespace
> has been deleted, and they will be removed from the cache the next time
> flow_cache_gc_task is run.
>
> Reported-by: Andrew Dickinson <whydna@whydna.net>
> Signed-off-by: David Ward <david.ward@ll.mit.edu>
Applied.
^ permalink raw reply
* Re: [PATCH net-2.6] net: copy userspace buffers on device forwarding
From: David Miller @ 2011-09-15 19:08 UTC (permalink / raw)
To: mst
Cc: herbert, eric.dumazet, mirq-linux, therbert, jpirko, jesse, xma,
linux-kernel, netdev
In-Reply-To: <20110831180328.GA22016@redhat.com>
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Wed, 31 Aug 2011 21:03:29 +0300
> dev_forward_skb loops an skb back into host networking
> stack which might hang on the memory indefinitely.
> In particular, this can happen in macvtap in bridged mode.
> Copy the userspace fragments to avoid blocking the
> sender in that case.
>
> As this patch makes skb_copy_ubufs extern now,
> I also added some documentation and made it clear
> the SKBTX_DEV_ZEROCOPY flag automatically instead
> of doing it in all callers. This can be made into a separate
> patch if people feel it's worth it.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Applied.
^ permalink raw reply
* Re: [PATCH] net: don't clear IFF_XMIT_DST_RELEASE in ether_setup
From: David Miller @ 2011-09-15 19:08 UTC (permalink / raw)
To: nhorman; +Cc: netdev
In-Reply-To: <1316005502-7341-1-git-send-email-nhorman@tuxdriver.com>
From: Neil Horman <nhorman@tuxdriver.com>
Date: Wed, 14 Sep 2011 09:05:02 -0400
> d88733150 introduced the IFF_SKB_TX_SHARING flag, which I unilaterally set in
> ether_setup. In doing this I didn't realize that other flags (such as
> IFF_XMIT_DST_RELEASE) might be set prior to calling the ether_setup routine.
> This patch changes ether_setup to or in SKB_TX_SHARING so as not to
> inadvertently clear other existing flags. Thanks to Pekka Riikonen for pointing
> out my error
>
> Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
> Reported-by: Pekka Riikonen <priikone@iki.fi>
Applied, thanks Neil.
^ permalink raw reply
* Re: [PATCH 1/1] net/can/af_can.c: Change del_timer to del_timer_sync
From: David Miller @ 2011-09-15 19:07 UTC (permalink / raw)
To: rajan.aggarwal85; +Cc: socketcan, urs.thuermann, netdev
In-Reply-To: <1314784658-23938-1-git-send-email-rajan.aggarwal85@gmail.com>
From: Rajan Aggarwal <rajan.aggarwal85@gmail.com>
Date: Wed, 31 Aug 2011 15:27:38 +0530
> From: Rajan Aggarwal <Rajan Aggarwal rajan.aggarwal85@gmail.com>
>
> This is important for SMP platform to check if timer function is
> executing on other CPU with deleting the timer.
>
> Signed-off-by: Rajan Aggarwal <Rajan Aggarwal rajan.aggarwal85@gmail.com>
Applied, thanks.
^ permalink raw reply
* Re: [PATCH 0/14] skb fragment API: convert network drivers (part II)
From: David Miller @ 2011-09-15 19:41 UTC (permalink / raw)
To: Ian.Campbell; +Cc: netdev
In-Reply-To: <1314787608.28989.41.camel@zakaz.uk.xensource.com>
From: Ian Campbell <Ian.Campbell@citrix.com>
Date: Wed, 31 Aug 2011 11:46:48 +0100
> The following series converts the second batch of network drivers to the
> SKB pages fragment API introduced in 131ea6675c76. I expect there will
> be ~4 similarly sized batches to convert all the drivers over.
>
> This is part of my series to enable visibility into SKB paged fragment's
> lifecycles, [0] contains some more background and rationale but
> basically the completed series will allow entities which inject pages
> into the networking stack to receive a notification when the stack has
> really finished with those pages (i.e. including retransmissions,
> clones, pull-ups etc) and not just when the original skb is finished
> with, which is beneficial to many subsystems which wish to inject pages
> into the network stack without giving up full ownership of those page's
> lifecycle. It implements something broadly along the lines of what was
> described in [1].
Series applied, thanks.
^ permalink raw reply
* Re: [patch 1/3 -next] 6LoWPAN: use kfree_skb() instead of kfree()
From: David Miller @ 2011-09-15 19:42 UTC (permalink / raw)
To: error27-Re5JQEeQqe8AvxtiuMwx3w
Cc: netdev-u79uwXL29TY76Z2rM5mHXA,
kernel-janitors-u79uwXL29TY76Z2rM5mHXA,
linux-zigbee-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f
In-Reply-To: <20110830134552.GH3705-z0WHZYlhLlzP0Z7Jsv878P8+0UxHXcjY@public.gmane.org>
From: Dan Carpenter <error27-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Date: Tue, 30 Aug 2011 16:45:52 +0300
> Use kfree_skb() to free sbk_buffs.
>
> Signed-off-by: Dan Carpenter <error27-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Applied.
------------------------------------------------------------------------------
Doing More with Less: The Next Generation Virtual Desktop
What are the key obstacles that have prevented many mid-market businesses
from deploying virtual desktops? How do next-generation virtual desktops
provide companies an easier-to-deploy, easier-to-manage and more affordable
virtual desktop model.http://www.accelacomm.com/jaw/sfnl/114/51426474/
^ permalink raw reply
* Re: [patch 2/3 -next] 6LoWPAN: use the _safe version of list_for_each
From: David Miller @ 2011-09-15 19:42 UTC (permalink / raw)
To: error27-Re5JQEeQqe8AvxtiuMwx3w
Cc: netdev-u79uwXL29TY76Z2rM5mHXA,
kernel-janitors-u79uwXL29TY76Z2rM5mHXA,
linux-zigbee-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f
In-Reply-To: <20110830134640.GI3705-z0WHZYlhLlzP0Z7Jsv878P8+0UxHXcjY@public.gmane.org>
From: Dan Carpenter <error27-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Date: Tue, 30 Aug 2011 16:46:40 +0300
> When we kfree(entry) that causes a use-after-free bug so we have to
> use list_for_each_entry_safe() safe here.
>
> Signed-off-by: Dan Carpenter <error27-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Applied.
------------------------------------------------------------------------------
Doing More with Less: The Next Generation Virtual Desktop
What are the key obstacles that have prevented many mid-market businesses
from deploying virtual desktops? How do next-generation virtual desktops
provide companies an easier-to-deploy, easier-to-manage and more affordable
virtual desktop model.http://www.accelacomm.com/jaw/sfnl/114/51426474/
^ permalink raw reply
* Re: [net-next 00/12] bna: Update bna driver version to 3.0.2.1
From: David Miller @ 2011-09-15 19:41 UTC (permalink / raw)
To: rmody; +Cc: netdev, adapter_linux_open_src_team
In-Reply-To: <1314754068-31978-1-git-send-email-rmody@brocade.com>
From: Rasesh Mody <rmody@brocade.com>
Date: Tue, 30 Aug 2011 18:27:36 -0700
> This series is re-submitted with the comments addressed:
> BNAD_PCI_UNMAP_SKB and BNAD_DIM_TIMER_STOP macros have been dropped
> and added bnad_pci_unmap_skb API.
> We are not adding new prefetch which we might selectively add later
> for performance improvement.
> This also addresses earlier comments.
>
> The following patch set contains TX and RX path changes and Ethtool
> enhancements. This also fixes bugs found with v3.0.2.0 code. It cleans
> up unused code, naming changes, formatting changes and comments
> addition/deletion.
>
> This updates the Brocade BNA driver to v3.0.2.1.
>
> The driver has been compiled & tested against net-next-2.6(3.0.0-rc7)
Series applied, thanks.
^ permalink raw reply
* Re: [patch 3/3 -next] 6LoWPAN: call dev_put() on error in lowpan_newlink()
From: David Miller @ 2011-09-15 19:42 UTC (permalink / raw)
To: error27-Re5JQEeQqe8AvxtiuMwx3w
Cc: netdev-u79uwXL29TY76Z2rM5mHXA,
kernel-janitors-u79uwXL29TY76Z2rM5mHXA,
linux-zigbee-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f
In-Reply-To: <20110830135109.GJ3705-z0WHZYlhLlzP0Z7Jsv878P8+0UxHXcjY@public.gmane.org>
From: Dan Carpenter <error27-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Date: Tue, 30 Aug 2011 16:51:09 +0300
> We should release the dev_hold() on error before returning here.
>
> Signed-off-by: Dan Carpenter <error27-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Applied.
------------------------------------------------------------------------------
Doing More with Less: The Next Generation Virtual Desktop
What are the key obstacles that have prevented many mid-market businesses
from deploying virtual desktops? How do next-generation virtual desktops
provide companies an easier-to-deploy, easier-to-manage and more affordable
virtual desktop model.http://www.accelacomm.com/jaw/sfnl/114/51426474/
^ permalink raw reply
* Re: [PATCH v2 -next] 6LoWPAN: fix skb_copy call
From: David Miller @ 2011-09-15 19:42 UTC (permalink / raw)
To: alex.bluesman.smirnov-Re5JQEeQqe8AvxtiuMwx3w
Cc: eric.dumazet-Re5JQEeQqe8AvxtiuMwx3w,
netdev-u79uwXL29TY76Z2rM5mHXA,
kernel-janitors-u79uwXL29TY76Z2rM5mHXA,
linux-zigbee-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f
In-Reply-To: <1314881653-1104-1-git-send-email-alex.bluesman.smirnov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
From: Alexander Smirnov <alex.bluesman.smirnov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Date: Thu, 1 Sep 2011 16:54:13 +0400
> This patch fixes 2 issues in lowpan_skb_deliver function:
> 1. Check for return status of skb_copy call;
> 2. Use skb_copy with proper GFP flag depending on context.
>
> Signed-off-by: Alexander Smirnov <alex.bluesman.smirnov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Applied.
------------------------------------------------------------------------------
Doing More with Less: The Next Generation Virtual Desktop
What are the key obstacles that have prevented many mid-market businesses
from deploying virtual desktops? How do next-generation virtual desktops
provide companies an easier-to-deploy, easier-to-manage and more affordable
virtual desktop model.http://www.accelacomm.com/jaw/sfnl/114/51426474/
^ permalink raw reply
* Re: [PATCH v3 -next] 6LoWPAN: fix skb_copy call
From: David Miller @ 2011-09-15 19:43 UTC (permalink / raw)
To: alex.bluesman.smirnov-Re5JQEeQqe8AvxtiuMwx3w
Cc: eric.dumazet-Re5JQEeQqe8AvxtiuMwx3w,
netdev-u79uwXL29TY76Z2rM5mHXA,
kernel-janitors-u79uwXL29TY76Z2rM5mHXA,
linux-zigbee-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f
In-Reply-To: <1314885315-4033-1-git-send-email-alex.bluesman.smirnov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
From: Alexander Smirnov <alex.bluesman.smirnov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Date: Thu, 1 Sep 2011 17:55:15 +0400
> This patch fixes 2 issues in lowpan_skb_deliver function:
> 1. Check for return status of skb_copy call;
> 2. Use skb_copy with proper GFP flag, drop check for non-interrupt
> context.
>
> Signed-off-by: Alexander Smirnov <alex.bluesman.smirnov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Just to make it clear, I applied -v3 of this patch not -v2. :-)
------------------------------------------------------------------------------
Doing More with Less: The Next Generation Virtual Desktop
What are the key obstacles that have prevented many mid-market businesses
from deploying virtual desktops? How do next-generation virtual desktops
provide companies an easier-to-deploy, easier-to-manage and more affordable
virtual desktop model.http://www.accelacomm.com/jaw/sfnl/114/51426474/
^ permalink raw reply
* Re: [PATCH -mm RESEND] net, rds, Replace xlist in net/rds/xlist.h with llist
From: David Miller @ 2011-09-15 19:43 UTC (permalink / raw)
To: ying.huang
Cc: akpm, linux-kernel, rds-devel, netdev, chris.mason, andy.grover
In-Reply-To: <1314753690-31250-1-git-send-email-ying.huang@intel.com>
From: Huang Ying <ying.huang@intel.com>
Date: Wed, 31 Aug 2011 09:21:30 +0800
> The functionality of xlist and llist is almost same. This patch
> replace xlist with llist to avoid code duplication.
>
> Known issues: don't know how to test this, need special hardware?
>
> Signed-off-by: Huang Ying <ying.huang@intel.com>
Applied.
^ permalink raw reply
* Re: [PATCH net-next] net: linkwatch: allow vlans to get carrier changes faster
From: David Miller @ 2011-09-15 19:44 UTC (permalink / raw)
To: eric.dumazet
Cc: mitsuo.hayasaka.hu, herbert, shemminger, kaber, mirq-linux,
therbert, jesse, netdev, linux-kernel, yrl.pp-manager.tt
In-Reply-To: <1314783118.2801.13.camel@edumazet-HP-Compaq-6005-Pro-SFF-PC>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Wed, 31 Aug 2011 11:31:58 +0200
> There is a time-lag of IFF_RUNNING flag consistency between vlan and
> real devices when the real devices are in problem such as link or cable
> broken.
>
> This leads to a degradation of Availability such as a delay of failover
> in HA systems using vlan since the detection of the problem at real
> device is delayed.
>
> We can avoid the linkwatch delay (~1 sec) for devices linked to another
> ones, since delay is already done for the realdev.
>
> Based on a previous patch from Mitsuo Hayasaka
>
> Reported-by: Mitsuo Hayasaka <mitsuo.hayasaka.hu@hitachi.com>
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Applied.
^ permalink raw reply
* Re: [PATCH] mii: Remove references to DP83840 PHY in mii.h
From: David Miller @ 2011-09-15 19:44 UTC (permalink / raw)
To: mark.einon; +Cc: netdev
In-Reply-To: <1314804928-7353-1-git-send-email-mark.einon@gmail.com>
From: Mark Einon <mark.einon@gmail.com>
Date: Wed, 31 Aug 2011 16:35:28 +0100
> There are references to this PHY chip in the generic mii.h header, so removing them.
>
> Signed-off-by: Mark Einon <mark.einon@gmail.com>
Applied.
^ permalink raw reply
* Re: [PATCH 1/2] [TRIVIAL] mii: Convert spaces to tabs in mii.h
From: David Miller @ 2011-09-15 19:45 UTC (permalink / raw)
To: mark.einon; +Cc: netdev, bhutchings
In-Reply-To: <1314868937-2536-1-git-send-email-mark.einon@gmail.com>
From: Mark Einon <mark.einon@gmail.com>
Date: Thu, 1 Sep 2011 10:22:16 +0100
> Whitespace changes - spaces converted to tabs after each define name and value
>
> Signed-off-by: Mark Einon <mark.einon@gmail.com>
Applied.
^ permalink raw reply
* Re: [patch net-next-2.6] br: remove redundant check and init
From: David Miller @ 2011-09-15 19:43 UTC (permalink / raw)
To: jpirko; +Cc: netdev, eric.dumazet, shemminger, bridge
In-Reply-To: <1314883778-2706-1-git-send-email-jpirko@redhat.com>
From: Jiri Pirko <jpirko@redhat.com>
Date: Thu, 1 Sep 2011 15:29:38 +0200
> Since these checks and initialization are done in
> dev_ethtool_get_settings called later on, remove this redundancy.
>
> Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Applied.
^ permalink raw reply
* Re: [PATCH 0/9] update the stmmac to the version Aug_2011 (v3)
From: David Miller @ 2011-09-15 19:45 UTC (permalink / raw)
To: peppe.cavallaro; +Cc: netdev, bhutchings
In-Reply-To: <1314949903-26137-1-git-send-email-peppe.cavallaro@st.com>
From: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
Date: Fri, 2 Sep 2011 09:51:34 +0200
> These patches update the driver adding new supports:
> MMC (HW management counters), HW feature register and
> debugfs support.
>
> MMC counters are exposed via ethtool.
>
> These also update the documentation adding a new section
> for the debugging.
Series applied.
^ permalink raw reply
* Re: [net-next] MII: fix Kconfig dependencies for MII
From: David Miller @ 2011-09-15 19:49 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo
In-Reply-To: <1316071394-18195-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Thu, 15 Sep 2011 00:23:14 -0700
> MII Kconfig option is apart of the core networking drivers and
> by default NET_CORE is enabled so drivers selecting MII will
> have MII enabled as well. It was found using the randconfig
> option during testing, MII would be selected but NET_CORE
> could be disabled. This caused a dependency error.
>
> Resolved the dependency by selecting NET_CORE when MII is
> selected.
>
> Reported-by: Emil Tantilov <emil.s.tantilov@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Applied, thanks Jeff.
^ permalink raw reply
* Re: [PATCH net v2 0/6] bnx2x: Few link fixes
From: David Miller @ 2011-09-15 19:53 UTC (permalink / raw)
To: yanivr; +Cc: eilong, netdev
In-Reply-To: <1315392464.27750.21.camel@lb-tlvb-dmitry>
From: "Yaniv Rosner" <yanivr@broadcom.com>
Date: Wed, 7 Sep 2011 13:47:44 +0300
> Following Ben's suggestion, I'm resending the following patch series
> describing some link fixes. Please consider applying it to net.
I originally said that I'd want these targetted for net-next instead,
but I've changed my mind and decided to indeed apply these changes to
the net GIT tree, thanks.
^ permalink raw reply
* Re: [PATCH net-next 0/8] tg3: Odds and ends
From: David Miller @ 2011-09-15 19:57 UTC (permalink / raw)
To: mcarlson; +Cc: netdev
In-Reply-To: <1314827094-29714-1-git-send-email-mcarlson@broadcom.com>
From: "Matt Carlson" <mcarlson@broadcom.com>
Date: Wed, 31 Aug 2011 14:44:46 -0700
> This patchset applies a few minor changes and cleans up some
> unnecessary function prototypes.
Applied, but as Joe Perches stated patch #8 claimed it just was
"code movement" but a test in the code was changed. Please don't
do that again.
^ permalink raw reply
* pull request: wireless 2011-09-15
From: John W. Linville @ 2011-09-15 19:48 UTC (permalink / raw)
To: davem; +Cc: linux-wireless, netdev, linux-kernel
Dave,
Here is a batch of fixes intended for 3.1. Included is a calibration
fix for ath9k that avoids a hang, a couple of rtlwifi fixes for
connection failures, a mac80211 locking fix, a couple of iwlagn fixes
(including a corruption fix), an ath9k oops fix, an initialization
fix for AR9330 hardware in ath9k, and a patch to avoid a needless
BUG_ON in iwlegacy.
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit 31dda0ae933bb9fea9cfe000b698c41af0417cac:
net: don't clear IFF_XMIT_DST_RELEASE in ether_setup (2011-09-15 14:49:44 -0400)
are available in the git repository at:
git://git.infradead.org/users/linville/wireless.git for-davem
Felix Fietkau (1):
ath9k_hw: fix calibration on 5 ghz
George (2):
rtlwifi: rtl8192su: Fix problem connecting to HT-enabled AP
rtlwifi: Fix problem when switching connections
Johannes Berg (3):
mac80211: fix missing sta_lock in __sta_info_destroy
iwlagn: fix stack corruption
iwlagn: fix command queue timeout
John W. Linville (1):
Merge branch 'master' of git://git.infradead.org/users/linville/wireless into for-davem
Mohammed Shafi Shajakhan (1):
ath9k: Fix kernel panic on unplugging the device
Rajkumar Manoharan (1):
ath9k_hw: Fix init mode register regression
Stanislaw Gruszka (1):
iwlegacy: fix BUG_ON(info->control.rates[0].idx < 0)
drivers/net/wireless/ath/ath9k/ar9002_calib.c | 3 ++-
drivers/net/wireless/ath/ath9k/ar9003_phy.c | 2 +-
drivers/net/wireless/ath/ath9k/main.c | 6 ++++++
drivers/net/wireless/iwlegacy/iwl-3945-rs.c | 13 ++++++++-----
drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 2 +-
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c | 2 ++
drivers/net/wireless/rtlwifi/core.c | 8 ++++++++
drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 11 ++++++-----
net/mac80211/sta_info.c | 2 +-
9 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_calib.c b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
index 2d4c091..2d394af 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
@@ -41,7 +41,8 @@ static bool ar9002_hw_is_cal_supported(struct ath_hw *ah,
case ADC_DC_CAL:
/* Run ADC Gain Cal for non-CCK & non 2GHz-HT20 only */
if (!IS_CHAN_B(chan) &&
- !(IS_CHAN_2GHZ(chan) && IS_CHAN_HT20(chan)))
+ !((IS_CHAN_2GHZ(chan) || IS_CHAN_A_FAST_CLOCK(ah, chan)) &&
+ IS_CHAN_HT20(chan)))
supported = true;
break;
}
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
index 1baca8e..fcafec0 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
@@ -671,7 +671,7 @@ static int ar9003_hw_process_ini(struct ath_hw *ah,
REG_WRITE_ARRAY(&ah->iniModesAdditional,
modesIndex, regWrites);
- if (AR_SREV_9300(ah))
+ if (AR_SREV_9330(ah))
REG_WRITE_ARRAY(&ah->iniModesAdditional, 1, regWrites);
if (AR_SREV_9340(ah) && !ah->is_clk_25mhz)
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 6530694..722967b 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -2303,6 +2303,12 @@ static void ath9k_flush(struct ieee80211_hw *hw, bool drop)
mutex_lock(&sc->mutex);
cancel_delayed_work_sync(&sc->tx_complete_work);
+ if (ah->ah_flags & AH_UNPLUGGED) {
+ ath_dbg(common, ATH_DBG_ANY, "Device has been unplugged!\n");
+ mutex_unlock(&sc->mutex);
+ return;
+ }
+
if (sc->sc_flags & SC_OP_INVALID) {
ath_dbg(common, ATH_DBG_ANY, "Device not present\n");
mutex_unlock(&sc->mutex);
diff --git a/drivers/net/wireless/iwlegacy/iwl-3945-rs.c b/drivers/net/wireless/iwlegacy/iwl-3945-rs.c
index 977bd24..164bcae 100644
--- a/drivers/net/wireless/iwlegacy/iwl-3945-rs.c
+++ b/drivers/net/wireless/iwlegacy/iwl-3945-rs.c
@@ -822,12 +822,15 @@ static void iwl3945_rs_get_rate(void *priv_r, struct ieee80211_sta *sta,
out:
- rs_sta->last_txrate_idx = index;
- if (sband->band == IEEE80211_BAND_5GHZ)
- info->control.rates[0].idx = rs_sta->last_txrate_idx -
- IWL_FIRST_OFDM_RATE;
- else
+ if (sband->band == IEEE80211_BAND_5GHZ) {
+ if (WARN_ON_ONCE(index < IWL_FIRST_OFDM_RATE))
+ index = IWL_FIRST_OFDM_RATE;
+ rs_sta->last_txrate_idx = index;
+ info->control.rates[0].idx = index - IWL_FIRST_OFDM_RATE;
+ } else {
+ rs_sta->last_txrate_idx = index;
info->control.rates[0].idx = rs_sta->last_txrate_idx;
+ }
IWL_DEBUG_RATE(priv, "leave: %d\n", index);
}
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c b/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
index a895a09..5621100 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
@@ -167,7 +167,7 @@ static int iwlagn_set_temperature_offset_calib(struct iwl_priv *priv)
memset(&cmd, 0, sizeof(cmd));
iwl_set_calib_hdr(&cmd.hdr, IWL_PHY_CALIBRATE_TEMP_OFFSET_CMD);
- memcpy(&cmd.radio_sensor_offset, offset_calib, sizeof(offset_calib));
+ memcpy(&cmd.radio_sensor_offset, offset_calib, sizeof(*offset_calib));
if (!(cmd.radio_sensor_offset))
cmd.radio_sensor_offset = DEFAULT_RADIO_SENSOR_OFFSET;
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
index a6b2b1d..222d410 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
@@ -771,6 +771,8 @@ void iwl_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)
cmd = txq->cmd[cmd_index];
meta = &txq->meta[cmd_index];
+ txq->time_stamp = jiffies;
+
iwlagn_unmap_tfd(priv, meta, &txq->tfds[index], DMA_BIDIRECTIONAL);
/* Input error checking is done when commands are added to queue. */
diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c
index 1bdc1aa..04c4e9e 100644
--- a/drivers/net/wireless/rtlwifi/core.c
+++ b/drivers/net/wireless/rtlwifi/core.c
@@ -610,6 +610,11 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
mac->link_state = MAC80211_NOLINK;
memset(mac->bssid, 0, 6);
+
+ /* reset sec info */
+ rtl_cam_reset_sec_info(hw);
+
+ rtl_cam_reset_all_entry(hw);
mac->vendor = PEER_UNKNOWN;
RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,
@@ -1063,6 +1068,9 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
*or clear all entry here.
*/
rtl_cam_delete_one_entry(hw, mac_addr, key_idx);
+
+ rtl_cam_reset_sec_info(hw);
+
break;
default:
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
index 906e7aa..3e52a54 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
@@ -549,15 +549,16 @@ void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw,
(tcb_desc->rts_use_shortpreamble ? 1 : 0)
: (tcb_desc->rts_use_shortgi ? 1 : 0)));
if (mac->bw_40) {
- if (tcb_desc->packet_bw) {
+ if (rate_flag & IEEE80211_TX_RC_DUP_DATA) {
SET_TX_DESC_DATA_BW(txdesc, 1);
SET_TX_DESC_DATA_SC(txdesc, 3);
+ } else if(rate_flag & IEEE80211_TX_RC_40_MHZ_WIDTH){
+ SET_TX_DESC_DATA_BW(txdesc, 1);
+ SET_TX_DESC_DATA_SC(txdesc, mac->cur_40_prime_sc);
} else {
SET_TX_DESC_DATA_BW(txdesc, 0);
- if (rate_flag & IEEE80211_TX_RC_DUP_DATA)
- SET_TX_DESC_DATA_SC(txdesc,
- mac->cur_40_prime_sc);
- }
+ SET_TX_DESC_DATA_SC(txdesc, 0);
+ }
} else {
SET_TX_DESC_DATA_BW(txdesc, 0);
SET_TX_DESC_DATA_SC(txdesc, 0);
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 3db78b6..21070e9 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -665,7 +665,7 @@ static int __must_check __sta_info_destroy(struct sta_info *sta)
BUG_ON(!sdata->bss);
atomic_dec(&sdata->bss->num_sta_ps);
- __sta_info_clear_tim_bit(sdata->bss, sta);
+ sta_info_clear_tim_bit(sta);
}
local->num_sta--;
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox