aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2008-10-08netfilter: rename ipt_recent to xt_recentJan Engelhardt8-49/+69
Like with other modules (such as ipt_state), ipt_recent.h is changed to forward definitions to (IOW include) xt_recent.h, and xt_recent.c is changed to use the new constant names. Signed-off-by: Jan Engelhardt <[email protected]> Signed-off-by: Patrick McHardy <[email protected]>
2008-10-08netfilter: Use unsigned types for hooknum and pf varsJan Engelhardt35-121/+127
and (try to) consistently use u_int8_t for the L3 family. Signed-off-by: Jan Engelhardt <[email protected]> Signed-off-by: Patrick McHardy <[email protected]>
2008-10-08Merge branches 'sched/devel', 'sched/cpu-hotplug', 'sched/cpusets' and ↵Ingo Molnar29-480/+680
'sched/urgent' into sched/core
2008-10-07Merge branch 'master' of ↵David S. Miller38-174/+1335
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
2008-10-07tcp: Fix tcp_hybla zero congestion window growth with small rho and large cwnd.Daniele Lacamera1-1/+5
Because of rounding, in certain conditions, i.e. when in congestion avoidance state rho is smaller than 1/128 of the current cwnd, TCP Hybla congestion control starves and the cwnd is kept constant forever. This patch forces an increment by one segment after #send_cwnd calls without increments(newreno behavior). Signed-off-by: Daniele Lacamera <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2008-10-07net: Fix netdev_run_todo dead-lockHerbert Xu2-22/+7
Benjamin Thery tracked down a bug that explains many instances of the error unregister_netdevice: waiting for %s to become free. Usage count = %d It turns out that netdev_run_todo can dead-lock with itself if a second instance of it is run in a thread that will then free a reference to the device waited on by the first instance. The problem is really quite silly. We were trying to create parallelism where none was required. As netdev_run_todo always follows a RTNL section, and that todo tasks can only be added with the RTNL held, by definition you should only need to wait for the very ones that you've added and be done with it. There is no need for a second mutex or spinlock. This is exactly what the following patch does. Signed-off-by: Herbert Xu <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2008-10-07ipv4: add mc_count to in_device.Rami Rosen2-2/+6
This patch add mc_count to struct in_device and updates increment/decrement/initilaize of this field in IPv4 and in IPv6. - Also printing the vfs /proc entry (/proc/net/igmp) is adjusted to use the new mc_count. Signed-off-by: Rami Rosen <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2008-10-07Merge branch 'master' of ↵David S. Miller2-5/+5
git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
2008-10-07tcp: Fix possible double-ack w/ user dmaAli Saidi1-1/+2
From: Ali Saidi <[email protected]> When TCP receive copy offload is enabled it's possible that tcp_rcv_established() will cause two acks to be sent for a single packet. In the case that a tcp_dma_early_copy() is successful, copied_early is set to true which causes tcp_cleanup_rbuf() to be called early which can send an ack. Further along in tcp_rcv_established(), __tcp_ack_snd_check() is called and will schedule a delayed ACK. If no packets are processed before the delayed ack timer expires the packet will be acked twice. Signed-off-by: David S. Miller <[email protected]>
2008-10-07net: only invoke dev->change_rx_flags when device is UPPatrick McHardy1-6/+10
Jesper Dangaard Brouer <[email protected]> reported a bug when setting a VLAN device down that is in promiscous mode: When the VLAN device is set down, the promiscous count on the real device is decremented by one by vlan_dev_stop(). When removing the promiscous flag from the VLAN device afterwards, the promiscous count on the real device is decremented a second time by the vlan_change_rx_flags() callback. The root cause for this is that the ->change_rx_flags() callback is invoked while the device is down. The synchronization is meant to mirror the behaviour of the ->set_rx_mode callbacks, meaning the ->open function is responsible for doing a full sync on open, the ->close() function is responsible for doing full cleanup on ->stop() and ->change_rx_flags() is meant to do incremental changes while the device is UP. Only invoke ->change_rx_flags() while the device is UP to provide the intended behaviour. Tested-by: Jesper Dangaard Brouer <[email protected]> Signed-off-by: Patrick McHardy <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2008-10-07netns: make uplitev6 mib per/namespaceDenis V. Lunev5-16/+15
Signed-off-by: Denis V. Lunev <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2008-10-07netns: make udpv6 mib per/namespaceDenis V. Lunev5-15/+13
Signed-off-by: Denis V. Lunev <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2008-10-07netns: add stub functions for per/namespace mibs allocationDenis V. Lunev1-2/+16
The content of init_ipv6_mibs/cleanup_ipv6_mibs will be moved to new calls one by one next. Signed-off-by: Denis V. Lunev <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2008-10-07netns: allow per device ipv6 snmp statistics in non-initial namespaceDenis V. Lunev1-3/+0
Signed-off-by: Denis V. Lunev <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2008-10-07netns: register global ipv6 mibs statistics in each namespaceDenis V. Lunev1-2/+4
Unused net variable will become used very soon. Signed-off-by: Denis V. Lunev <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2008-10-07ipv6: separate seq_ops for global & per/device ipv6 statisticsDenis V. Lunev1-16/+32
idev has been stored on seq->private. NULL has been stored for global statistics. The situation is changed with net namespace. We need to store pointer to struct net and the only place is seq->private. So, we'll have for /proc/net/dev_snmp6/* and for /proc/net/snmp6 pointers of two different types stored in the same field. This effectively requires to separate seq_ops of these files. Signed-off-by: Denis V. Lunev <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2008-10-07ipv6: consolidate ipv6 sock_stat code at the beginning of net/ipv6/proc.cDenis V. Lunev1-13/+13
Simple, comsolidate sockstat6 staff in one place, at the beginning of the file. Right now sockstat6_seq_open/sockstat6_seq_fops looks like an intrusion in the middle of snmp6 code. Signed-off-by: Denis V. Lunev <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2008-10-07netns: register /proc/net/dev_snmp6/* in each nsDenis V. Lunev1-24/+16
Do the same for /proc/net/snmp6. Signed-off-by: Denis V. Lunev <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2008-10-07netns: move /proc/net/dev_snmp6 to struct netDenis V. Lunev2-9/+15
Signed-off-by: Denis V. Lunev <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2008-10-07tcp: cleanup messy initializerIlpo Järvinen1-2/+2
I'm quite sure that if I give this function in its old format for you to inspect, you start to wonder what is the type of demanded or if it's a global variable. Signed-off-by: Ilpo Järvinen <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2008-10-07tcp: kill pointless urg_modeIlpo Järvinen5-19/+24
It all started from me noticing that this urgent check in tcp_clean_rtx_queue is unnecessarily inside the loop. Then I took a longer look to it and found out that the users of urg_mode can trivially do without, well almost, there was one gotcha. Bonus: those funny people who use urg with >= 2^31 write_seq - snd_una could now rejoice too (that's the only purpose for the between being there, otherwise a simple compare would have done the thing). Not that I assume that the rest of the tcp code happily lives with such mind-boggling numbers :-). Alas, it turned out to be impossible to set wmem to such numbers anyway, yes I really tried a big sendfile after setting some wmem but nothing happened :-). ...Tcp_wmem is int and so is sk_sndbuf... So I hacked a bit variable to long and found out that it seems to work... :-) Signed-off-by: Ilpo Järvinen <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2008-10-07net: packet split receive apiPeter Zijlstra2-0/+43
Add some packet-split receive hooks. For one this allows to do NUMA node affine page allocs. Later on these hooks will be extended to do emergency reserve allocations for fragments. Signed-off-by: Peter Zijlstra <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2008-10-07net: wrap sk->sk_backlog_rcv()Peter Zijlstra5-5/+10
Wrap calling sk->sk_backlog_rcv() in a function. This will allow extending the generic sk_backlog_rcv behaviour. Signed-off-by: Peter Zijlstra <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2008-10-07ipv6: initialize ip6_route sysctl vars in ip6_route_net_init()Peter Zijlstra2-8/+9
This makes that ip6_route_net_init() does all of the route init code. There used to be a race between ip6_route_net_init() and ip6_net_init() and someone relying on the combined result was left out cold. Signed-off-by: Peter Zijlstra <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2008-10-07ipv6: clean up ip6_route_net_init() error handlingPeter Zijlstra1-9/+10
ip6_route_net_init() error handling looked less than solid, fix 'er up. Signed-off-by: Peter Zijlstra <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2008-10-07[CIFS] make sure we have the right resume info before calling CIFSFindNextSteve French3-63/+70
When we do a seekdir() or equivalent, we usually end up doing a FindFirst call and then call FindNext until we get to the offset that we want. The problem is that when we call FindNext, the code usually doesn't have the proper info (mostly, the filename of the entry from the last search) to resume the search. Add a "last_entry" field to the cifs_search_info that points to the last entry in the search. We calculate this pointer by using the LastNameOffset field from the search parms that are returned. We then use that info to do a cifs_save_resume_key before we call CIFSFindNext. This patch allows CIFS to reliably pass the "telldir" connectathon test. Signed-off-by: Jeff Layton <[email protected]> CC: Stable <[email protected]> Signed-off-by: Steve French <[email protected]>
2008-10-07inet: Don't lookup the socket if there's a socket attached to the skbKOVACS Krisztian5-13/+41
Use the socket cached in the skb if it's present. Signed-off-by: KOVACS Krisztian <[email protected]> Acked-by: Arnaldo Carvalho de Melo <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2008-10-07inet: Add udplib_lookup_skb() helpersKOVACS Krisztian2-4/+24
To be able to use the cached socket reference in the skb during input processing we add a new set of lookup functions that receive the skb on their argument list. Signed-off-by: KOVACS Krisztian <[email protected]> Acked-by: Arnaldo Carvalho de Melo <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2008-10-07[CIFS] clean up error handling in cifs_unlinkSteve French1-20/+19
Currently, if a standard delete fails and we end up getting -EACCES we try to clear ATTR_READONLY and try the delete again. If that then fails with -ETXTBSY then we try a rename_pending_delete. We aren't handling other errors appropriately though. Another client could have deleted the file in the meantime and we get back -ENOENT, for instance. In that case we wouldn't do a d_drop. Instead of retrying in a separate call, simply goto the original call and use the error handling from that. Also, we weren't properly undoing any attribute changes that were done before returning an error back to the caller. CC: Jeff Layton <[email protected]> Signed-off-by: Steve French <[email protected]>
2008-10-07inet_hashtables: Add inet_lookup_skb helpersArnaldo Carvalho de Melo6-14/+31
To be able to use the cached socket reference in the skb during input processing we add a new set of lookup functions that receive the skb on their argument list. Signed-off-by: Arnaldo Carvalho de Melo <[email protected]> Signed-off-by: KOVACS Krisztian <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2008-10-07SLOB: fix bogus ksize calculationMatt Mackall1-1/+1
SLOB's ksize calculation was braindamaged and generally harmlessly underreported the allocation size. But for very small buffers, it could in fact overreport them, leading code depending on krealloc to overrun the allocation and trample other data. Signed-off-by: Matt Mackall <[email protected]> Tested-by: Peter Zijlstra <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-10-07[ARM] pxa: allow multi-machine PCMCIA buildsRussell King1-9/+11
Signed-off-by: Russell King <[email protected]>
2008-10-07[ARM] pxa: add preliminary CPUFREQ support for PXA3xxEric Miao2-0/+259
Signed-off-by: Eric Miao <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-07[ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.hEric Miao1-0/+22
Signed-off-by: Eric Miao <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-07[ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.cEric Miao2-2/+6
Signed-off-by: Eric Miao <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-07[ARM] pxa/zylonite: add support for USB OHCIEric Miao3-0/+25
Signed-off-by: Eric Miao <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-07[ARM] ohci-pxa27x: use ioremap() and offset for register accessEric Miao2-84/+109
This avoid the pre-mapping of OHCI controller register space, and the mapping is made only when necessary (OHCI is probed). Signed-off-by: Eric Miao <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-07[ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()Eric Miao2-4/+14
Direct access to pxa27x specific register PSSR in a generic ohci driver is no good, introduce pxa27x_clear_otgph() and move the implementation into processor specific code. Signed-off-by: Eric Miao <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-07[ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resourceEric Miao1-7/+17
Depending on the order of how resource is defined in the platform device is not good, use platform_get_{irq,resource} for the IRQ and memory resources. Signed-off-by: Eric Miao <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-07[ARM] ohci-pxa27x: move OHCI controller specific registers into the driverEric Miao2-75/+72
Signed-off-by: Eric Miao <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-07[ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registersEric Miao12-104/+70
Direct access to USB host controller registers is considered to be not portable, and is usually a bad sign for poorly abstracted interface. Introduce .flags and .power_on_delay to "struct pxaohci_platform_data" so that most platforms don't bother to write their own .init/.exit() sequences. Signed-off-by: Eric Miao <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-07[ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.cEric Miao2-38/+41
Signed-off-by: Eric Miao <[email protected]> Acked-by: Mark Brown <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-07[ARM] pxa: simplify DMA register definitionsEric Miao6-173/+19
1. DRCMRxx is no longer recommended, use DRCMR(xx) instead, and pass DRCMR index by "struct resource" if possible 2. DCSRxx, DDADRxx, DSADRxx, DTADRxx, DCMDxx is never used, use DCSR(), DDADR(), DSADR(), DTADR(), DCMD() instead Signed-off-by: Eric Miao <[email protected]> Acked-by: Nicolas Pitre <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-07[ARM] pxa: make additional DCSR bits valid for PXA3xxEric Miao1-6/+7
Signed-off-by: Eric Miao <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-07[ARM] pxa: move i2c register and bit definitions into i2c-pxa.cEric Miao2-44/+39
Signed-off-by: Eric Miao <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-07[ARM] pxa: fix incorrect initialization of mfp sysdev when not pxa2xxEric Miao1-0/+3
The initialization of mfp sysdev in pxa2xx_mfp_init() shall really be avoided when !cpu_is_pxa2xx(). Signed-off-by: Eric Miao <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-07Merge branches 'pxa-core' and 'pxa-machines' into pxa-allRussell King1025-14250/+47324
Conflicts: arch/arm/mach-pxa/Kconfig arch/arm/mach-pxa/pxa25x.c arch/arm/mach-pxa/pxa27x.c
2008-10-07Merge branch 'for_rmk' of git://git.mnementh.co.uk/linux-2.6-imRussell King11-436/+456
Merge branch 'pxa-eseries' into pxa-machines Conflicts: arch/arm/mach-pxa/Makefile
2008-10-07Merge branch 'viper-for-rmk' of git://www.misterjones.org/linux-2.6-armRussell King15-52/+2994
Merge branch 'pxa-viper' into pxa-machines Conflicts: arch/arm/mach-pxa/Makefile drivers/pcmcia/Kconfig drivers/pcmcia/Makefile
2008-10-07Merge branch 'pxa-palm' into pxa-machinesRussell King20-452/+2403
Conflicts: drivers/mfd/Kconfig drivers/pcmcia/Makefile
Powered by cgit, Gruvboxed by Blaster4385.