linux.git/drivers/net, branch v2.6.22

potential compiler error, irqfunc caller sites update

2007-07-06T17:23:43+00:00

In 7d12e780e003f93433d49ce78cfedf4b4c52adc5 David Howells performed
this evolution:
 "IRQ: Maintain regs pointer globally rather than passing to IRQ handlers"

He correctly updated many of the function definitions that were using this
extra regs pointer parameter but forgot to update some caller sites of
those functions.  The reason the modifications was not properly done on all
drivers is that some drivers were rarely compiled because they are for
AMIGA, or that some code sites were inside #ifdefs where the option is not
set or inside #if 0.

Here is the semantic patch that found the occurences
and fixed the problem.

@ rule1 @
identifier fn;
identifier irq, dev_id;
typedef irqreturn_t;
@@

static irqreturn_t fn(int irq, void *dev_id)
{
   ...
}

@@
identifier rule1.fn;
expression E1, E2, E3;
@@

 fn(E1, E2
-   ,E3
   )

Signed-off-by: Yoann Padioleau 
Cc: "David S. Miller" 
Cc: Jeff Garzik 
Cc: Greg KH 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

2007-07-05T22:55:00+00:00

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Update defconfigs
  [POWERPC] Uninline and export virq_to_hw() for the pasemi_mac driver
  [POWERPC] Fix PMI breakage in cbe_cbufreq driver
  [POWERPC] Disable old EMAC driver in arch/powerpc

Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

2007-07-03T04:05:35+00:00

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  IPoIB/cm: Partial error clean up unmaps wrong address
  mlx4_core: Add new Mellanox device IDs

mlx4_core: Add new Mellanox device IDs

2007-07-03T03:41:35+00:00

Add new IDs for PCIe gen2 devices.

Signed-off-by: Jack Morgenstein 
Signed-off-by: Roland Dreier

3c589_cs: fix local_bh_enable warning

2007-07-02T14:50:46+00:00

Russell King wrote:
> Having upgraded from 2.6.16 to 2.6.22-rc6, I'm now seeing the following.
>
> Looks like netfilter is calling local_bh_enable() with IRQs disabled,
> which would appear to be illegal.  Thankfully, this is a warn-once
> warning.
>
> WARNING: at /home/rmk/git/linux-2.6-rmk/kernel/softirq.c:138 local_bh_enable()
> [...]
> [] (nf_conntrack_destroy+0x0/0x2c) from [] (__kfree_skb+0xd0/0x100)
> [] (__kfree_skb+0x0/0x100) from [] (kfree_skb+0x4c/0x50)
>  r5:c12a3800 r4:00000300
> [] (kfree_skb+0x0/0x50) from [] (el3_start_xmit+0xb8/0xd0 [3c589_cs])
> [] (el3_start_xmit+0x0/0xd0 [3c589_cs]) from [] (dev_hard_start_xmit+0x1a8/0x244)
>  r7:c12a3800 r6:c1a9aa00 r5:c1a9aa00 r4:c12a3800
> [] (dev_hard_start_xmit+0x0/0x244) from [] (__qdisc_run+0xb0/0x198)

Thats a bug in the 3c589_cs driver. Patch attached.

Signed-off-by: Patrick McHardy 
Signed-off-by: Jeff Garzik

RESEND [PATCH 3/3] NetXen: Graceful teardown of interface and hardware upon module unload

2007-07-02T12:24:52+00:00

Resending patch 3/3 only.

These changes allow driver close routine to be called during module unload,
to clean-up buffers and other software resources, flush queues etc. Also,
hardware is reset to pristine state.

Signed-off-by: Dhananjay Phadke 
Signed-off-by: Milan Bag 
Signed-off-by: Wen Xiong 
Signed-off-by: Jeff Garzik

drivers/net/ns83820.c: fix a check-after-use

2007-07-02T12:24:52+00:00

This patch fixes a check-after-use spotted by the Coverity checker.

Signed-off-by: Adrian Bunk 
Signed-off-by: Jeff Garzik

net/usb/cdc_ether minor sparse cleanup

2007-07-02T12:24:52+00:00

Remove an "sparse" warning about a shadowed variable name.

Signed-off-by: David Brownell 
Signed-off-by: Jeff Garzik

RESEND [PATCH 2/3] NetXen: Support per PCI-function interrupt mask registers

2007-07-02T12:24:52+00:00

This patch updates the various access routines to access different
control and status settings present in different register locations.
This will fix problems related to working of different ports in
multi Port card.

Signed-off by: Dhananjay Phadke 
Signed-off by: Milan Bag 

Signed-off-by: Jeff Garzik

RESEND [PATCH 1/3] NetXen: Fix issue of MSI not working correctly

2007-07-02T12:24:52+00:00

NetXen driver uses PCI function 0 to provide the functionality of MSI.
The patch makes driver check the bus master bit for function 0 and
enable it after the card initialization.

Signed-off-by: Dhananjay Phadke
Signed-off-by: Milan Bag 
Signed-off-by: Wen Xiong 
Signed-off-by: Jeff Garzik