aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-08-02ipvs: remove EXPERIMENTAL tagSimon Horman1-1/+1
IPVS was merged into the kernel quite a long time ago and has been seeing wide-spread production use for even longer. It seems appropriate for it to be no longer tagged as EXPERIMENTAL Signed-off-as: Simon Horman <[email protected]> Signed-off-by: Patrick McHardy <[email protected]>
2010-08-02netfilter: nf_conntrack_extend: introduce __nf_ct_ext_exist()Changli Gao2-12/+19
some users of nf_ct_ext_exist() know ct->ext isn't NULL. For these users, the check for ct->ext isn't necessary, the function __nf_ct_ext_exist() can be used instead. the type of the return value of nf_ct_ext_exist() is changed to bool. Signed-off-by: Changli Gao <[email protected]> Signed-off-by: Patrick McHardy <[email protected]>
2010-08-02netfilter: {ip,ip6,arp}_tables: dont block bottom half more than necessaryEric Dumazet3-12/+18
We currently disable BH for the whole duration of get_counters() On machines with a lot of cpus and large tables, this might be too long. We can disable preemption during the whole function, and disable BH only while fetching counters for the current cpu. Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: Patrick McHardy <[email protected]>
2010-08-01net: ingress filter message limitStephen Hemminger1-4/+4
If user misconfigures ingress and causes a redirection loop, don't overwhelm the log. This is also a error case so make it unlikely. Found by inspection, luckily not in real system. Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-08-01net/rose: Use GFP_ATOMICJulia Lawall1-1/+3
The other calls to kmalloc in the same function use GFP_ATOMIC, and indeed two locks are held within the body of the function. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ identifier f; @@ *f(...,GFP_ATOMIC,...) ... when != spin_unlock(...) when != read_unlock(...) when != write_unlock(...) when != read_unlock_irq(...) when != write_unlock_irq(...) when != read_unlock_irqrestore(...) when != write_unlock_irqrestore(...) when != spin_unlock_irq(...) when != spin_unlock_irqrestore(...) *f(...,GFP_KERNEL,...) // </smpl> Signed-off-by: Julia Lawall <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-31act_nat: the checksum of ICMP doesn't have pseudo headerChangli Gao1-1/+1
after updating the value of the ICMP payload, inet_proto_csum_replace4() should be called with zero pseudohdr. Signed-off-by: Changli Gao <[email protected]> Acked-by: Herbert Xu <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-31act_nat: fix wild pointerChangli Gao1-0/+1
pskb_may_pull() may change skb pointers, so adjust icmph after pskb_may_pull(). Signed-off-by: Changli Gao <[email protected]> Acked-by: Herbert Xu <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-30be2net: fix to avoid sending get_stats request if one is already being ↵Ajit Khaparde3-1/+5
processed. GET_STATS request uses the same memory region as the response. If a new request for get stats is fired before the response for the previous get_stats request is received, the response will corrupt the new request, causing the f/w to misbehave. Signed-off-by: Somnath K <[email protected]> Signed-off-by: Ajit Khaparde <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-30be2net: change to show correct physical link statusAjit Khaparde1-1/+2
link status is wrongly displayed under certain circumstances. This change fixes it. Signed-off-by: Somnath K <[email protected]> Signed-off-by: Ajit Khaparde <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-30be2net: add code to dump registers for debugAjit Khaparde5-0/+140
when the BE device becomes unresponsive, dump the registers to help debugging Signed-off-by: Somnath K <[email protected]> Signed-off-by: Ajit Khaparde <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-30be2net: fix to correctly know if driver needs to run for a VF or a PFAjit Khaparde1-2/+3
Move be_check_sriov_fn_type to appropriate place to correctly determine if the be2net driver needs to work as a VF driver or a PF driver. Signed-off-by: Ajit Khaparde <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-30sky2: Code style fixesMike McCormack1-12/+12
Fix selected style problems reported by checkpatch. Signed-off-by: Mike McCormack <[email protected]> Acked-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-30TI DaVinci EMAC: Fix incorrect reference to EMAC_CTRL registers.Sriram1-3/+5
The EMAC modules control registers vary as per the version of the EMAC module. EMAC_CTRL_EWCTL,EMAC_CTRL_EWINTTCNT are available only on EMAC_VERSION_1. The emac_dump_regs() function accesses these indiscriminately. This patch fixes the issue. Signed-off-by: Sriramakrishnan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-30TI DaVinci EMAC: Fix asymmetric handling of packets in NAPI Poll function.Sriram1-13/+8
The current implementation of NAPI poll function in the driver does not service Rx packets, error condition even if a single Tx packet gets serviced in the napi poll call. This behavior severely affects performance for specific use cases. This patch modifies the poll function implementation to service tx/rx packets in an identical manner. Signed-off-by: Sriramakrishnan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-30TI DaVinci EMAC : Implement interrupt pacing functionality.Sriram1-2/+131
DaVinci EMAC module includes an interrupt pacing block that can be programmed to throttle the rate at which interrupts are generated. This patch implements interrupt pacing logic that can be controlled through the ethtool interface(only rx_coalesce_usecs param is honored) Signed-off-by: Sriramakrishnan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-30bridge: Allow multicast snooping to be disabled before ifupHerbert Xu1-5/+4
Currently you cannot disable multicast snooping while a device is down. There is no good reason for this restriction and this patch removes it. Signed-off-by: Herbert Xu <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-30bridge: Fix skb leak when multicast parsing fails on TXHerbert Xu1-1/+3
On the bridge TX path we're leaking an skb when br_multicast_rcv returns an error. Reported-by: David Lamparter <[email protected]> Signed-off-by: Herbert Xu <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-30dnet: fixup error handling in initializationDan Carpenter1-2/+5
There were two problems here. We returned success if dnet_mii_init() failed and there was a release_mem_region() missing. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-30bonding: prevent sysfs from allowing arp monitoring with alb/tlbAndy Gospodarek1-12/+25
When using module options arp monitoring and balance-alb/balance-tlb are mutually exclusive options. Anytime balance-alb/balance-tlb are enabled mii monitoring is forced to 100ms if not set. When configuring via sysfs no checking is currently done. Handling these cases with sysfs has to be done a bit differently because we do not have all configuration information available at once. This patch will not allow a mode change to balance-alb/balance-tlb if arp_interval is already non-zero. It will also not allow the user to set a non-zero arp_interval value if the mode is already set to balance-alb/balance-tlb. They are still mutually exclusive on a first-come, first serve basis. Tested with initscripts on Fedora and manual setting via sysfs. Signed-off-by: Andy Gospodarek <[email protected]> Signed-off-by: Jay Vosburgh <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-30drivers/net/vxge/vxge-main.c: Use pr_<level> and netdev_<level>Joe Perches1-16/+11
Use pr_fmt, pr_<level> and netdev_<level> where appropriate. Signed-off-by: Joe Perches <[email protected]> Acked-by: Jon Mason <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-30tcp: cookie transactions setsockopt memory leakDmitry Popov1-2/+5
There is a bug in do_tcp_setsockopt(net/ipv4/tcp.c), TCP_COOKIE_TRANSACTIONS case. In some cases (when tp->cookie_values == NULL) new tcp_cookie_values structure can be allocated (at cvp), but not bound to tp->cookie_values. So a memory leak occurs. Signed-off-by: Dmitry Popov <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-30net: ks8842 depends on DMA_ENGINERandy Dunlap1-1/+1
ks8842 uses dma channel functions, so it should depend on DMA_ENGINE. ERROR: "__dma_request_channel" [drivers/net/ks8842.ko] undefined! ERROR: "dma_release_channel" [drivers/net/ks8842.ko] undefined! Signed-off-by: Randy Dunlap <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-30ucc_geth: fix UCC device number in debug messageSergey Matyukevich1-1/+1
This patch contains a fix for UCC device number in verbose debug message. Signed-off-by: Sergey Matyukevich <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-30tun: keep link (carrier) state up to dateNolan Leake1-7/+3
Currently, only ethtool can get accurate link state of a tap device. With this patch, IFF_RUNNING and IF_OPER_UP/DOWN are kept up to date as well. Signed-off-by: Nolan Leake <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-29Merge branch 'master' of ↵John W. Linville145-2826/+3858
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
2010-07-29cfg80211: fix dev <-> wiphy typoChristian Lamparter1-1/+1
Cc: Joe Perches <[email protected]> Signed-off-by: Christian Lamparter <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-29mac80211: allow drivers to request DTIM periodJohannes Berg5-5/+84
Some features require knowing the DTIM period before associating. This implements the ability to wait for a beacon in mac80211 before assoc to provide this value. It is optional since most likely not all drivers will need this. Signed-off-by: Johannes Berg <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-29iwlwifi: fix scan abortStanislaw Gruszka1-10/+8
Fix possible double priv->mutex lock introduced by commit a69b03e941abae00380fc6bc1877fb797a1b31e6 "iwlwifi: cancel scan watchdog in iwl_bg_abort_scan" . We can not call cancel_delayed_work_sync(&priv->scan_check) with priv->mutex locked because workqueue function iwl_bg_scan_check() take that lock internally. We do not need to synchronize when canceling priv->scan_check work. We can avoid races (sending double abort command or send no command at all) using STATUS_SCAN_ABORT bit. Moreover current iwl_bg_scan_check() code seems to be broken, as we should not send abort commands when currently aborting. Signed-off-by: Stanislaw Gruszka <[email protected]> CC: [email protected] Signed-off-by: John W. Linville <[email protected]>
2010-07-29mwl8k: change maintenance statusLennert Buytenhek1-1/+1
The 8366 AP support in particular is still rather incomplete, but this is unlikely to be addressed any time soon. Signed-off-by: Lennert Buytenhek <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-29wl1271: update hw/fw version info in wiphy structJohn W. Linville1-0/+7
This makes the information available through ethtool... Signed-off-by: John W. Linville <[email protected]> Acked-by: Juuso Oikarinen <[email protected]>
2010-07-29wl1251: update hw/fw version info in wiphy structJohn W. Linville1-0/+5
This makes the information available through ethtool... Signed-off-by: John W. Linville <[email protected]> Acked-by: Kalle Valo <[email protected]>
2010-07-29wl1271: add get_survey callback in order to get channel noiseJohn W. Linville3-0/+27
Signed-off-by: John W. Linville <[email protected]> Acked-by: Juuso Oikarinen <[email protected]>
2010-07-29libertas_tf: add get_survey callback in order to get channel noiseJohn W. Linville2-0/+21
Signed-off-by: John W. Linville <[email protected]>
2010-07-29wl1251: add get_survey callback in order to get channel noiseJohn W. Linville3-0/+26
Signed-off-by: John W. Linville <[email protected]> Acked-by: Kalle Valo <[email protected]>
2010-07-29ar9170: add get_survey callback in order to get channel noiseJohn W. Linville1-0/+19
Signed-off-by: John W. Linville <[email protected]> Acked-by: Christian Lamparter <[email protected]>
2010-07-29mwl8k: add get_survey callback in order to get channel noiseJohn W. Linville1-4/+27
Signed-off-by: John W. Linville <[email protected]> Acked-by: Lennert Buytenhek <[email protected]>
2010-07-29ath9k: enable serialize_regmode for non-PCIE AR9160John W. Linville1-1/+2
https://bugzilla.kernel.org/show_bug.cgi?id=16476 Signed-off-by: John W. Linville <[email protected]> Acked-by: Luis R. Rodriguez <[email protected]> Cc: [email protected]
2010-07-28net: bnx2x_cmn.c needs net/ip6_checksum.h for csum_ipv6_magicStephen Rothwell1-0/+1
Signed-off-by: Stephen Rothwell <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-28mac80211: inform drivers about the off-channel status on channel changesFelix Fietkau2-0/+6
For some drivers it can be useful to know whether the channel they're supposed to switch to is going to be used for short off-channel work or scanning, or whether the hardware is expected to stay on it for a while longer. This is important for various kinds of calibration work, which takes longer to complete and should keep some persistent state, even if the channel temporarily changes. Signed-off-by: Felix Fietkau <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-28Revert "mac80211: fix sw scan bracketing"Luis R. Rodriguez1-2/+2
This reverts this commit. While in theory the change is correct the patch does not address current assumptions made by some drivers, one which is definitley affected is ath9k. Prior to this change the scan complete callback would be called after we returned to the home channel and configured the hardware RX filters. After this change we call the scan complete callback prior to both the hw config and the config filter. At least for ath9k this breaks quite a few assumptions on the callback, leading to disconnects to the AP after every scan making the driver pretty useless on STA mode. The goal behind this commit was to address the now understood spurious warnings from ath9k and mac80211_hwsim on scanning on two wiphys at the same time but we have now supressed these and will address this issue in the next kernel release. When fixing this for good next we must first review the other driver's dependence on this logic and perhaps consider removal of the scan complete callback all together. Cc: Johannes Berg <[email protected]> Signed-off-by: Luis R. Rodriguez <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-28ath9k: remove the two wiphys scanning at the same time messageLuis R. Rodriguez1-4/+9
When issuing two consecutive scans you could often end up getting in the logs: "ath9k: Two wiphys trying to scan at the same time" This message is due to a race in mac80211 but addressing that race requires some more major changes on the driver and perhaps optimizations on mac80211 like removing the scan complete callback alltogether. Its too late to address this this kernel release so supress the complaint and annotate this needs fixing for later. Cc: Johannes Berg <[email protected]> Signed-off-by: Luis R. Rodriguez <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-28cfg80211: Update of regulatory request initiator handlingYuri Ershov1-1/+2
In some cases there could be possible dereferencing freed pointer. The update is intended to avoid this issue. Signed-off-by: Yuri Ershov <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-28nl80211: Fix memory leaksYuri Ershov1-0/+2
In case of errors during message composing msg should be freed after canceling. Signed-off-by: Yuri Kululin <[email protected]> Signed-off-by: Yuri Ershov <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-28mac80211: Put some code under MESH macroYuri Ershov1-0/+2
In the function ieee80211_subif_start_xmit the logic related with meshdrlen is under CONFIG_MAC80211_MESH macro, but in one place it isn't. This is some update for this Signed-off-by: Yuri Ershov <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-28Merge branch 'master' of ↵John W. Linville10-137/+63
git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
2010-07-28bridge: add rcu_read_lock on transmitstephen hemminger4-6/+8
Long ago, when bridge was converted to RCU, rcu lock was equivalent to having preempt disabled. RCU has changed a lot since then and bridge code was still assuming the since transmit was called with bottom half disabled, it was RCU safe. Signed-off-by: Stephen Hemminger <[email protected]> Tested-by: Johannes Berg <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-28vhost-net: mergeable buffers supportDavid Stevens3-18/+315
This adds support for mergeable buffers in vhost-net: this is needed for older guests without indirect buffer support, as well as for zero copy with some devices. Includes changes by Michael S. Tsirkin to make the patch as low risk as possible (i.e., close to no changes when feature is disabled). Signed-off-by: David Stevens <[email protected]> Signed-off-by: Michael S. Tsirkin <[email protected]>
2010-07-28vhost: apply cgroup to vhost workersMichael S. Tsirkin1-0/+6
Apply the cgroup of the owner task to the created vhost worker. Based on patches from Sridhar Samudrala's and Tejun Heo. Later we'll need to also apply cpumask and probably priority of the owner process. Discussion on the best way to do this is still ongoing. Signed-off-by: Michael S. Tsirkin <[email protected]> Cc: Tejun Heo <[email protected]> Cc: Sridhar Samudrala <[email protected]> Cc: Li Zefan <[email protected]>
2010-07-28cgroups: Add an API to attach a task to current task's cgroupSridhar Samudrala2-0/+30
Add a new kernel API to attach a task to current task's cgroup in all the active hierarchies. Signed-off-by: Sridhar Samudrala <[email protected]> Signed-off-by: Michael S. Tsirkin <[email protected]> Reviewed-by: Paul Menage <[email protected]> Acked-by: Li Zefan <[email protected]>
2010-07-28vhost: replace vhost_workqueue with per-vhost kthreadTejun Heo3-73/+164
Replace vhost_workqueue with per-vhost kthread. Other than callback argument change from struct work_struct * to struct vhost_work *, there's no visible change to vhost_poll_*() interface. This conversion is to make each vhost use a dedicated kthread so that resource control via cgroup can be applied. Partially based on Sridhar Samudrala's patch. * Updated to use sub structure vhost_work instead of directly using vhost_poll at Michael's suggestion. * Added flusher wake_up() optimization at Michael's suggestion. Changes by MST: * Converted atomics/barrier use to a spinlock. * Create thread on SET_OWNER * Fix flushing Signed-off-by: Tejun Heo <[email protected]> Signed-off-by: Michael S. Tsirkin <[email protected]> Cc: Sridhar Samudrala <[email protected]>