Commits · d8496efaede8930b74c1e364a75c55606c034e63 · Kirill Smelkov / linux

06 Feb, 2005 34 commits

[ATM]: [iphase] remove sleep_on*() usage · d8496efa

Chas Williams authored Feb 06, 2005

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>

d8496efa

[ATM]: [horizon] replace interruptible_sleep_on() with wait_event_interruptible() · d627bd38

Chas Williams authored Feb 06, 2005

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>

d627bd38

[CRYPTO]: Make some code static in i386 crypto AES. · e81e1fb3

Adrian Bunk authored Feb 06, 2005

This patch makes some needlessly global code static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: James Morris <jmorris@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

e81e1fb3

[NETLINK]: Use SKB_MAXORDER to calculate NLMSG_GOODSIZE · 8625513b

Thomas Graf authored Feb 06, 2005

NLMSG_GOODSIZE specifies a good default size for the skb tailroom
used in netlink messages when the size is unknown at the time of
the allocation.

The current value doesn't make much sense anymore because
skb_shared_info isn't taken into account which means that
depending on the architecture NLMSG_GOOSIZE can exceed PAGE_SIZE
resulting in a waste of almost a complete page.

Using SKB_MAXORDER solves this potential leak at the cost of
slightly smaller but safer sizes for some architectures.
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

8625513b

[NETFILTER]: Clean NAT status bits on module unload · 8bd2cfd8

Patrick McHardy authored Feb 06, 2005

another patch which I think should go in 2.6.11, it fixes a crash
when unloading, then reloading iptable_nat.

ip_nat_core doesn't clear the status bits in struct ip_conntrack on
module unload, but zeroes out the nat area. When the module is loaded
again and a connection times out ip_nat_cleanup_conntrack tries to
list_del the zeroed list-head and crashes. There are probably more
conditions under which it can crash or cause other misbehaviour.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

8bd2cfd8

Merge http://linux-mh.bkbits.net/bluetooth-2.6 · 2ef9978c
David S. Miller authored Feb 06, 2005
```
into nuts.davemloft.net:/disk1/BK/net-2.6
```
2ef9978c

[PKT_SCHED]: netem: memory leak · 1bdceede

Stephen Hemminger authored Feb 06, 2005

Good catch.. netem needs to free skb's that are dropped due to loss
simulation.
Signed-off-by: David S. Miller <davem@davemloft.net>

1bdceede

[IPV6]: Fix tunnel list locking in ip6_tunnel.c · 70c0a5c1

Hideaki Yoshifuji authored Feb 06, 2005

We need to fix tunnel list locking in ip6_tunnel.c as well.
Noticed by jean-mickael guerin <jean-mickael.guerin@6WIND.com>.
Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

70c0a5c1

[PKT_SCHED]: ipt action: add back pskb_expand_head() call · ea76b6c4

Patrick McHardy authored Feb 06, 2005

Jamal asked me to add back the call to pskb_expand_head before 2.6.11.
This fixes a regression caused by my tc action cleanup patches, the
tc actions most not replace packets, so it must prevent netfilter from
doing so.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

ea76b6c4

Merge bk://212.42.230.204/nf-2.6 · ce1c7242
David S. Miller authored Feb 06, 2005
```
into nuts.davemloft.net:/disk1/BK/net-2.6
```
ce1c7242
Merge bk://kernel.bkbits.net/davem/sparc-2.6 · b4232896
Linus Torvalds authored Feb 05, 2005
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
b4232896
Merge bk://kernel.bkbits.net/davem/net-2.6 · fb412d40
Linus Torvalds authored Feb 05, 2005
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
fb412d40
Merge bk://bart.bkbits.net/ide-2.6 · 80b8bedf
Linus Torvalds authored Feb 05, 2005
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
80b8bedf

[ide] remove unused pkt_task_t definition from ide.h · 7778727a

Tejun Heo authored Feb 06, 2005

Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

7778727a

[ide serverworks] merge serverworks.h into serverworks.c · 323a1e6c

Tejun Heo authored Feb 06, 2005

Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

323a1e6c

[ide serverworks] remove unused SVWKS_DEBUG_DRIVE_INFO · 4b8defdb

Tejun Heo authored Feb 06, 2005

Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

4b8defdb

[ide piix] merge piix.h into piix.c · 80285f66

Tejun Heo authored Feb 06, 2005

Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

80285f66

[ide piix] remove useless comment · 314c4a3b
Bartlomiej Zolnierkiewicz authored Feb 06, 2005
```
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
```
314c4a3b

[ide pdc202xx_old] merge pdc202xx_old.h into pdc202xx_old.c · 53c6f0f0

Tejun Heo authored Feb 06, 2005

Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

53c6f0f0

[ide pdc202xx_old] remove SPLIT_BYTE() macro · 944be132

Tejun Heo authored Feb 06, 2005

Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

944be132

[ide pdc202xx_new] merge pdc202xx_new.h into pdc202xx_new.c · ba6add2c

Tejun Heo authored Feb 06, 2005

Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

ba6add2c

[ide opti621] merge opti621.h into opti621.c · db201803

Tejun Heo authored Feb 06, 2005

Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

db201803

[ide it8172] merge it8172.h into it8172.c · 2b40e2a4

Tejun Heo authored Feb 06, 2005

Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

2b40e2a4

[ide hpt366] merge hpt366.h into hpt366.c · d2b619da

Tejun Heo authored Feb 06, 2005

bart: while at it do whitespace cleanup and add missing FIXME
Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

d2b619da

[ide hpt366] remove dead fifty_base_hpt374[] table · f1589928
Bartlomiej Zolnierkiewicz authored Feb 06, 2005
```
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
```
f1589928

[ide pci generic] merge generic.h into generic.c · 31f10992

Tejun Heo authored Feb 06, 2005

Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

31f10992

[ide pci generic] remove dummy init_chipset_generic() · aa842120
Bartlomiej Zolnierkiewicz authored Feb 06, 2005
```
->init_chipset is optional
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
```
aa842120
[ide pci generic] remove dead unknown_chipset[] table from generic.h · fc847693
Bartlomiej Zolnierkiewicz authored Feb 06, 2005
```
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
```
fc847693

[ide cy82c693] merge cy82c693.h into cy82c693.c · 41efe61e

Tejun Heo authored Feb 06, 2005

bart: do small whitespace cleanup while at it
Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

41efe61e

[ide cmd64x] merge cmd64x.h into cmd64x.c · 02e14670

Tejun Heo authored Feb 06, 2005

Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

02e14670

[ide aec62xx] merge aec62xx.h into aec62xx.c · a4b2fb92

Tejun Heo authored Feb 06, 2005

bart: s/byte/u8/
Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

a4b2fb92

[ide aec62xx] remove SPLIT_BYTE() and MAKE_WORD() macros · 442b13f5

Tejun Heo authored Feb 06, 2005

bart: leave BUSCLOCK() alone for now
Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

442b13f5

[ide] fix ide_dump_atapi_status() · 9a5a7622

Alexander Viro authored Feb 06, 2005

From: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>

On Fri, 4 Feb 2005, Al Viro wrote:

> BTW, ide-lib.c code that triggers the ICE happens to be completely broken.
> Jens, it's your patch from September 2002 - what used to be
>        if ((stat & (BUSY_STAT|ERR_STAT)) == ERR_STAT) {
> became
>        if ((status.all & (status.b.bsy|status.b.check)) == status.b.check) {
> and that's *not* an equivalent transformation.  Fixing it doesn't get rid
> of ICE, but it certainly deserves fixing.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

9a5a7622

[ide] fix hwif_init() to not return error for "empty" interfaces · e65f57e8

Jean Delvare authored Feb 06, 2005

Return success if no device is connected to the interface.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

e65f57e8

05 Feb, 2005 6 commits

Merge davem@nuts.davemloft.net:/disk1/BK/sparc-2.6 · d5ffe171
David S. Miller authored Feb 05, 2005
```
into kernel.bkbits.net:/home/davem/sparc-2.6
```
d5ffe171
Merge davem@nuts.davemloft.net:/disk1/BK/net-2.6 · 077a63ea
David S. Miller authored Feb 05, 2005
```
into kernel.bkbits.net:/home/davem/net-2.6
```
077a63ea
Merge davem@nuts.davemloft.net:/disk1/BK/sparc-2.6 · 15acb7ea
David S. Miller authored Feb 05, 2005
```
into kernel.bkbits.net:/home/davem/sparc-2.6
```
15acb7ea
[SPARC64]: Kill spurious semicolons in some system.h macros · 64c00c10
David S. Miller authored Feb 05, 2005
```
Signed-off-by: David S. Miller <davem@davemloft.net>
```
64c00c10

[NET]: Add barriers for dst refcnt. · 9eabad02

Herbert Xu authored Feb 05, 2005

In light of the recent discussion about sk_buff, I think we need
the following patch for dst_entry.  This adds a memory barrier
before dst_release drops the refcnt, and a read memory barrier
before dst_destroy starts destroying the entry.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

9eabad02

[NET]: Add missing memory barrier to kfree_skb(). · 09d3e84d

Herbert Xu authored Feb 05, 2005

Also kill kfree_skb_fast(), that is a relic from fast switching
which was killed off years ago.

The bug is that in the case where we do the atomic_read()
optimization, we need to make sure that reads of skb state
later in __kfree_skb() processing (particularly the skb->list
BUG check) are not reordered to occur before the counter
read by the cpu.

Thanks to Olaf Kirch and Anton Blanchard for discovering
and helping fix this bug.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

09d3e84d