Commit graph android_kernel_sony_sdm845/drivers/net
Message SHA1
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds   commited 2005-06-28 21:24:32 -07:00
a839688362
[NET]: drivers/net/slip.c needs linux/delay.h
For msleep_interruptible().

Signed-off-by: David S. Miller <davem@davemloft.net>

David S. Miller   commited 2005-06-28 16:27:32 -07:00
12dc2fdd3e
[NET]: Remove gratuitous use of skb->tail in network drivers.
Many drivers use skb->tail unnecessarily.

In these situations, the code roughly looks like:

	dev = dev_alloc_skb(...);

	[optional] skb_reserve(skb, ...);

	... skb->tail ...

But even if the skb_reserve() happens, skb->data equals
skb->tail.  So it doesn't make any sense to use anything
other than skb->data in these cases.

Another case was the s2io.c driver directly mucking with
the skb->data and skb->tail pointers.  It really just wanted
to do an skb_reserve(), so that's what the code was changed
to do instead.

Another reason I'm making this change as it allows some SKB
cleanups I have planned simpler to merge.  In those cleanups,
skb->head, skb->tail, and skb->end pointers are removed, and
replaced with skb->head_room and skb->tail_room integers.

Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Jeff Garzik <jgarzik@pobox.com>

David S. Miller   commited 2005-06-28 15:25:31 -07:00
689be43945
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Linus Torvalds   commited 2005-06-28 14:59:07 -07:00
adb2705a89
wireless: fix ipw warning; add is_broadcast_ether_addr() to linux/etherdevice.h
Jeff Garzik   commited 2005-06-28 01:46:35 -04:00
9bd481f859
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Greg KH   authored and   Greg Kroah-Hartman   commited 2005-06-27 22:07:56 -07:00
8644d2a42b
[PATCH] PCI: make drivers use the pci shutdown callback instead of the driver core callback.
Now we can change the pci core to always set this pointer, as pci drivers
should use it, not the driver core callback.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Greg Kroah-Hartman   commited 2005-06-27 21:52:47 -07:00
d18c3db58b
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
Jeff Garzik   commited 2005-06-28 00:46:58 -04:00
d011e151bc
Merge /spare/repo/linux-2.6/
Jeff Garzik   commited 2005-06-28 00:46:46 -04:00
2179a59db1
Merge /spare/repo/linux-2.6/
Jeff Garzik   commited 2005-06-28 00:46:22 -04:00
c36ad397a3
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
Jeff Garzik   commited 2005-06-27 23:45:25 -04:00
30b4d6565e
[PATCH] wireless-device-attr-fixes-2
More fixes for greg depredations.

Also nuke lots of pointless typecasts.

All this new wireless code adds near-infinite amounts of trailing whitespace.

Cc: Jeff Garzik <jgarzik@pobox.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>

Andrew Morton   authored and   Jeff Garzik   commited 2005-06-27 23:37:30 -04:00
ad3fee560b
[PATCH] wireless-device-attr-fixes
Repair Jeff's stuff after gregkh depredations.

Cc: Jeff Garzik <jgarzik@pobox.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>

Andrew Morton   authored and   Jeff Garzik   commited 2005-06-27 23:37:29 -04:00
edfc43f2ec
[PATCH] ipw2100 old gcc fix
drivers/net/wireless/ipw2100.c: In function `ipw2100_set_key_index':
drivers/net/wireless/ipw2100.c:5326: array index in non-array initializer
drivers/net/wireless/ipw2100.c:5326: (near initialization for `cmd')
drivers/net/wireless/ipw2100.c:5326: warning: missing braces around initializer
drivers/net/wireless/ipw2100.c:5326: warning: (near initialization for `cmd.host_command_parameters')

Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>

Andrew Morton   authored and   Jeff Garzik   commited 2005-06-27 23:28:35 -04:00
011fe95a3b
[PATCH] ipw2100: small cleanups
Fix few typos/thinkos in ipw, remove ugly macro (it is commented around,
anyway), and fix types passed to pci_set_power_state.

Signed-off-by: Andrew Morton <akpm@osdl.org>

Pavel Machek   authored and   Jeff Garzik   commited 2005-06-27 23:26:31 -04:00
8724a11803
[PATCH] ipw2100: kill dead macros
There are several never used macros in ipw2100.  This removes them.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>

Pavel Machek   authored and   Jeff Garzik   commited 2005-06-27 23:26:30 -04:00
5dc54a65b6
[PATCH] ipw2100: assume recent kernel
ipw2100 still has support for old kernels.  Thats considered bad for patch in
mainline...  this fixes few instances.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>

Pavel Machek   authored and   Jeff Garzik   commited 2005-06-27 23:26:30 -04:00
4663663f1d
[PATCH] drivers/net/wireless/ipw2200: Use the DMA_32BIT_MASK constant
Use the DMA_32BIT_MASK constant from dma-mapping.h when calling
pci_set_dma_mask() or pci_set_consistent_dma_mask() instead of custom macros.

This patch includes dma-mapping.h explicitly because it caused errors on some
architectures otherwise.  See
http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details

Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>

Tobias Klauser   authored and   Jeff Garzik   commited 2005-06-27 23:25:10 -04:00
0e08b44eed
[PATCH] drivers/net/wireless/ipw2100: Use the DMA_32BIT_MASK constant
Use the DMA_32BIT_MASK constant from dma-mapping.h when calling
pci_set_dma_mask() or pci_set_consistent_dma_mask() instead of custom macros.

This patch includes dma-mapping.h explicitly because it caused errors on some
architectures otherwise.  See
http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details

Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>

Tobias Klauser   authored and   Jeff Garzik   commited 2005-06-27 23:25:10 -04:00
05743d165b
[PATCH] ipw2100: remove commented-out code
This removes up various code/defines that was just commented out
instead of being deleted.

Pavel Machek   authored and   Jeff Garzik   commited 2005-06-27 23:24:18 -04:00
070d016512
drivers/net/at1700: remove incorrect comment
"Allied Telesis RE1000 Plus" is not supported at all
by kernel 2.6.12.

Signed-off-by: komurojun-mbn@nifty.com

Komuro   authored and   Jeff Garzik   commited 2005-06-27 23:23:05 -04:00
c903e41e67
[PATCH] ieee80211: fix ipw 64bit compilation warnings
On Mon, 06 Jun 2005 14:29:52 +0800, Zhu Yi wrote:
> ("%zd", sizeof()) should be better.

Thanks. This is a corrected version of the patch.

This patch fixes warnings when compiling ipw2100 and ipw2200 on x86_64.

Signed-off-by: Jiri Benc <jbenc@suse.cz>
Signed-off-by: Jirka Bohac <jbohac@suse.cz>

Jiri Benc   authored and   Jeff Garzik   commited 2005-06-27 23:13:59 -04:00
aaa4d308a8
[PATCH] ieee80211: fix recursive ipw2200 dependencies
This results in recursive dependencies:
- IPW2200 depends on NET_RADIO
- IPW2200 selects IEEE80211
- IEEE80211 selects NET_RADIO

This patch fixes the IPW2200 dependencies in a way that they are similar
to the IPW2100 dependencies.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Jiri Benc <jbenc@suse.cz>

Adrian Bunk   authored and   Jeff Garzik   commited 2005-06-27 23:12:35 -04:00
e19b813e0c
[PATCH] Use pci_set_dma_mask() instead of direct assignment of DMA mask
The amd8111e driver directly assigns the DMA mask to the dma_mask
member of the struct pci_dev instead of using pci_set_dma_mask(). This
makes the call to pci_dma_supported() redundant as pci_set_dma_mask()
does this check.

I do not own this device so I only compile-tested this patch.

Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>

Tobias Klauser   authored and   Jeff Garzik   commited 2005-06-27 23:09:08 -04:00
cac8c81a59
[PATCH] smc91x needs settable IRQ trigger type
For boards that invert the SMC91x IRQ line (maybe an FPGA inverts it),
the set_irq_type() call can't assume IRQT_RISING.  These particular
boards currently use OMAP-specific calls to change the trigger type,
but the boards break when set_irq_type() stops being a NOP.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

David Brownell   authored and   Jeff Garzik   commited 2005-06-27 23:08:09 -04:00
5f13e7ec5c
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
Jeff Garzik   commited 2005-06-27 22:50:10 -04:00
aa8f6dfd35
Merge upstream net/ieee80211.h changes into 'ieee80211' branch.
Jeff Garzik   commited 2005-06-27 22:49:47 -04:00
245ac8738b
Merge /spare/repo/linux-2.6/
Jeff Garzik   commited 2005-06-27 22:05:03 -04:00
1bad3f4050
Merge upstream ieee80211.h with us (us == branch 'ieee80211' of netdev-2.6)
Jeff Garzik   commited 2005-06-27 22:03:52 -04:00
716b43303d
[PATCH] pcmcia: more IDs for TDK multifunction cards
Add new pcmcia id_table for fmvj18x_cs and serial_cs.
(TDK multi-function card (NetPartner9610 and MobileNetworker3200))

Signed-off-by: Jun Komuro <komurojun-mbn@nifty.com>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jun Komuro   authored and   Linus Torvalds   commited 2005-06-27 18:03:17 -07:00
f4d7510d3d
[PATCH] pcmcia: id_table for wl3501_cs.c
Add pcmcia_device_id table.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Dominik Brodowski   authored and   Linus Torvalds   commited 2005-06-27 18:03:16 -07:00
77b73f9b00
[PATCH] pcmcia: id_table for com20020_cs.c
Add pcmcia_device_id table.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Dominik Brodowski   authored and   Linus Torvalds   commited 2005-06-27 18:03:15 -07:00
7fb22bb4d0
[PATCH] pcmcia: id_table for atmel_cs.c
Add pcmcia_device_id table.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Dominik Brodowski   authored and   Linus Torvalds   commited 2005-06-27 18:03:14 -07:00
4a17a11938
[PATCH] pcmcia: add a few more IDs for pcnet_cs
Add new pcmcia id_table for pcnet_cs.  (Allied, Laneed, NextCom and Telecom
Device)

Signed-off-by: Jun Komuro <komurojun-mbn@nifty.com>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jun Komuro   authored and   Linus Torvalds   commited 2005-06-27 18:03:13 -07:00
9c7046cd06
[PATCH] pcmcia: id_table for pcnet_cs.c
Add pcmcia_device_id table.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Dominik Brodowski   authored and   Linus Torvalds   commited 2005-06-27 18:03:13 -07:00
ce8a0037e1
[PATCH] pcmcia: id_table for xirc2ps_cs.c
Add pcmcia_device_id table.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Dominik Brodowski   authored and   Linus Torvalds   commited 2005-06-27 18:03:12 -07:00
ff07bb19d0
[PATCH] pcmcia: id_table for orinoco_cs
Add pcmcia_device_id table.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Dominik Brodowski   authored and   Linus Torvalds   commited 2005-06-27 18:03:12 -07:00
7422c56da9
[PATCH] pcmcia: id_table for smc91c92_cs.c
Add pcmcia_device_id table.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Dominik Brodowski   authored and   Linus Torvalds   commited 2005-06-27 18:03:12 -07:00
5c67222069
[PATCH] pcmcia: id_table for wavelan_cs
Add pcmcia_device_id table.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Dominik Brodowski   authored and   Linus Torvalds   commited 2005-06-27 18:03:11 -07:00
b942123bcd
[PATCH] pcmcia: id_table for ray_cs
Add pcmcia_device_id table.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Dominik Brodowski   authored and   Linus Torvalds   commited 2005-06-27 18:03:11 -07:00
f57ea2a232
[PATCH] pcmcia: id_table for nmclan_cs
Add pcmcia_device_id table.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Dominik Brodowski   authored and   Linus Torvalds   commited 2005-06-27 18:03:10 -07:00
a58e26cb11
[PATCH] pcmcia: id_table for netwave_cs
Add pcmcia_device_id table.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Dominik Brodowski   authored and   Linus Torvalds   commited 2005-06-27 18:03:10 -07:00
5d402e95eb
[PATCH] pcmcia: id_table for ibmtr_cs
Add pcmcia_device_id table.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Dominik Brodowski   authored and   Linus Torvalds   commited 2005-06-27 18:03:10 -07:00
469bf2b938
[PATCH] pcmcia: id_table for fmvj18x_cs
Add pcmcia_device_id table.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Dominik Brodowski   authored and   Linus Torvalds   commited 2005-06-27 18:03:10 -07:00
cda4de8e1e
[PATCH] pcmcia: id_table for axnet_cs
Add pcmcia_device_id table.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Dominik Brodowski   authored and   Linus Torvalds   commited 2005-06-27 18:03:09 -07:00
c414f7550f
[PATCH] pcmcia: id_table for airo_cs
Add pcmcia_device_id table.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Dominik Brodowski   authored and   Linus Torvalds   commited 2005-06-27 18:03:09 -07:00
7018d06d23
[PATCH] pcmcia: id_table for 3c589_cs
Add pcmcia_device_id table.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Dominik Brodowski   authored and   Linus Torvalds   commited 2005-06-27 18:03:09 -07:00
7ffec58c1e
[PATCH] pcmcia: id_table for 3c574_cs
Add pcmcia_device_id table.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Dominik Brodowski   authored and   Linus Torvalds   commited 2005-06-27 18:03:08 -07:00
270b6e9418
[PATCH] skge: version and copyright.
Bump version and copyright year.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>

Stephen Hemminger   authored and   Jeff Garzik   commited 2005-06-27 18:05:07 -04:00
747802ab47
[PATCH] skge: Rx buffer optimization
Optimize the receive buffer management code to replenish the
buffers immediately (like tg3).

Signed-off-by: Stephen Hemmminger <shemminger@osdl.org>

Stephen Hemminger   authored and   Jeff Garzik   commited 2005-06-27 18:05:07 -04:00
19a33d4e6b