linux.git/drivers/net/pcnet32.c, branch v2.6.27 Linux kernel source tree Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-05-26T06:26:10+00:00 David S. Miller davem@davemloft.net 2008-05-26T06:26:10+00:00 43154d08d6bb5c69aa0d0e3448fb348b4cd84e91 Conflicts: drivers/net/cpmac.c net/mac80211/mlme.c 
Conflicts:

	drivers/net/cpmac.c
	net/mac80211/mlme.c
pcnet32: fix warning 2008-05-22T10:03:29+00:00 Andrew Morton akpm@linux-foundation.org 2008-05-14T23:20:14+00:00 b166cfba01d62d04ae81ecce2d5dbe308db8083a pci_name() will be changed to return `const char *': drivers/net/pcnet32.c: In function 'pcnet32_probe1': drivers/net/pcnet32.c:1884: warning: passing argument 2 of 'pcnet32_alloc_ring' discards qualifiers from pointer target type Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jgarzik@redhat.com> 
pci_name() will be changed to return `const char *':

drivers/net/pcnet32.c: In function 'pcnet32_probe1':
drivers/net/pcnet32.c:1884: warning: passing argument 2 of 'pcnet32_alloc_ring' discards qualifiers from pointer target type

Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 2008-05-15T07:34:44+00:00 David S. Miller davem@davemloft.net 2008-05-15T07:34:44+00:00 63fe46da9c380b3f2bbdf3765044649517cc717c Conflicts: drivers/net/wireless/iwlwifi/iwl-4965-rs.c drivers/net/wireless/rt2x00/rt61pci.c 
Conflicts:

	drivers/net/wireless/iwlwifi/iwl-4965-rs.c
	drivers/net/wireless/rt2x00/rt61pci.c
[netdrvr] Trim trailing whitespace for several drivers 2008-05-13T05:41:58+00:00 Jeff Garzik jeff@garzik.org 2008-05-13T05:41:58+00:00 7d2e3cb7000b883a8e489485ac249be572fe17b1 Signed-off-by: Jeff Garzik <jgarzik@redhat.com> 
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
pcnet32: delete non NAPI code from driver. 2008-05-06T16:22:39+00:00 Don Fry pcnet32@verizon.net 2008-04-29T20:49:58+00:00 01935d7d2c544a5dfc8313f79ed164d45115aa33 Delete the non-napi code from the driver and Kconfig. Tested x86_64. Apply at next open opportunity. Signed-off-by: Don Fry <pcnet32@verizon.net> Signed-off-by: Jeff Garzik <jgarzik@redhat.com> 
Delete the non-napi code from the driver and Kconfig.
Tested x86_64.  Apply at next open opportunity.

Signed-off-by: Don Fry <pcnet32@verizon.net>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
pcnet32: Use print_mac 2008-02-11T15:28:31+00:00 Don Fry pcnet32@verizon.net 2008-02-08T15:29:38+00:00 b3028cdc1859adf371f9457862e466f0e67f0b10 Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Don Fry <pcnet32@verizon.net> Signed-off-by: Jeff Garzik <jeff@garzik.org> 
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by:  Don Fry <pcnet32@verizon.net>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
pcnet32: use NET_IP_ALIGN instead of 2 2008-02-11T15:28:30+00:00 Don Fry pcnet32@verizon.net 2008-02-08T15:32:26+00:00 232c56408861e666d2546960d1180eb2c65260bd Change hard coded 2 to NET_IP_ALIGN. Added new #define with comments. Tested amd_64 Signed-off-by: Don Fry <pcnet32@verizon.net> Signed-off-by: Jeff Garzik <jeff@garzik.org> 
Change hard coded 2 to NET_IP_ALIGN.  Added new #define with comments.
Tested amd_64

Signed-off-by:  Don Fry <pcnet32@verizon.net>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
netdev: use ARRAY_SIZE() instead of sizeof(array) / ETH_GSTRING_LEN 2008-01-28T23:03:36+00:00 Alejandro Martinez Ruiz alex@flawedcode.org 2007-10-18T08:00:15+00:00 4c3616cdda0632a3d0e39069765f9ea0e6bd093e Using ARRAY_SIZE() on arrays of the form array[][K] makes it unnecessary to know the value of K when checking its size. Signed-off-by: Alejandro Martinez Ruiz <alex@flawedcode.org> Signed-off-by: Jeff Garzik <jeff@garzik.org> 
Using ARRAY_SIZE() on arrays of the form array[][K] makes it unnecessary
to know the value of K when checking its size.

Signed-off-by: Alejandro Martinez Ruiz <alex@flawedcode.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
[NET]: Fix drivers to handle napi_disable() disabling interrupts. 2008-01-09T07:30:12+00:00 David S. Miller davem@davemloft.net 2008-01-08T04:53:33+00:00 d1d08d1265810ef1f165864850416dcbc9725ee7 When we add the generic napi_disable_pending() breakout logic to net_rx_action() it means that napi_disable() can cause NAPI poll interrupt events to be disabled. And this is exactly what we want. If a napi_disable() is pending, and we are looping in the ->poll(), we want ->poll() event interrupts to stay disabled and we want to complete the NAPI poll ASAP. When ->poll() break out during device down was being handled on a per-driver basis, often these drivers would turn interrupts back on when '!netif_running()' was detected. And this would just cause a reschedule of the NAPI ->poll() in the interrupt handler before the napi_disable() could get in there and grab the NAPI_STATE_SCHED bit. The vast majority of drivers don't care if napi_disable() might have the side effect of disabling NAPI ->poll() event interrupts. In all such cases, when a napi_disable() is performed, the driver just disabled interrupts or is about to. However there were three exceptions to this in PCNET32, R8169, and SKY2. To fix those cases, at the subsequent napi_enable() points, I added code to ensure that the ->poll() interrupt events are enabled in the hardware. Signed-off-by: David S. Miller <davem@davemloft.net> Acked-by: Don Fry <pcnet32@verizon.net> 
When we add the generic napi_disable_pending() breakout
logic to net_rx_action() it means that napi_disable()
can cause NAPI poll interrupt events to be disabled.

And this is exactly what we want.  If a napi_disable()
is pending, and we are looping in the ->poll(), we want
->poll() event interrupts to stay disabled and we want
to complete the NAPI poll ASAP.

When ->poll() break out during device down was being handled on a
per-driver basis, often these drivers would turn interrupts back on
when '!netif_running()' was detected.

And this would just cause a reschedule of the NAPI ->poll() in the
interrupt handler before the napi_disable() could get in there and
grab the NAPI_STATE_SCHED bit.

The vast majority of drivers don't care if napi_disable() might have
the side effect of disabling NAPI ->poll() event interrupts.  In all
such cases, when a napi_disable() is performed, the driver just
disabled interrupts or is about to.

However there were three exceptions to this in PCNET32, R8169, and
SKY2.  To fix those cases, at the subsequent napi_enable() points, I
added code to ensure that the ->poll() interrupt events are enabled in
the hardware.

Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by:  Don Fry <pcnet32@verizon.net>
pcnet32: remove private net_device_stats structure 2007-10-18T00:23:30+00:00 Don Fry pcnet32@verizon.net 2007-10-18T00:06:19+00:00 4f1e5ba0977570b7a198bb3ac110ccc5f532821b Remove the statistics from the private structure. Use the net_device_stats in netn_device structure. Following Jeff Garzik's massive cleanup Sep 01. pcnet32 was not "low-hanging fruit". Tested x86_64. Signed-off-by: Don Fry <pcnet32@verizon.net> Signed-off-by: Jeff Garzik <jeff@garzik.org> 
Remove the statistics from the private structure.
Use the net_device_stats in netn_device structure.

Following Jeff Garzik's massive cleanup Sep 01.
pcnet32 was not "low-hanging fruit".

Tested x86_64.

Signed-off-by:  Don Fry <pcnet32@verizon.net>
Signed-off-by: Jeff Garzik <jeff@garzik.org>