* Re: [RFC: 2.6 patch] remove drivers/net/eepro100.c
From: Vitaly Bordug @ 2006-01-18 10:34 UTC (permalink / raw)
To: John Ronciak
Cc: Adrian Bunk, Stephen Hemminger, jgarzik, saw, linux-kernel,
netdev
In-Reply-To: <56a8daef0601171427s75894fid0f8c4f9e2b28e50@mail.gmail.com>
On Tue, 17 Jan 2006 14:27:16 -0800
John Ronciak <john.ronciak@gmail.com> wrote:
> We don't of any problems reported against e100 that have not been
> talked about in this thread (in old ARCH types). I think the eepro100
> driver should be removed from the config "just in case" but we are in
> full support of the e100 driver and if somebody says that it's not
> working on one of the different ARCHs we are willing to work with them
> to get it fixed. The problem is that we don't have all these
> different ARCH systems around to test against.
>
> Another thing is that removal of the driver (or disabling the config)
> will hopefully force the issue in that people with these ARCHs will
> use the e100 and if they have problems we can get them fixed in the
> e100 driver. At this point nobody seems to be able to define a "real"
> problem other than talking about it.
Ok then, let's go ahead, but
I vote for config exclusion as a first step,
so if anybody will run into problems, will use old mature stuff until e100 get fixed.
Due to rollback the removed driver - back and forth in killing/resurrecting stuff is not a good example to follow within the kernel.
Generally speaking, e100 should replace eepro*, but I can see no reason for rush in doing that one-step.
--
Sincerely,
Vitaly
^ permalink raw reply
* Re: [PATCH 5/5] [RFC] Infiniband: connection abstraction
From: Roland Dreier @ 2006-01-18 15:43 UTC (permalink / raw)
To: Sean Hefty; +Cc: netdev, linux-kernel, openib-general
In-Reply-To: <ORSMSX401yEXUIEAOeI00000043@orsmsx401.amr.corp.intel.com>
> +struct ucma_file {
> + struct semaphore mutex;
This should be a struct mutex instead, I think.
> +static DECLARE_MUTEX(ctx_mutex);
Same here.
- R.
^ permalink raw reply
* Re: [PATCH 5/5] [RFC] Infiniband: connection abstraction
From: Roland Dreier @ 2006-01-18 15:44 UTC (permalink / raw)
To: Sean Hefty; +Cc: netdev, linux-kernel, openib-general
In-Reply-To: <ORSMSX401yEXUIEAOeI00000043@orsmsx401.amr.corp.intel.com>
> + UCMA_MAX_BACKLOG = 128
Is there any reason that we might want to make this a tunable? Maybe
as a module parameter that's writable in sysfs...
- R.
^ permalink raw reply
* Re: wireless: recap of current issues (other issues / fake ethernet)
From: Stuffed Crust @ 2006-01-18 16:32 UTC (permalink / raw)
To: Stefan Rompf; +Cc: Jeff Garzik, John W. Linville, netdev, linux-kernel
In-Reply-To: <200601180036.10500.stefan@loplof.de>
[-- Attachment #1: Type: text/plain, Size: 3728 bytes --]
On Wed, Jan 18, 2006 at 12:36:09AM +0100, Stefan Rompf wrote:
> prism2 usb is even worse - the urb is build of some control structure, the
> 802.11 3 address header, a 802.3 header and the 802.11 data part. Some bits
> in the control structure decide whether the 802.11 or the 802.3 header is
> used to create the frame sent to the air.
I actually maintain a prism2 usb driver. It's host interface is truly
fscked, and then there are the unfixable hardware bugs... But back to
your point -- It's actually true of all prism2 devices. You can use one
header or the other, but space for both is part of the fixed packet
structure.
Meanwhile, I've only seen one wireless chipset that *requires* 802.3
headers, and that is the prism54/prismGT/Indigo/Duette (FullMAC mode).
Those adapters (except for the Indigo, which never made it into
production anyway) can run in a softmac mode, which uses regular 802.11
headers.
It's actually fairly common that hardware devices have the 802.11 header
separated from the 802.11 payload slightly, if for no other reason that
they need space to add the encryption headers. You can't make any
assumptions.
> Fortunately, a driver should be able to specify it's additional memory need at
> the front of the frame via hard_header_len. Some drivers will need to do some
> ugly memmove()s at the packet begin then.
This amount also varies with different encryption modes. And don't
forget you also need space for an LLC+SNAP header and finally, you need
a frame footer for encryption as well.
> .. and it gets even worse as soon as we start encrypting packets. I think we
> should start using the netdev wiki at http://linux-net.osdl.org/ to collect
> information. For this part of the discussion, we need to know what transmit
> frame formats different hardware needs.
They're all over the map, yes.. there's no guarantee that the frame will
be contiguious. It's annoying.. They also vary depending on encrpytion
mode. Keep the 802.11 stack generic; split the packet into its logical
block.
On a per-frame basis, you have:
- 802.11 header (variable length)
- Encryption header (variable length)
- LLC+SNAP header on payload (which we may need to add)
- actual payload
- Encryption footer (variable length)
How's this strawman proposal:
wiphy_frame_xmit (struct wiphy_dev *dev, struct sk_buff *skb);
skb->data points to the raw payload, with LLC+SNAP header.
skb->cb points to a structure that has, among other things:
- 802.11 header + length
- encryption header + length
- encryption footer + length
- desired data rate(s), antenna, rts/cts, and other tx params.
- hw/sw encryption flag, and the key needed to encrypt.
Given that I haven't seen two chipsets that do thigns the same way,
there's little point in making the stack generic enough to rearrange
these bits in the correct places. That said, we could provide a generic
coalesce method for the general swcrypto+payload case, where the
hardware would presumably treat it as an opaque payload.
Each driver would be responsible for rearranging these chunks as
appropriate, ideally using scatter-gather DMA. That's why the chunks
are all specified as chunk+len; the driver can blindly copy the chunks
without worrying about their contents.
Chipsets that require payload padding when using crypto can tell the
802.11 stack of this requirement, and the stack will pass the
appropriate pads in via the crypt_header and crypt_footer.
I've put this stuff on the wiki, for what it's worth.
- Solomon
--
Solomon Peachy ICQ: 1318344
Melbourne, FL
Quidquid latine dictum sit, altum viditur.
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* [PATCH 1/7] s390: Remove CVS generated information.
From: Heiko Carstens @ 2006-01-18 16:49 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-kernel, linux-scsi, netdev, Martin Schwidefsky,
Andreas Herrmann, Frank Pavlic
From: Heiko Carstens <heiko.carstens@de.ibm.com>
- Remove all CVS generated information like e.g. revision IDs from
drivers/s390 and include/asm-s390 (none present in arch/s390).
- Add newline at end of arch/s390/lib/Makefile to avoid diff message.
Acked-by: Andreas Herrmann <aherrman@de.ibm.com>
Acked-by: Frank Pavlic <pavlic@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
---
arch/s390/lib/Makefile | 2 +-
drivers/s390/block/dasd.c | 1 -
drivers/s390/block/dasd_3370_erp.c | 1 -
drivers/s390/block/dasd_3990_erp.c | 1 -
drivers/s390/block/dasd_9336_erp.c | 1 -
drivers/s390/block/dasd_9343_erp.c | 1 -
drivers/s390/block/dasd_cmb.c | 2 --
drivers/s390/block/dasd_devmap.c | 1 -
drivers/s390/block/dasd_diag.c | 1 -
drivers/s390/block/dasd_diag.h | 1 -
drivers/s390/block/dasd_eckd.c | 1 -
drivers/s390/block/dasd_eckd.h | 1 -
drivers/s390/block/dasd_erp.c | 1 -
drivers/s390/block/dasd_fba.c | 1 -
drivers/s390/block/dasd_fba.h | 1 -
drivers/s390/block/dasd_genhd.c | 1 -
drivers/s390/block/dasd_int.h | 1 -
drivers/s390/block/dasd_ioctl.c | 2 --
drivers/s390/block/dasd_proc.c | 1 -
drivers/s390/char/tape_34xx.c | 5 ++---
drivers/s390/char/tape_class.c | 4 ++--
drivers/s390/char/tape_class.h | 2 +-
drivers/s390/char/tape_core.c | 5 ++---
drivers/s390/cio/airq.c | 2 --
drivers/s390/cio/blacklist.c | 1 -
drivers/s390/cio/ccwgroup.c | 1 -
drivers/s390/cio/chsc.c | 1 -
drivers/s390/cio/cio.c | 1 -
drivers/s390/cio/cmf.c | 2 +-
drivers/s390/cio/css.c | 1 -
drivers/s390/cio/device.c | 1 -
drivers/s390/cio/device_ops.c | 2 --
drivers/s390/cio/qdio.c | 5 +----
drivers/s390/cio/qdio.h | 2 --
drivers/s390/crypto/z90common.h | 2 --
drivers/s390/crypto/z90crypt.h | 2 --
drivers/s390/crypto/z90hardware.c | 6 ------
drivers/s390/crypto/z90main.c | 10 ----------
drivers/s390/net/claw.c | 11 +----------
drivers/s390/net/claw.h | 2 +-
drivers/s390/net/ctcdbug.c | 5 +----
drivers/s390/net/ctcdbug.h | 4 +---
drivers/s390/net/ctcmain.c | 19 ++-----------------
drivers/s390/net/ctcmain.h | 4 ----
drivers/s390/net/ctctty.c | 2 --
drivers/s390/net/ctctty.h | 2 --
drivers/s390/net/cu3088.c | 2 --
drivers/s390/net/fsm.c | 2 --
drivers/s390/net/fsm.h | 2 --
drivers/s390/net/iucv.c | 16 +---------------
drivers/s390/net/lcs.c | 5 +----
drivers/s390/net/lcs.h | 2 --
drivers/s390/net/netiucv.c | 15 +--------------
drivers/s390/net/qeth.h | 2 --
drivers/s390/net/qeth_eddp.c | 5 +----
drivers/s390/net/qeth_eddp.h | 6 ++----
drivers/s390/net/qeth_fs.h | 5 -----
drivers/s390/net/qeth_main.c | 13 ++-----------
drivers/s390/net/qeth_mpc.c | 2 --
drivers/s390/net/qeth_mpc.h | 4 ----
drivers/s390/net/qeth_proc.c | 4 +---
drivers/s390/net/qeth_sys.c | 4 +---
drivers/s390/net/qeth_tso.h | 4 +---
drivers/s390/s390_rdev.c | 1 -
drivers/s390/scsi/zfcp_aux.c | 2 --
drivers/s390/scsi/zfcp_ccw.c | 2 --
drivers/s390/scsi/zfcp_dbf.c | 2 --
drivers/s390/scsi/zfcp_def.h | 2 --
drivers/s390/scsi/zfcp_erp.c | 2 --
drivers/s390/scsi/zfcp_ext.h | 2 --
drivers/s390/scsi/zfcp_fsf.c | 2 --
drivers/s390/scsi/zfcp_qdio.c | 2 --
drivers/s390/scsi/zfcp_scsi.c | 2 --
drivers/s390/scsi/zfcp_sysfs_adapter.c | 2 --
drivers/s390/scsi/zfcp_sysfs_driver.c | 2 --
drivers/s390/scsi/zfcp_sysfs_port.c | 2 --
drivers/s390/scsi/zfcp_sysfs_unit.c | 2 --
include/asm-s390/dasd.h | 2 --
include/asm-s390/qdio.h | 2 --
79 files changed, 27 insertions(+), 223 deletions(-)
diff -urpN linux-2.6/arch/s390/lib/Makefile linux-2.6-patched/arch/s390/lib/Makefile
--- linux-2.6/arch/s390/lib/Makefile 2006-01-18 17:25:20.000000000 +0100
+++ linux-2.6-patched/arch/s390/lib/Makefile 2006-01-18 17:25:47.000000000 +0100
@@ -6,4 +6,4 @@ EXTRA_AFLAGS := -traditional
lib-y += delay.o string.o
lib-y += $(if $(CONFIG_64BIT),uaccess64.o,uaccess.o)
-lib-$(CONFIG_SMP) += spinlock.o
\ No newline at end of file
+lib-$(CONFIG_SMP) += spinlock.o
diff -urpN linux-2.6/drivers/s390/block/dasd_3370_erp.c linux-2.6-patched/drivers/s390/block/dasd_3370_erp.c
--- linux-2.6/drivers/s390/block/dasd_3370_erp.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/block/dasd_3370_erp.c 2006-01-18 17:25:47.000000000 +0100
@@ -4,7 +4,6 @@
* Bugreports.to..: <Linux390@de.ibm.com>
* (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 2000
*
- * $Revision: 1.9 $
*/
#define PRINTK_HEADER "dasd_erp(3370)"
diff -urpN linux-2.6/drivers/s390/block/dasd_3990_erp.c linux-2.6-patched/drivers/s390/block/dasd_3990_erp.c
--- linux-2.6/drivers/s390/block/dasd_3990_erp.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/block/dasd_3990_erp.c 2006-01-18 17:25:47.000000000 +0100
@@ -5,7 +5,6 @@
* Bugreports.to..: <Linux390@de.ibm.com>
* (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 2000, 2001
*
- * $Revision: 1.36 $
*/
#include <linux/timer.h>
diff -urpN linux-2.6/drivers/s390/block/dasd_9336_erp.c linux-2.6-patched/drivers/s390/block/dasd_9336_erp.c
--- linux-2.6/drivers/s390/block/dasd_9336_erp.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/block/dasd_9336_erp.c 2006-01-18 17:25:47.000000000 +0100
@@ -4,7 +4,6 @@
* Bugreports.to..: <Linux390@de.ibm.com>
* (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 2000
*
- * $Revision: 1.8 $
*/
#define PRINTK_HEADER "dasd_erp(9336)"
diff -urpN linux-2.6/drivers/s390/block/dasd_9343_erp.c linux-2.6-patched/drivers/s390/block/dasd_9343_erp.c
--- linux-2.6/drivers/s390/block/dasd_9343_erp.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/block/dasd_9343_erp.c 2006-01-18 17:25:47.000000000 +0100
@@ -4,7 +4,6 @@
* Bugreports.to..: <Linux390@de.ibm.com>
* (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 2000
*
- * $Revision: 1.13 $
*/
#define PRINTK_HEADER "dasd_erp(9343)"
diff -urpN linux-2.6/drivers/s390/block/dasd.c linux-2.6-patched/drivers/s390/block/dasd.c
--- linux-2.6/drivers/s390/block/dasd.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/block/dasd.c 2006-01-18 17:25:47.000000000 +0100
@@ -7,7 +7,6 @@
* Bugreports.to..: <Linux390@de.ibm.com>
* (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999-2001
*
- * $Revision: 1.172 $
*/
#include <linux/config.h>
diff -urpN linux-2.6/drivers/s390/block/dasd_cmb.c linux-2.6-patched/drivers/s390/block/dasd_cmb.c
--- linux-2.6/drivers/s390/block/dasd_cmb.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/block/dasd_cmb.c 2006-01-18 17:25:47.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/drivers/s390/block/dasd_cmb.c ($Revision: 1.9 $)
- *
* Linux on zSeries Channel Measurement Facility support
* (dasd device driver interface)
*
diff -urpN linux-2.6/drivers/s390/block/dasd_devmap.c linux-2.6-patched/drivers/s390/block/dasd_devmap.c
--- linux-2.6/drivers/s390/block/dasd_devmap.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/block/dasd_devmap.c 2006-01-18 17:25:47.000000000 +0100
@@ -11,7 +11,6 @@
* functions may not be called from interrupt context. In particular
* dasd_get_device is a no-no from interrupt context.
*
- * $Revision: 1.43 $
*/
#include <linux/config.h>
diff -urpN linux-2.6/drivers/s390/block/dasd_diag.c linux-2.6-patched/drivers/s390/block/dasd_diag.c
--- linux-2.6/drivers/s390/block/dasd_diag.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/block/dasd_diag.c 2006-01-18 17:25:47.000000000 +0100
@@ -6,7 +6,6 @@
* Bugreports.to..: <Linux390@de.ibm.com>
* (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
*
- * $Revision: 1.53 $
*/
#include <linux/config.h>
diff -urpN linux-2.6/drivers/s390/block/dasd_diag.h linux-2.6-patched/drivers/s390/block/dasd_diag.h
--- linux-2.6/drivers/s390/block/dasd_diag.h 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/block/dasd_diag.h 2006-01-18 17:25:47.000000000 +0100
@@ -6,7 +6,6 @@
* Bugreports.to..: <Linux390@de.ibm.com>
* (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
*
- * $Revision: 1.9 $
*/
#define MDSK_WRITE_REQ 0x01
diff -urpN linux-2.6/drivers/s390/block/dasd_eckd.c linux-2.6-patched/drivers/s390/block/dasd_eckd.c
--- linux-2.6/drivers/s390/block/dasd_eckd.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/block/dasd_eckd.c 2006-01-18 17:25:47.000000000 +0100
@@ -7,7 +7,6 @@
* Bugreports.to..: <Linux390@de.ibm.com>
* (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
*
- * $Revision: 1.74 $
*/
#include <linux/config.h>
diff -urpN linux-2.6/drivers/s390/block/dasd_eckd.h linux-2.6-patched/drivers/s390/block/dasd_eckd.h
--- linux-2.6/drivers/s390/block/dasd_eckd.h 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/block/dasd_eckd.h 2006-01-18 17:25:47.000000000 +0100
@@ -5,7 +5,6 @@
* Bugreports.to..: <Linux390@de.ibm.com>
* (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
*
- * $Revision: 1.10 $
*/
#ifndef DASD_ECKD_H
diff -urpN linux-2.6/drivers/s390/block/dasd_erp.c linux-2.6-patched/drivers/s390/block/dasd_erp.c
--- linux-2.6/drivers/s390/block/dasd_erp.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/block/dasd_erp.c 2006-01-18 17:25:47.000000000 +0100
@@ -7,7 +7,6 @@
* Bugreports.to..: <Linux390@de.ibm.com>
* (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999-2001
*
- * $Revision: 1.14 $
*/
#include <linux/config.h>
diff -urpN linux-2.6/drivers/s390/block/dasd_fba.c linux-2.6-patched/drivers/s390/block/dasd_fba.c
--- linux-2.6/drivers/s390/block/dasd_fba.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/block/dasd_fba.c 2006-01-18 17:25:47.000000000 +0100
@@ -4,7 +4,6 @@
* Bugreports.to..: <Linux390@de.ibm.com>
* (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
*
- * $Revision: 1.41 $
*/
#include <linux/config.h>
diff -urpN linux-2.6/drivers/s390/block/dasd_fba.h linux-2.6-patched/drivers/s390/block/dasd_fba.h
--- linux-2.6/drivers/s390/block/dasd_fba.h 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/block/dasd_fba.h 2006-01-18 17:25:47.000000000 +0100
@@ -4,7 +4,6 @@
* Bugreports.to..: <Linux390@de.ibm.com>
* (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
*
- * $Revision: 1.6 $
*/
#ifndef DASD_FBA_H
diff -urpN linux-2.6/drivers/s390/block/dasd_genhd.c linux-2.6-patched/drivers/s390/block/dasd_genhd.c
--- linux-2.6/drivers/s390/block/dasd_genhd.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/block/dasd_genhd.c 2006-01-18 17:25:47.000000000 +0100
@@ -9,7 +9,6 @@
*
* gendisk related functions for the dasd driver.
*
- * $Revision: 1.51 $
*/
#include <linux/config.h>
diff -urpN linux-2.6/drivers/s390/block/dasd_int.h linux-2.6-patched/drivers/s390/block/dasd_int.h
--- linux-2.6/drivers/s390/block/dasd_int.h 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/block/dasd_int.h 2006-01-18 17:25:47.000000000 +0100
@@ -6,7 +6,6 @@
* Bugreports.to..: <Linux390@de.ibm.com>
* (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
*
- * $Revision: 1.68 $
*/
#ifndef DASD_INT_H
diff -urpN linux-2.6/drivers/s390/block/dasd_ioctl.c linux-2.6-patched/drivers/s390/block/dasd_ioctl.c
--- linux-2.6/drivers/s390/block/dasd_ioctl.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/block/dasd_ioctl.c 2006-01-18 17:25:47.000000000 +0100
@@ -7,8 +7,6 @@
* Bugreports.to..: <Linux390@de.ibm.com>
* (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999-2001
*
- * $Revision: 1.50 $
- *
* i/o controls for the dasd driver.
*/
#include <linux/config.h>
diff -urpN linux-2.6/drivers/s390/block/dasd_proc.c linux-2.6-patched/drivers/s390/block/dasd_proc.c
--- linux-2.6/drivers/s390/block/dasd_proc.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/block/dasd_proc.c 2006-01-18 17:25:47.000000000 +0100
@@ -9,7 +9,6 @@
*
* /proc interface for the dasd driver.
*
- * $Revision: 1.33 $
*/
#include <linux/config.h>
diff -urpN linux-2.6/drivers/s390/char/tape_34xx.c linux-2.6-patched/drivers/s390/char/tape_34xx.c
--- linux-2.6/drivers/s390/char/tape_34xx.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/char/tape_34xx.c 2006-01-18 17:25:47.000000000 +0100
@@ -1357,7 +1357,7 @@ tape_34xx_init (void)
debug_set_level(TAPE_DBF_AREA, 6);
#endif
- DBF_EVENT(3, "34xx init: $Revision: 1.23 $\n");
+ DBF_EVENT(3, "34xx init\n");
/* Register driver for 3480/3490 tapes. */
rc = ccw_driver_register(&tape_34xx_driver);
if (rc)
@@ -1377,8 +1377,7 @@ tape_34xx_exit(void)
MODULE_DEVICE_TABLE(ccw, tape_34xx_ids);
MODULE_AUTHOR("(C) 2001-2002 IBM Deutschland Entwicklung GmbH");
-MODULE_DESCRIPTION("Linux on zSeries channel attached 3480 tape "
- "device driver ($Revision: 1.23 $)");
+MODULE_DESCRIPTION("Linux on zSeries channel attached 3480 tape device driver");
MODULE_LICENSE("GPL");
module_init(tape_34xx_init);
diff -urpN linux-2.6/drivers/s390/char/tape_class.c linux-2.6-patched/drivers/s390/char/tape_class.c
--- linux-2.6/drivers/s390/char/tape_class.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/char/tape_class.c 2006-01-18 17:25:47.000000000 +0100
@@ -1,6 +1,6 @@
/*
* (C) Copyright IBM Corp. 2004
- * tape_class.c ($Revision: 1.8 $)
+ * tape_class.c
*
* Tape class device support
*
@@ -12,7 +12,7 @@
MODULE_AUTHOR("Stefan Bader <shbader@de.ibm.com>");
MODULE_DESCRIPTION(
"(C) Copyright IBM Corp. 2004 All Rights Reserved.\n"
- "tape_class.c ($Revision: 1.8 $)"
+ "tape_class.c"
);
MODULE_LICENSE("GPL");
diff -urpN linux-2.6/drivers/s390/char/tape_class.h linux-2.6-patched/drivers/s390/char/tape_class.h
--- linux-2.6/drivers/s390/char/tape_class.h 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/char/tape_class.h 2006-01-18 17:25:47.000000000 +0100
@@ -1,6 +1,6 @@
/*
* (C) Copyright IBM Corp. 2004 All Rights Reserved.
- * tape_class.h ($Revision: 1.4 $)
+ * tape_class.h
*
* Tape class device support
*
diff -urpN linux-2.6/drivers/s390/char/tape_core.c linux-2.6-patched/drivers/s390/char/tape_core.c
--- linux-2.6/drivers/s390/char/tape_core.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/char/tape_core.c 2006-01-18 17:25:47.000000000 +0100
@@ -1239,7 +1239,7 @@ tape_init (void)
#ifdef DBF_LIKE_HELL
debug_set_level(TAPE_DBF_AREA, 6);
#endif
- DBF_EVENT(3, "tape init: ($Revision: 1.54 $)\n");
+ DBF_EVENT(3, "tape init\n");
tape_proc_init();
tapechar_init ();
tapeblock_init ();
@@ -1263,8 +1263,7 @@ tape_exit(void)
MODULE_AUTHOR("(C) 2001 IBM Deutschland Entwicklung GmbH by Carsten Otte and "
"Michael Holzheu (cotte@de.ibm.com,holzheu@de.ibm.com)");
-MODULE_DESCRIPTION("Linux on zSeries channel attached "
- "tape device driver ($Revision: 1.54 $)");
+MODULE_DESCRIPTION("Linux on zSeries channel attached tape device driver");
MODULE_LICENSE("GPL");
module_init(tape_init);
diff -urpN linux-2.6/drivers/s390/cio/airq.c linux-2.6-patched/drivers/s390/cio/airq.c
--- linux-2.6/drivers/s390/cio/airq.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/cio/airq.c 2006-01-18 17:25:47.000000000 +0100
@@ -2,8 +2,6 @@
* drivers/s390/cio/airq.c
* S/390 common I/O routines -- support for adapter interruptions
*
- * $Revision: 1.15 $
- *
* Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH,
* IBM Corporation
* Author(s): Ingo Adlung (adlung@de.ibm.com)
diff -urpN linux-2.6/drivers/s390/cio/blacklist.c linux-2.6-patched/drivers/s390/cio/blacklist.c
--- linux-2.6/drivers/s390/cio/blacklist.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/cio/blacklist.c 2006-01-18 17:25:47.000000000 +0100
@@ -1,7 +1,6 @@
/*
* drivers/s390/cio/blacklist.c
* S/390 common I/O routines -- blacklisting of specific devices
- * $Revision: 1.42 $
*
* Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH,
* IBM Corporation
diff -urpN linux-2.6/drivers/s390/cio/ccwgroup.c linux-2.6-patched/drivers/s390/cio/ccwgroup.c
--- linux-2.6/drivers/s390/cio/ccwgroup.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/cio/ccwgroup.c 2006-01-18 17:25:47.000000000 +0100
@@ -1,7 +1,6 @@
/*
* drivers/s390/cio/ccwgroup.c
* bus driver for ccwgroup
- * $Revision: 1.35 $
*
* Copyright (C) 2002 IBM Deutschland Entwicklung GmbH,
* IBM Corporation
diff -urpN linux-2.6/drivers/s390/cio/chsc.c linux-2.6-patched/drivers/s390/cio/chsc.c
--- linux-2.6/drivers/s390/cio/chsc.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/cio/chsc.c 2006-01-18 17:25:47.000000000 +0100
@@ -1,7 +1,6 @@
/*
* drivers/s390/cio/chsc.c
* S/390 common I/O routines -- channel subsystem call
- * $Revision: 1.128 $
*
* Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH,
* IBM Corporation
diff -urpN linux-2.6/drivers/s390/cio/cio.c linux-2.6-patched/drivers/s390/cio/cio.c
--- linux-2.6/drivers/s390/cio/cio.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/cio/cio.c 2006-01-18 17:25:47.000000000 +0100
@@ -1,7 +1,6 @@
/*
* drivers/s390/cio/cio.c
* S/390 common I/O routines -- low level i/o calls
- * $Revision: 1.140 $
*
* Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH,
* IBM Corporation
diff -urpN linux-2.6/drivers/s390/cio/cmf.c linux-2.6-patched/drivers/s390/cio/cmf.c
--- linux-2.6/drivers/s390/cio/cmf.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/cio/cmf.c 2006-01-18 17:25:47.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * linux/drivers/s390/cio/cmf.c ($Revision: 1.19 $)
+ * linux/drivers/s390/cio/cmf.c
*
* Linux on zSeries Channel Measurement Facility support
*
diff -urpN linux-2.6/drivers/s390/cio/css.c linux-2.6-patched/drivers/s390/cio/css.c
--- linux-2.6/drivers/s390/cio/css.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/cio/css.c 2006-01-18 17:25:47.000000000 +0100
@@ -1,7 +1,6 @@
/*
* drivers/s390/cio/css.c
* driver for channel subsystem
- * $Revision: 1.96 $
*
* Copyright (C) 2002 IBM Deutschland Entwicklung GmbH,
* IBM Corporation
diff -urpN linux-2.6/drivers/s390/cio/device.c linux-2.6-patched/drivers/s390/cio/device.c
--- linux-2.6/drivers/s390/cio/device.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/cio/device.c 2006-01-18 17:25:47.000000000 +0100
@@ -1,7 +1,6 @@
/*
* drivers/s390/cio/device.c
* bus driver for ccw devices
- * $Revision: 1.140 $
*
* Copyright (C) 2002 IBM Deutschland Entwicklung GmbH,
* IBM Corporation
diff -urpN linux-2.6/drivers/s390/cio/device_ops.c linux-2.6-patched/drivers/s390/cio/device_ops.c
--- linux-2.6/drivers/s390/cio/device_ops.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/cio/device_ops.c 2006-01-18 17:25:47.000000000 +0100
@@ -1,8 +1,6 @@
/*
* drivers/s390/cio/device_ops.c
*
- * $Revision: 1.61 $
- *
* Copyright (C) 2002 IBM Deutschland Entwicklung GmbH,
* IBM Corporation
* Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
diff -urpN linux-2.6/drivers/s390/cio/qdio.c linux-2.6-patched/drivers/s390/cio/qdio.c
--- linux-2.6/drivers/s390/cio/qdio.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/cio/qdio.c 2006-01-18 17:25:47.000000000 +0100
@@ -56,8 +56,6 @@
#include "ioasm.h"
#include "chsc.h"
-#define VERSION_QDIO_C "$Revision: 1.117 $"
-
/****************** MODULE PARAMETER VARIABLES ********************/
MODULE_AUTHOR("Utz Bacher <utz.bacher@de.ibm.com>");
MODULE_DESCRIPTION("QDIO base support version 2, " \
@@ -66,8 +64,7 @@ MODULE_LICENSE("GPL");
/******************** HERE WE GO ***********************************/
-static const char version[] = "QDIO base support version 2 ("
- VERSION_QDIO_C "/" VERSION_QDIO_H "/" VERSION_CIO_QDIO_H ")";
+static const char version[] = "QDIO base support version 2";
#ifdef QDIO_PERFORMANCE_STATS
static int proc_perf_file_registration;
diff -urpN linux-2.6/drivers/s390/cio/qdio.h linux-2.6-patched/drivers/s390/cio/qdio.h
--- linux-2.6/drivers/s390/cio/qdio.h 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/cio/qdio.h 2006-01-18 17:25:47.000000000 +0100
@@ -5,8 +5,6 @@
#include "schid.h"
-#define VERSION_CIO_QDIO_H "$Revision: 1.40 $"
-
#ifdef CONFIG_QDIO_DEBUG
#define QDIO_VERBOSE_LEVEL 9
#else /* CONFIG_QDIO_DEBUG */
diff -urpN linux-2.6/drivers/s390/crypto/z90common.h linux-2.6-patched/drivers/s390/crypto/z90common.h
--- linux-2.6/drivers/s390/crypto/z90common.h 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/crypto/z90common.h 2006-01-18 17:25:47.000000000 +0100
@@ -27,8 +27,6 @@
#ifndef _Z90COMMON_H_
#define _Z90COMMON_H_
-#define VERSION_Z90COMMON_H "$Revision: 1.17 $"
-
#define RESPBUFFSIZE 256
#define PCI_FUNC_KEY_DECRYPT 0x5044
diff -urpN linux-2.6/drivers/s390/crypto/z90crypt.h linux-2.6-patched/drivers/s390/crypto/z90crypt.h
--- linux-2.6/drivers/s390/crypto/z90crypt.h 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/crypto/z90crypt.h 2006-01-18 17:25:47.000000000 +0100
@@ -29,8 +29,6 @@
#include <linux/ioctl.h>
-#define VERSION_Z90CRYPT_H "$Revision: 1.2.2.4 $"
-
#define z90crypt_VERSION 1
#define z90crypt_RELEASE 3 // 2 = PCIXCC, 3 = rewrite for coding standards
#define z90crypt_VARIANT 3 // 3 = CEX2A support
diff -urpN linux-2.6/drivers/s390/crypto/z90hardware.c linux-2.6-patched/drivers/s390/crypto/z90hardware.c
--- linux-2.6/drivers/s390/crypto/z90hardware.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/crypto/z90hardware.c 2006-01-18 17:25:47.000000000 +0100
@@ -32,12 +32,6 @@
#include "z90crypt.h"
#include "z90common.h"
-#define VERSION_Z90HARDWARE_C "$Revision: 1.34 $"
-
-char z90hardware_version[] __initdata =
- "z90hardware.o (" VERSION_Z90HARDWARE_C "/"
- VERSION_Z90COMMON_H "/" VERSION_Z90CRYPT_H ")";
-
struct cca_token_hdr {
unsigned char token_identifier;
unsigned char version;
diff -urpN linux-2.6/drivers/s390/crypto/z90main.c linux-2.6-patched/drivers/s390/crypto/z90main.c
--- linux-2.6/drivers/s390/crypto/z90main.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/crypto/z90main.c 2006-01-18 17:25:47.000000000 +0100
@@ -38,14 +38,6 @@
#include "z90crypt.h"
#include "z90common.h"
-#define VERSION_Z90MAIN_C "$Revision: 1.62 $"
-
-static char z90main_version[] __initdata =
- "z90main.o (" VERSION_Z90MAIN_C "/"
- VERSION_Z90COMMON_H "/" VERSION_Z90CRYPT_H ")";
-
-extern char z90hardware_version[];
-
/**
* Defaults that may be modified.
*/
@@ -594,8 +586,6 @@ z90crypt_init_module(void)
PRINTKN("Version %d.%d.%d loaded, built on %s %s\n",
z90crypt_VERSION, z90crypt_RELEASE, z90crypt_VARIANT,
__DATE__, __TIME__);
- PRINTKN("%s\n", z90main_version);
- PRINTKN("%s\n", z90hardware_version);
PDEBUG("create_z90crypt (domain index %d) successful.\n",
domain);
} else
diff -urpN linux-2.6/drivers/s390/net/claw.c linux-2.6-patched/drivers/s390/net/claw.c
--- linux-2.6/drivers/s390/net/claw.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/claw.c 2006-01-18 17:25:47.000000000 +0100
@@ -2,8 +2,6 @@
* drivers/s390/net/claw.c
* ESCON CLAW network driver
*
- * $Revision: 1.38 $ $Date: 2005/08/29 09:47:04 $
- *
* Linux for zSeries version
* Copyright (C) 2002,2005 IBM Corporation
* Author(s) Original code written by:
@@ -4391,14 +4389,7 @@ static int __init
claw_init(void)
{
int ret = 0;
- printk(KERN_INFO "claw: starting driver "
-#ifdef MODULE
- "module "
-#else
- "compiled into kernel "
-#endif
- " $Revision: 1.38 $ $Date: 2005/08/29 09:47:04 $ \n");
-
+ printk(KERN_INFO "claw: starting driver\n");
#ifdef FUNCTRACE
printk(KERN_INFO "claw: %s() enter \n",__FUNCTION__);
diff -urpN linux-2.6/drivers/s390/net/claw.h linux-2.6-patched/drivers/s390/net/claw.h
--- linux-2.6/drivers/s390/net/claw.h 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/claw.h 2006-01-18 17:25:47.000000000 +0100
@@ -2,7 +2,7 @@
* Define constants *
* *
********************************************************/
-#define VERSION_CLAW_H "$Revision: 1.6 $"
+
/*-----------------------------------------------------*
* CCW command codes for CLAW protocol *
*------------------------------------------------------*/
diff -urpN linux-2.6/drivers/s390/net/ctcdbug.c linux-2.6-patched/drivers/s390/net/ctcdbug.c
--- linux-2.6/drivers/s390/net/ctcdbug.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/ctcdbug.c 2006-01-18 17:25:47.000000000 +0100
@@ -1,6 +1,6 @@
/*
*
- * linux/drivers/s390/net/ctcdbug.c ($Revision: 1.6 $)
+ * linux/drivers/s390/net/ctcdbug.c
*
* CTC / ESCON network driver - s390 dbf exploit.
*
@@ -9,8 +9,6 @@
* Author(s): Original Code written by
* Peter Tiedemann (ptiedem@de.ibm.com)
*
- * $Revision: 1.6 $ $Date: 2005/05/11 08:10:17 $
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -80,4 +78,3 @@ ctc_register_dbf_views(void)
return 0;
}
-
diff -urpN linux-2.6/drivers/s390/net/ctcdbug.h linux-2.6-patched/drivers/s390/net/ctcdbug.h
--- linux-2.6/drivers/s390/net/ctcdbug.h 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/ctcdbug.h 2006-01-18 17:25:47.000000000 +0100
@@ -1,6 +1,6 @@
/*
*
- * linux/drivers/s390/net/ctcdbug.h ($Revision: 1.6 $)
+ * linux/drivers/s390/net/ctcdbug.h
*
* CTC / ESCON network driver - s390 dbf exploit.
*
@@ -9,8 +9,6 @@
* Author(s): Original Code written by
* Peter Tiedemann (ptiedem@de.ibm.com)
*
- * $Revision: 1.6 $ $Date: 2005/05/11 08:10:17 $
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
diff -urpN linux-2.6/drivers/s390/net/ctcmain.c linux-2.6-patched/drivers/s390/net/ctcmain.c
--- linux-2.6/drivers/s390/net/ctcmain.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/ctcmain.c 2006-01-18 17:25:47.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * $Id: ctcmain.c,v 1.79 2006/01/11 11:32:18 cohuck Exp $
- *
* CTC / ESCON network driver
*
* Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation
@@ -37,8 +35,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * RELEASE-TAG: CTC/ESCON network driver $Revision: 1.79 $
- *
*/
#undef DEBUG
#include <linux/module.h>
@@ -248,22 +244,11 @@ static void
print_banner(void)
{
static int printed = 0;
- char vbuf[] = "$Revision: 1.79 $";
- char *version = vbuf;
if (printed)
return;
- if ((version = strchr(version, ':'))) {
- char *p = strchr(version + 1, '$');
- if (p)
- *p = '\0';
- } else
- version = " ??? ";
- printk(KERN_INFO "CTC driver Version%s"
-#ifdef DEBUG
- " (DEBUG-VERSION, " __DATE__ __TIME__ ")"
-#endif
- " initialized\n", version);
+
+ printk(KERN_INFO "CTC driver initialized\n");
printed = 1;
}
diff -urpN linux-2.6/drivers/s390/net/ctcmain.h linux-2.6-patched/drivers/s390/net/ctcmain.h
--- linux-2.6/drivers/s390/net/ctcmain.h 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/ctcmain.h 2006-01-18 17:25:47.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * $Id: ctcmain.h,v 1.4 2005/03/24 09:04:17 mschwide Exp $
- *
* CTC / ESCON network driver
*
* Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation
@@ -29,8 +27,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * RELEASE-TAG: CTC/ESCON network driver $Revision: 1.4 $
- *
*/
#ifndef _CTCMAIN_H_
diff -urpN linux-2.6/drivers/s390/net/ctctty.c linux-2.6-patched/drivers/s390/net/ctctty.c
--- linux-2.6/drivers/s390/net/ctctty.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/ctctty.c 2006-01-18 17:25:47.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * $Id: ctctty.c,v 1.29 2005/04/05 08:50:44 mschwide Exp $
- *
* CTC / ESCON network driver, tty interface.
*
* Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation
diff -urpN linux-2.6/drivers/s390/net/ctctty.h linux-2.6-patched/drivers/s390/net/ctctty.h
--- linux-2.6/drivers/s390/net/ctctty.h 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/ctctty.h 2006-01-18 17:25:47.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * $Id: ctctty.h,v 1.4 2003/09/18 08:01:10 mschwide Exp $
- *
* CTC / ESCON network driver, tty interface.
*
* Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation
diff -urpN linux-2.6/drivers/s390/net/cu3088.c linux-2.6-patched/drivers/s390/net/cu3088.c
--- linux-2.6/drivers/s390/net/cu3088.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/cu3088.c 2006-01-18 17:25:47.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * $Id: cu3088.c,v 1.38 2006/01/12 14:33:09 cohuck Exp $
- *
* CTC / LCS ccw_device driver
*
* Copyright (C) 2002 IBM Deutschland Entwicklung GmbH, IBM Corporation
diff -urpN linux-2.6/drivers/s390/net/fsm.c linux-2.6-patched/drivers/s390/net/fsm.c
--- linux-2.6/drivers/s390/net/fsm.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/fsm.c 2006-01-18 17:25:47.000000000 +0100
@@ -1,6 +1,4 @@
/**
- * $Id: fsm.c,v 1.6 2003/10/15 11:37:29 mschwide Exp $
- *
* A generic FSM based on fsm used in isdn4linux
*
*/
diff -urpN linux-2.6/drivers/s390/net/fsm.h linux-2.6-patched/drivers/s390/net/fsm.h
--- linux-2.6/drivers/s390/net/fsm.h 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/fsm.h 2006-01-18 17:25:47.000000000 +0100
@@ -1,5 +1,3 @@
-/* $Id: fsm.h,v 1.1.1.1 2002/03/13 19:33:09 mschwide Exp $
- */
#ifndef _FSM_H_
#define _FSM_H_
diff -urpN linux-2.6/drivers/s390/net/iucv.c linux-2.6-patched/drivers/s390/net/iucv.c
--- linux-2.6/drivers/s390/net/iucv.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/iucv.c 2006-01-18 17:25:47.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * $Id: iucv.c,v 1.47 2005/11/21 11:35:22 mschwide Exp $
- *
* IUCV network driver
*
* Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation
@@ -29,8 +27,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * RELEASE-TAG: IUCV lowlevel driver $Revision: 1.47 $
- *
*/
\f
/* #define DEBUG */
@@ -355,17 +351,7 @@ do { \
static void
iucv_banner(void)
{
- char vbuf[] = "$Revision: 1.47 $";
- char *version = vbuf;
-
- if ((version = strchr(version, ':'))) {
- char *p = strchr(version + 1, '$');
- if (p)
- *p = '\0';
- } else
- version = " ??? ";
- printk(KERN_INFO
- "IUCV lowlevel driver Version%s initialized\n", version);
+ printk(KERN_INFO "IUCV lowlevel driver initialized\n");
}
/**
diff -urpN linux-2.6/drivers/s390/net/lcs.c linux-2.6-patched/drivers/s390/net/lcs.c
--- linux-2.6/drivers/s390/net/lcs.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/lcs.c 2006-01-18 17:25:47.000000000 +0100
@@ -11,8 +11,6 @@
* Frank Pavlic (fpavlic@de.ibm.com) and
* Martin Schwidefsky <schwidefsky@de.ibm.com>
*
- * $Revision: 1.99 $ $Date: 2005/05/11 08:10:17 $
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -59,9 +57,8 @@
/**
* initialization string for output
*/
-#define VERSION_LCS_C "$Revision: 1.99 $"
-static char version[] __initdata = "LCS driver ("VERSION_LCS_C "/" VERSION_LCS_H ")";
+static char version[] __initdata = "LCS driver";
static char debug_buffer[255];
/**
diff -urpN linux-2.6/drivers/s390/net/lcs.h linux-2.6-patched/drivers/s390/net/lcs.h
--- linux-2.6/drivers/s390/net/lcs.h 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/lcs.h 2006-01-18 17:25:47.000000000 +0100
@@ -6,8 +6,6 @@
#include <linux/workqueue.h>
#include <asm/ccwdev.h>
-#define VERSION_LCS_H "$Revision: 1.19 $"
-
#define LCS_DBF_TEXT(level, name, text) \
do { \
debug_text_event(lcs_dbf_##name, level, text); \
diff -urpN linux-2.6/drivers/s390/net/netiucv.c linux-2.6-patched/drivers/s390/net/netiucv.c
--- linux-2.6/drivers/s390/net/netiucv.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/netiucv.c 2006-01-18 17:25:47.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * $Id: netiucv.c,v 1.69 2006/01/12 14:33:09 cohuck Exp $
- *
* IUCV network driver
*
* Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation
@@ -31,8 +29,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * RELEASE-TAG: IUCV network driver $Revision: 1.69 $
- *
*/
\f
#undef DEBUG
@@ -2077,16 +2073,7 @@ DRIVER_ATTR(remove, 0200, NULL, remove_w
static void
netiucv_banner(void)
{
- char vbuf[] = "$Revision: 1.69 $";
- char *version = vbuf;
-
- if ((version = strchr(version, ':'))) {
- char *p = strchr(version + 1, '$');
- if (p)
- *p = '\0';
- } else
- version = " ??? ";
- PRINT_INFO("NETIUCV driver Version%s initialized\n", version);
+ PRINT_INFO("NETIUCV driver initialized\n");
}
static void __exit
diff -urpN linux-2.6/drivers/s390/net/qeth_eddp.c linux-2.6-patched/drivers/s390/net/qeth_eddp.c
--- linux-2.6/drivers/s390/net/qeth_eddp.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/qeth_eddp.c 2006-01-18 17:25:47.000000000 +0100
@@ -1,6 +1,5 @@
/*
- *
- * linux/drivers/s390/net/qeth_eddp.c ($Revision: 1.13 $)
+ * linux/drivers/s390/net/qeth_eddp.c
*
* Enhanced Device Driver Packing (EDDP) support for the qeth driver.
*
@@ -8,8 +7,6 @@
*
* Author(s): Thomas Spatzier <tspat@de.ibm.com>
*
- * $Revision: 1.13 $ $Date: 2005/05/04 20:19:18 $
- *
*/
#include <linux/config.h>
#include <linux/errno.h>
diff -urpN linux-2.6/drivers/s390/net/qeth_eddp.h linux-2.6-patched/drivers/s390/net/qeth_eddp.h
--- linux-2.6/drivers/s390/net/qeth_eddp.h 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/qeth_eddp.h 2006-01-18 17:25:47.000000000 +0100
@@ -1,14 +1,12 @@
/*
- * linux/drivers/s390/net/qeth_eddp.c ($Revision: 1.5 $)
+ * linux/drivers/s390/net/qeth_eddp.h
*
- * Header file for qeth enhanced device driver pakcing.
+ * Header file for qeth enhanced device driver packing.
*
* Copyright 2004 IBM Corporation
*
* Author(s): Thomas Spatzier <tspat@de.ibm.com>
*
- * $Revision: 1.5 $ $Date: 2005/03/24 09:04:18 $
- *
*/
#ifndef __QETH_EDDP_H__
#define __QETH_EDDP_H__
diff -urpN linux-2.6/drivers/s390/net/qeth_fs.h linux-2.6-patched/drivers/s390/net/qeth_fs.h
--- linux-2.6/drivers/s390/net/qeth_fs.h 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/qeth_fs.h 2006-01-18 17:25:47.000000000 +0100
@@ -12,11 +12,6 @@
#ifndef __QETH_FS_H__
#define __QETH_FS_H__
-#define VERSION_QETH_FS_H "$Revision: 1.10 $"
-
-extern const char *VERSION_QETH_PROC_C;
-extern const char *VERSION_QETH_SYS_C;
-
#ifdef CONFIG_PROC_FS
extern int
qeth_create_procfs_entries(void);
diff -urpN linux-2.6/drivers/s390/net/qeth.h linux-2.6-patched/drivers/s390/net/qeth.h
--- linux-2.6/drivers/s390/net/qeth.h 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/qeth.h 2006-01-18 17:25:47.000000000 +0100
@@ -25,8 +25,6 @@
#include "qeth_mpc.h"
-#define VERSION_QETH_H "$Revision: 1.152 $"
-
#ifdef CONFIG_QETH_IPV6
#define QETH_VERSION_IPV6 ":IPv6"
#else
diff -urpN linux-2.6/drivers/s390/net/qeth_main.c linux-2.6-patched/drivers/s390/net/qeth_main.c
--- linux-2.6/drivers/s390/net/qeth_main.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/qeth_main.c 2006-01-18 17:25:47.000000000 +0100
@@ -1,6 +1,5 @@
/*
- *
- * linux/drivers/s390/net/qeth_main.c ($Revision: 1.251 $)
+ * linux/drivers/s390/net/qeth_main.c
*
* Linux on zSeries OSA Express and HiperSockets support
*
@@ -12,8 +11,6 @@
* Frank Pavlic (fpavlic@de.ibm.com) and
* Thomas Spatzier <tspat@de.ibm.com>
*
- * $Revision: 1.251 $ $Date: 2005/05/04 20:19:18 $
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -73,7 +70,6 @@
#include "qeth_eddp.h"
#include "qeth_tso.h"
-#define VERSION_QETH_C "$Revision: 1.251 $"
static const char *version = "qeth S/390 OSA-Express driver";
/**
@@ -8626,12 +8622,7 @@ qeth_init(void)
{
int rc=0;
- PRINT_INFO("loading %s (%s/%s/%s/%s/%s/%s/%s %s %s)\n",
- version, VERSION_QETH_C, VERSION_QETH_H,
- VERSION_QETH_MPC_H, VERSION_QETH_MPC_C,
- VERSION_QETH_FS_H, VERSION_QETH_PROC_C,
- VERSION_QETH_SYS_C, QETH_VERSION_IPV6,
- QETH_VERSION_VLAN);
+ PRINT_INFO("loading %s\n", version);
INIT_LIST_HEAD(&qeth_card_list.list);
INIT_LIST_HEAD(&qeth_notify_list);
diff -urpN linux-2.6/drivers/s390/net/qeth_mpc.c linux-2.6-patched/drivers/s390/net/qeth_mpc.c
--- linux-2.6/drivers/s390/net/qeth_mpc.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/qeth_mpc.c 2006-01-18 17:25:47.000000000 +0100
@@ -11,8 +11,6 @@
#include <asm/cio.h>
#include "qeth_mpc.h"
-const char *VERSION_QETH_MPC_C = "$Revision: 1.13 $";
-
unsigned char IDX_ACTIVATE_READ[]={
0x00,0x00,0x80,0x00, 0x00,0x00,0x00,0x00,
0x19,0x01,0x01,0x80, 0x00,0x00,0x00,0x00,
diff -urpN linux-2.6/drivers/s390/net/qeth_mpc.h linux-2.6-patched/drivers/s390/net/qeth_mpc.h
--- linux-2.6/drivers/s390/net/qeth_mpc.h 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/qeth_mpc.h 2006-01-18 17:25:47.000000000 +0100
@@ -14,10 +14,6 @@
#include <asm/qeth.h>
-#define VERSION_QETH_MPC_H "$Revision: 1.46 $"
-
-extern const char *VERSION_QETH_MPC_C;
-
#define IPA_PDU_HEADER_SIZE 0x40
#define QETH_IPA_PDU_LEN_TOTAL(buffer) (buffer+0x0e)
#define QETH_IPA_PDU_LEN_PDU1(buffer) (buffer+0x26)
diff -urpN linux-2.6/drivers/s390/net/qeth_proc.c linux-2.6-patched/drivers/s390/net/qeth_proc.c
--- linux-2.6/drivers/s390/net/qeth_proc.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/qeth_proc.c 2006-01-18 17:25:47.000000000 +0100
@@ -1,6 +1,6 @@
/*
*
- * linux/drivers/s390/net/qeth_fs.c ($Revision: 1.16 $)
+ * linux/drivers/s390/net/qeth_fs.c
*
* Linux on zSeries OSA Express and HiperSockets support
* This file contains code related to procfs.
@@ -21,8 +21,6 @@
#include "qeth_mpc.h"
#include "qeth_fs.h"
-const char *VERSION_QETH_PROC_C = "$Revision: 1.16 $";
-
/***** /proc/qeth *****/
#define QETH_PROCFILE_NAME "qeth"
static struct proc_dir_entry *qeth_procfile;
diff -urpN linux-2.6/drivers/s390/net/qeth_sys.c linux-2.6-patched/drivers/s390/net/qeth_sys.c
--- linux-2.6/drivers/s390/net/qeth_sys.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/qeth_sys.c 2006-01-18 17:25:47.000000000 +0100
@@ -1,6 +1,6 @@
/*
*
- * linux/drivers/s390/net/qeth_sys.c ($Revision: 1.60 $)
+ * linux/drivers/s390/net/qeth_sys.c
*
* Linux on zSeries OSA Express and HiperSockets support
* This file contains code related to sysfs.
@@ -20,8 +20,6 @@
#include "qeth_mpc.h"
#include "qeth_fs.h"
-const char *VERSION_QETH_SYS_C = "$Revision: 1.60 $";
-
/*****************************************************************************/
/* */
/* /sys-fs stuff UNDER DEVELOPMENT !!! */
diff -urpN linux-2.6/drivers/s390/net/qeth_tso.h linux-2.6-patched/drivers/s390/net/qeth_tso.h
--- linux-2.6/drivers/s390/net/qeth_tso.h 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/qeth_tso.h 2006-01-18 17:25:47.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * linux/drivers/s390/net/qeth_tso.h ($Revision: 1.8 $)
+ * linux/drivers/s390/net/qeth_tso.h
*
* Header file for qeth TCP Segmentation Offload support.
*
@@ -7,8 +7,6 @@
*
* Author(s): Frank Pavlic <fpavlic@de.ibm.com>
*
- * $Revision: 1.8 $ $Date: 2005/05/04 20:19:18 $
- *
*/
#ifndef __QETH_TSO_H__
#define __QETH_TSO_H__
diff -urpN linux-2.6/drivers/s390/s390_rdev.c linux-2.6-patched/drivers/s390/s390_rdev.c
--- linux-2.6/drivers/s390/s390_rdev.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/s390_rdev.c 2006-01-18 17:25:47.000000000 +0100
@@ -1,7 +1,6 @@
/*
* drivers/s390/s390_rdev.c
* s390 root device
- * $Revision: 1.4 $
*
* Copyright (C) 2002, 2005 IBM Deutschland Entwicklung GmbH,
* IBM Corporation
diff -urpN linux-2.6/drivers/s390/scsi/zfcp_aux.c linux-2.6-patched/drivers/s390/scsi/zfcp_aux.c
--- linux-2.6/drivers/s390/scsi/zfcp_aux.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/scsi/zfcp_aux.c 2006-01-18 17:25:47.000000000 +0100
@@ -29,8 +29,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#define ZFCP_AUX_REVISION "$Revision: 1.145 $"
-
#include "zfcp_ext.h"
/* accumulated log level (module parameter) */
diff -urpN linux-2.6/drivers/s390/scsi/zfcp_ccw.c linux-2.6-patched/drivers/s390/scsi/zfcp_ccw.c
--- linux-2.6/drivers/s390/scsi/zfcp_ccw.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/scsi/zfcp_ccw.c 2006-01-18 17:25:47.000000000 +0100
@@ -27,8 +27,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#define ZFCP_CCW_C_REVISION "$Revision: 1.58 $"
-
#include "zfcp_ext.h"
#define ZFCP_LOG_AREA ZFCP_LOG_AREA_CONFIG
diff -urpN linux-2.6/drivers/s390/scsi/zfcp_dbf.c linux-2.6-patched/drivers/s390/scsi/zfcp_dbf.c
--- linux-2.6/drivers/s390/scsi/zfcp_dbf.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/scsi/zfcp_dbf.c 2006-01-18 17:25:47.000000000 +0100
@@ -23,8 +23,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#define ZFCP_DBF_REVISION "$Revision$"
-
#include <asm/debug.h>
#include <linux/ctype.h>
#include "zfcp_ext.h"
diff -urpN linux-2.6/drivers/s390/scsi/zfcp_def.h linux-2.6-patched/drivers/s390/scsi/zfcp_def.h
--- linux-2.6/drivers/s390/scsi/zfcp_def.h 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/scsi/zfcp_def.h 2006-01-18 17:25:47.000000000 +0100
@@ -34,8 +34,6 @@
#ifndef ZFCP_DEF_H
#define ZFCP_DEF_H
-#define ZFCP_DEF_REVISION "$Revision: 1.111 $"
-
/*************************** INCLUDES *****************************************/
#include <linux/init.h>
diff -urpN linux-2.6/drivers/s390/scsi/zfcp_erp.c linux-2.6-patched/drivers/s390/scsi/zfcp_erp.c
--- linux-2.6/drivers/s390/scsi/zfcp_erp.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/scsi/zfcp_erp.c 2006-01-18 17:25:47.000000000 +0100
@@ -31,8 +31,6 @@
#define ZFCP_LOG_AREA ZFCP_LOG_AREA_ERP
-#define ZFCP_ERP_REVISION "$Revision: 1.86 $"
-
#include "zfcp_ext.h"
static int zfcp_erp_adisc(struct zfcp_port *);
diff -urpN linux-2.6/drivers/s390/scsi/zfcp_ext.h linux-2.6-patched/drivers/s390/scsi/zfcp_ext.h
--- linux-2.6/drivers/s390/scsi/zfcp_ext.h 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/scsi/zfcp_ext.h 2006-01-18 17:25:47.000000000 +0100
@@ -32,8 +32,6 @@
#ifndef ZFCP_EXT_H
#define ZFCP_EXT_H
-#define ZFCP_EXT_REVISION "$Revision: 1.62 $"
-
#include "zfcp_def.h"
extern struct zfcp_data zfcp_data;
diff -urpN linux-2.6/drivers/s390/scsi/zfcp_fsf.c linux-2.6-patched/drivers/s390/scsi/zfcp_fsf.c
--- linux-2.6/drivers/s390/scsi/zfcp_fsf.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/scsi/zfcp_fsf.c 2006-01-18 17:25:47.000000000 +0100
@@ -30,8 +30,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#define ZFCP_FSF_C_REVISION "$Revision: 1.92 $"
-
#include "zfcp_ext.h"
static int zfcp_fsf_exchange_config_data_handler(struct zfcp_fsf_req *);
diff -urpN linux-2.6/drivers/s390/scsi/zfcp_qdio.c linux-2.6-patched/drivers/s390/scsi/zfcp_qdio.c
--- linux-2.6/drivers/s390/scsi/zfcp_qdio.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/scsi/zfcp_qdio.c 2006-01-18 17:25:47.000000000 +0100
@@ -29,8 +29,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#define ZFCP_QDIO_C_REVISION "$Revision: 1.20 $"
-
#include "zfcp_ext.h"
static inline void zfcp_qdio_sbal_limit(struct zfcp_fsf_req *, int);
diff -urpN linux-2.6/drivers/s390/scsi/zfcp_scsi.c linux-2.6-patched/drivers/s390/scsi/zfcp_scsi.c
--- linux-2.6/drivers/s390/scsi/zfcp_scsi.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/scsi/zfcp_scsi.c 2006-01-18 17:25:47.000000000 +0100
@@ -31,8 +31,6 @@
#define ZFCP_LOG_AREA ZFCP_LOG_AREA_SCSI
-#define ZFCP_SCSI_REVISION "$Revision: 1.74 $"
-
#include "zfcp_ext.h"
static void zfcp_scsi_slave_destroy(struct scsi_device *sdp);
diff -urpN linux-2.6/drivers/s390/scsi/zfcp_sysfs_adapter.c linux-2.6-patched/drivers/s390/scsi/zfcp_sysfs_adapter.c
--- linux-2.6/drivers/s390/scsi/zfcp_sysfs_adapter.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/scsi/zfcp_sysfs_adapter.c 2006-01-18 17:25:47.000000000 +0100
@@ -27,8 +27,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#define ZFCP_SYSFS_ADAPTER_C_REVISION "$Revision: 1.38 $"
-
#include "zfcp_ext.h"
#define ZFCP_LOG_AREA ZFCP_LOG_AREA_CONFIG
diff -urpN linux-2.6/drivers/s390/scsi/zfcp_sysfs_driver.c linux-2.6-patched/drivers/s390/scsi/zfcp_sysfs_driver.c
--- linux-2.6/drivers/s390/scsi/zfcp_sysfs_driver.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/drivers/s390/scsi/zfcp_sysfs_driver.c 2006-01-18 17:25:47.000000000 +0100
@@ -27,8 +27,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#define ZFCP_SYSFS_DRIVER_C_REVISION "$Revision: 1.17 $"
-
#include "zfcp_ext.h"
#define ZFCP_LOG_AREA ZFCP_LOG_AREA_CONFIG
diff -urpN linux-2.6/drivers/s390/scsi/zfcp_sysfs_port.c linux-2.6-patched/drivers/s390/scsi/zfcp_sysfs_port.c
--- linux-2.6/drivers/s390/scsi/zfcp_sysfs_port.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/scsi/zfcp_sysfs_port.c 2006-01-18 17:25:47.000000000 +0100
@@ -28,8 +28,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#define ZFCP_SYSFS_PORT_C_REVISION "$Revision: 1.47 $"
-
#include "zfcp_ext.h"
#define ZFCP_LOG_AREA ZFCP_LOG_AREA_CONFIG
diff -urpN linux-2.6/drivers/s390/scsi/zfcp_sysfs_unit.c linux-2.6-patched/drivers/s390/scsi/zfcp_sysfs_unit.c
--- linux-2.6/drivers/s390/scsi/zfcp_sysfs_unit.c 2006-01-18 17:25:23.000000000 +0100
+++ linux-2.6-patched/drivers/s390/scsi/zfcp_sysfs_unit.c 2006-01-18 17:25:47.000000000 +0100
@@ -28,8 +28,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#define ZFCP_SYSFS_UNIT_C_REVISION "$Revision: 1.30 $"
-
#include "zfcp_ext.h"
#define ZFCP_LOG_AREA ZFCP_LOG_AREA_CONFIG
diff -urpN linux-2.6/include/asm-s390/dasd.h linux-2.6-patched/include/asm-s390/dasd.h
--- linux-2.6/include/asm-s390/dasd.h 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6-patched/include/asm-s390/dasd.h 2006-01-18 17:25:47.000000000 +0100
@@ -8,8 +8,6 @@
* any future changes wrt the API will result in a change of the APIVERSION reported
* to userspace by the DASDAPIVER-ioctl
*
- * $Revision: 1.6 $
- *
*/
#ifndef DASD_H
diff -urpN linux-2.6/include/asm-s390/qdio.h linux-2.6-patched/include/asm-s390/qdio.h
--- linux-2.6/include/asm-s390/qdio.h 2006-01-18 17:25:27.000000000 +0100
+++ linux-2.6-patched/include/asm-s390/qdio.h 2006-01-18 17:25:47.000000000 +0100
@@ -11,8 +11,6 @@
#ifndef __QDIO_H__
#define __QDIO_H__
-#define VERSION_QDIO_H "$Revision: 1.57 $"
-
/* note, that most of the typedef's are from ingo. */
#include <linux/interrupt.h>
^ permalink raw reply
* Re: RE: [PATCH 2/5] [RFC] Infiniband: connection abstraction
From: Sean Hefty @ 2006-01-18 17:46 UTC (permalink / raw)
To: Grant Grundler; +Cc: netdev, linux-kernel, openib-general
In-Reply-To: <20060118020342.GB3740@esmail.cup.hp.com>
Grant Grundler wrote:
>>+static void cm_mask_compare_data(u8 *dst, u8 *src, u8 *mask)
>>+{
>>+ int i;
>>+
>>+ for (i = 0; i < IB_CM_PRIVATE_DATA_COMPARE_SIZE; i++)
>>+ dst[i] = src[i] & mask[i];
>>+}
>
> Is this code going to get invoked very often?
In practice, it would be invoked when matching any listen requests originating
from the CMA (RDMA connection abstraction).
> If so, can the mask operation use a "native" size since
> IB_CM_PRIVATE_DATA_COMPARE_SIZE is hard coded to 64 byte?
>
> e.g something like:
> for (i = 0; i < IB_CM_PRIVATE_DATA_COMPARE_SIZE/sizeof(unsigned long);
> i++)
> ((unsigned long *)dst)[i] = ((unsigned long *)src)[i]
> & ((unsigned long *)mask)[i];
Yes - something like this should work. Thanks.
- Sean
^ permalink raw reply
* Re: RE: [PATCH 2/5] [RFC] Infiniband: connection abstraction
From: Grant Grundler @ 2006-01-18 18:02 UTC (permalink / raw)
To: Sean Hefty; +Cc: netdev, linux-kernel, openib-general
In-Reply-To: <43CE7EDB.7030201@ichips.intel.com>
On Wed, Jan 18, 2006 at 09:46:03AM -0800, Sean Hefty wrote:
> Grant Grundler wrote:
> >>+static void cm_mask_compare_data(u8 *dst, u8 *src, u8 *mask)
...
> >Is this code going to get invoked very often?
>
> In practice, it would be invoked when matching any listen requests
> originating from the CMA (RDMA connection abstraction).
hrm..I'm not sure how to translate your answer into a workload.
e.g. which netperf or netpipe test would excercise this alot?
Or would it take something like MPI or specweb/ttcp?
> >If so, can the mask operation use a "native" size since
> >IB_CM_PRIVATE_DATA_COMPARE_SIZE is hard coded to 64 byte?
> >
> >e.g something like:
> > for (i = 0; i < IB_CM_PRIVATE_DATA_COMPARE_SIZE/sizeof(unsigned
> > long);
> > i++)
> > ((unsigned long *)dst)[i] = ((unsigned long *)src)[i]
> > & ((unsigned long *)mask)[i];
>
> Yes - something like this should work. Thanks.
Do you need a patch?
I can submit one but it will be untested.
thanks,
grant
^ permalink raw reply
* Re: RE: [PATCH 2/5] [RFC] Infiniband: connection abstraction
From: Sean Hefty @ 2006-01-18 18:13 UTC (permalink / raw)
To: Grant Grundler; +Cc: netdev, linux-kernel, openib-general
In-Reply-To: <20060118180243.GD6818@esmail.cup.hp.com>
Grant Grundler wrote:
>>>Is this code going to get invoked very often?
>>
>>In practice, it would be invoked when matching any listen requests
>>originating from the CMA (RDMA connection abstraction).
>
> hrm..I'm not sure how to translate your answer into a workload.
> e.g. which netperf or netpipe test would excercise this alot?
> Or would it take something like MPI or specweb/ttcp?
The code will be invoked at least once for every connection that is established.
>>>e.g something like:
>>> for (i = 0; i < IB_CM_PRIVATE_DATA_COMPARE_SIZE/sizeof(unsigned
>>> long);
>>> i++)
>>> ((unsigned long *)dst)[i] = ((unsigned long *)src)[i]
>>> & ((unsigned long *)mask)[i];
>>
>>Yes - something like this should work. Thanks.
>
>
> Do you need a patch?
> I can submit one but it will be untested.
I will incorporate the change with the next set of updates. Someone else
pointed out that I'd need to make sure that there won't be any alignment issues.
- Sean
^ permalink raw reply
* Re: [PATCH 5/5] [RFC] Infiniband: connection abstraction
From: Sean Hefty @ 2006-01-18 18:19 UTC (permalink / raw)
To: Roland Dreier; +Cc: netdev, linux-kernel, openib-general
In-Reply-To: <adar775wnfi.fsf@cisco.com>
Roland Dreier wrote:
> > + UCMA_MAX_BACKLOG = 128
>
> Is there any reason that we might want to make this a tunable? Maybe
> as a module parameter that's writable in sysfs...
There's no reason not to make this tunable.
- Sean
^ permalink raw reply
* Re: [openib-general] [PATCH 5/5] [RFC] Infiniband: connection abstraction
From: Grant Grundler @ 2006-01-18 18:49 UTC (permalink / raw)
To: Sean Hefty; +Cc: Roland Dreier, netdev, linux-kernel, openib-general
In-Reply-To: <43CE8695.9080401@ichips.intel.com>
On Wed, Jan 18, 2006 at 10:19:01AM -0800, Sean Hefty wrote:
> Roland Dreier wrote:
> > > + UCMA_MAX_BACKLOG = 128
> >
> >Is there any reason that we might want to make this a tunable? Maybe
> >as a module parameter that's writable in sysfs...
>
> There's no reason not to make this tunable.
Yes, there are reasons to NOT make something a tunable:
o increases system complexity (admin)
o increases the amount of documentation (learning curve)
o increases test matrix/cost (devel/support cost)
o generally hurts performance (var vs a constant of the same value)
Any reason to make something a tunable has to compensate
for the above drawbacks. An answer to Roland's question
is a reasonable prerequisite if someone wants add a tunable.
IB doesn't have the much in /sys/class/infiniband* or module parameters
and I think that's a Good Thing.
grant
^ permalink raw reply
* wireless: the contenders
From: John W. Linville @ 2006-01-18 20:06 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel, jbenc, softmac-dev, bcm43xx-dev
First, the news everyone will like. Thanks to the kernel.org team
I now have a place to publish a wireless tree:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
The tree there has a number of branches, so many that you need
a scorecard...
Branches
--------
The "master" branch of that tree is (mostly) up-to-date w/ Linus, plus
changes I recently sent to Jeff. Those changes are also available on
the "upstream-jgarzik" branch, but it is frozen to when I requested
Jeff's pull.
The tree also has "softmac" and "dscape" branches. The "softmac"
branch includes the Johannes Berg softmac code as well as the the
BCM43xx driver based upon that code. The "dscape" branch includes
the DeviceScape patches from Jiri Benc as well as the BCM43xx driver
ported to the DeviceScape stack.
The fact that the BCM43xx team has ported their driver to both stacks
provides us an excellent opportunity for some objective, "apples to
apples" comparisons between the major stacks. I would like to take
this opportunity to thank them for taking the trouble to do that work
and to make both versions available for comparison.
BTW, those trying to actually use the dscape code will want to poke
around Jiri's kernel.org directories:
http://www.kernel.org/pub/linux/kernel/people/jbenc/
Jiri has some information there that will likely be useful to you.
The other branches are for administrative purposes, and can mostly
be ignored.
Patches
-------
Along with bugfixes and enhancements to the current code (which will
be targeting the "master" branch), I would like to see driver and
stack patches for both the "softmac" and "dscape" branches. I would
like to see what is really out there before making a final call on
which stack to adopt permanently.
If you have an out-of-tree driver which targets either (or both)
stacks, please send patches. If you are working on porting an
in-kernel driver to one of these stacks (either from the other stack
or from its private stack), please send patches. If you have fixes
or enhancements pending for either of these stacks, then please
send patches.
Don't waste any time with your patches. There is good reason to make
a decision quickly, and plenty of pressure to do so. Your code could
be a significant factor in making that decision.
I know that many of you believe that this approach is a bad idea,
for a variety of reasons. I find those arguments valid, and
even persuasive. The point of this exercise is NOT to push two
stacks forward into Linus' kernel. The point is to catalog the
true state of affairs and to collect as large a wireless driver
codebase as possible. You might think of this as a Domesday Book
(http://en.wikipedia.org/wiki/Domesday_Book) for Linux wireless.
Summary
-------
Hopefully the act of collecting these patches will also allow the less
motivated among us to have a chance to evaluate the stacks involved.
There are bound to be some wise and skilled kernel hackers out there
that are just a little too busy to track-down all these patches
themselves... :-)
I appreciate all the commentary and ideas expressed over the past
couple of weeks. I also think the driver writers are doing a good
job with what they've been given so far. I hope this helps to bring
the driver guys in out of the cold, and to put some weight behind
the discussions of where we need to go.
Thanks,
John
--
John W. Linville
linville@tuxdriver.com
^ permalink raw reply
* Re: [Bcm43xx-dev] wireless: the contenders
From: Michael Buesch @ 2006-01-18 20:19 UTC (permalink / raw)
To: John W. Linville; +Cc: netdev, linux-kernel, jbenc, softmac-dev, bcm43xx-dev
In-Reply-To: <20060118200616.GC6583@tuxdriver.com>
[-- Attachment #1: Type: text/plain, Size: 618 bytes --]
On Wednesday 18 January 2006 21:06, John W. Linville wrote:
> The tree also has "softmac" and "dscape" branches. The "softmac"
> branch includes the Johannes Berg softmac code as well as the the
> BCM43xx driver based upon that code. The "dscape" branch includes
> the DeviceScape patches from Jiri Benc as well as the BCM43xx driver
> ported to the DeviceScape stack.
Are you going to keep it synced with our repository?
I think it should be possible to automatically send patches for
every change in our tree to you. I am not 100% sure (but 99%).
I will look at it tomorrow.
--
Greetings Michael.
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* Re: [Bcm43xx-dev] wireless: the contenders
From: John W. Linville @ 2006-01-18 20:25 UTC (permalink / raw)
To: Michael Buesch; +Cc: netdev, linux-kernel, jbenc, softmac-dev, bcm43xx-dev
In-Reply-To: <200601182119.20708.mbuesch@freenet.de>
On Wed, Jan 18, 2006 at 09:19:20PM +0100, Michael Buesch wrote:
> On Wednesday 18 January 2006 21:06, John W. Linville wrote:
> > The tree also has "softmac" and "dscape" branches. The "softmac"
> > branch includes the Johannes Berg softmac code as well as the the
> > BCM43xx driver based upon that code. The "dscape" branch includes
> > the DeviceScape patches from Jiri Benc as well as the BCM43xx driver
> > ported to the DeviceScape stack.
>
> Are you going to keep it synced with our repository?
> I think it should be possible to automatically send patches for
> every change in our tree to you. I am not 100% sure (but 99%).
> I will look at it tomorrow.
If you'll send me patches, I'll apply them...
John
P.S. Please do what you can to make them comply w/ kernel patch
posting conventions:
http://linux.yyz.us/patch-format.html
--
John W. Linville
linville@tuxdriver.com
^ permalink raw reply
* Re: [PATCH 2/5] [RFC] Infiniband: connection abstraction
From: Bryan O'Sullivan @ 2006-01-18 20:27 UTC (permalink / raw)
To: Arjan van de Ven; +Cc: netdev, openib-general, linux-kernel, Stephen Hemminger
In-Reply-To: <1137568107.3005.69.camel@laptopd505.fenrus.org>
On Wed, 2006-01-18 at 08:08 +0100, Arjan van de Ven wrote:
> the dual license text needs a bit of clarification I suspect to make
> explicit that the "or BSD" part only applies when used entirely outside
> the linux kernel. (that already is the case, just it's not explicit.
> Making that explicit would be good).
One appropriate way to do that would be to mark all IB-related exported
symbols as EXPORT_SYMBOL_GPL.
<b
^ permalink raw reply
* Re: wireless: the contenders
From: Jeff Garzik @ 2006-01-18 20:36 UTC (permalink / raw)
To: John W. Linville; +Cc: netdev, linux-kernel, jbenc, softmac-dev, bcm43xx-dev
In-Reply-To: <20060118200616.GC6583@tuxdriver.com>
John W. Linville wrote:
> First, the news everyone will like. Thanks to the kernel.org team
> I now have a place to publish a wireless tree:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
>
> The tree there has a number of branches, so many that you need
> a scorecard...
>
> Branches
> --------
>
> The "master" branch of that tree is (mostly) up-to-date w/ Linus, plus
> changes I recently sent to Jeff. Those changes are also available on
> the "upstream-jgarzik" branch, but it is frozen to when I requested
> Jeff's pull.
Minor git administrative note... In my trees, the 'master' branch is
always vanilla Linus, and I never ever apply my own changes to it. This
enables commands such as
git diff master..upstream > patch
git log master..upstream > log.txt
git log master..upstream | git shortlog > shortlog.txt
to work as expected.
Typically I do not update 'master' unless I am also updating 'upstream'
with vanilla Linus changes, in order to avoid screwing up the tree heads
and the diff. When I do update 'master' from 'upstream', it is a
trivial matter to then pull those changes into 'upstream':
git checkout -f upstream
git pull . master
Regards,
Jeff
^ permalink raw reply
* Re: wireless: the contenders
From: John W. Linville @ 2006-01-18 20:48 UTC (permalink / raw)
To: Jeff Garzik; +Cc: netdev, linux-kernel, jbenc, softmac-dev, bcm43xx-dev
In-Reply-To: <43CEA6EB.6080209@pobox.com>
On Wed, Jan 18, 2006 at 03:36:59PM -0500, Jeff Garzik wrote:
> John W. Linville wrote:
> >The "master" branch of that tree is (mostly) up-to-date w/ Linus, plus
> >changes I recently sent to Jeff. Those changes are also available on
> >the "upstream-jgarzik" branch, but it is frozen to when I requested
> >Jeff's pull.
> Typically I do not update 'master' unless I am also updating 'upstream'
> with vanilla Linus changes, in order to avoid screwing up the tree heads
> and the diff. When I do update 'master' from 'upstream', it is a
> trivial matter to then pull those changes into 'upstream':
Good info...thanks!
FWIW, I have an "origin" branch that corresponds to Linus' tree.
I think that probably enables the same kind of usage as you noted...?
Thanks,
John
--
John W. Linville
linville@tuxdriver.com
^ permalink raw reply
* Re: wireless: the contenders
From: Jeff Garzik @ 2006-01-18 20:52 UTC (permalink / raw)
To: netdev, linux-kernel, jbenc, softmac-dev, bcm43xx-dev
In-Reply-To: <20060118204844.GE6583@tuxdriver.com>
On Wed, Jan 18, 2006 at 03:48:49PM -0500, John W. Linville wrote:
> On Wed, Jan 18, 2006 at 03:36:59PM -0500, Jeff Garzik wrote:
> > John W. Linville wrote:
>
> > >The "master" branch of that tree is (mostly) up-to-date w/ Linus, plus
> > >changes I recently sent to Jeff. Those changes are also available on
> > >the "upstream-jgarzik" branch, but it is frozen to when I requested
> > >Jeff's pull.
>
> > Typically I do not update 'master' unless I am also updating 'upstream'
> > with vanilla Linus changes, in order to avoid screwing up the tree heads
> > and the diff. When I do update 'master' from 'upstream', it is a
> > trivial matter to then pull those changes into 'upstream':
>
> Good info...thanks!
>
> FWIW, I have an "origin" branch that corresponds to Linus' tree.
> I think that probably enables the same kind of usage as you noted...?
Yep, it doesn't matter what you call it.
I avoid 'origin' since a 'git pull' without arguments will automatically
update that (and possibly master too).
But it's just a name. Any branch with vanilla Linus tree in it will
achieve the behavior I described.
Jeff
^ permalink raw reply
* Repost [PATCH 1 of 3] move destructor to struct neigh_parms
From: Michael S. Tsirkin @ 2006-01-18 21:19 UTC (permalink / raw)
To: openib-general, LKML, netdev
Sorry about reposting: the message didnt seem to make it to netdev.
---
Hi!
struct neigh_ops currently has a destructor field, unused by in-kernel
drivers outside the infiniband subtree.
infiniband ipoib in-tree driver currently uses this field, and we've
run into problems: since the destructor is shared between neighbours
that belong to different net devices, there's no way to set/clear it
safely.
It would be good to know what the design was
behind putting the destructor method there in the first place.
The following patch moves this field to neigh_parms where it can
be safely set, together with its twin neigh_setup.
Two additional patches in the patch series
update ipoib to use this new interface.
Please Cc me on replies, I'm not on the list.
---
Move destructor from neigh_ops (which is shared between devices)
to neigh_parms which is not, so that multiple drivers can set
it safely.
Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Index: linux-2.6.15/net/core/neighbour.c
===================================================================
--- linux-2.6.15.orig/net/core/neighbour.c 2006-01-12 11:58:15.000000000 +0200
+++ linux-2.6.15/net/core/neighbour.c 2006-01-12 20:10:00.000000000 +0200
@@ -586,8 +586,8 @@ void neigh_destroy(struct neighbour *nei
kfree(hh);
}
- if (neigh->ops && neigh->ops->destructor)
- (neigh->ops->destructor)(neigh);
+ if (neigh->parms->neigh_destructor)
+ (neigh->parms->neigh_destructor)(neigh);
skb_queue_purge(&neigh->arp_queue);
Index: linux-2.6.15/include/net/neighbour.h
===================================================================
--- linux-2.6.15.orig/include/net/neighbour.h 2006-01-03 05:21:10.000000000 +0200
+++ linux-2.6.15/include/net/neighbour.h 2006-01-12 20:09:27.000000000 +0200
@@ -68,6 +68,7 @@ struct neigh_parms
struct net_device *dev;
struct neigh_parms *next;
int (*neigh_setup)(struct neighbour *);
+ void (*neigh_destructor)(struct neighbour *);
struct neigh_table *tbl;
void *sysctl_table;
@@ -145,7 +146,6 @@ struct neighbour
struct neigh_ops
{
int family;
- void (*destructor)(struct neighbour *);
void (*solicit)(struct neighbour *, struct sk_buff*);
void (*error_report)(struct neighbour *, struct sk_buff*);
int (*output)(struct sk_buff*);
--
MST
^ permalink raw reply
* Repost [PATCH 2 of 3] ipoib: move destructor to struct neigh_parms
From: Michael S. Tsirkin @ 2006-01-18 21:19 UTC (permalink / raw)
To: LKML, netdev; +Cc: openib-general
Sorry about reposting: the message didnt seem to make it to netdev.
---
Move destructor from neigh_ops (which is shared between devices)
to neigh_parms which is not, so that multiple drivers can set
it safely.
Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Index: linux-2.6.15/drivers/infiniband/ulp/ipoib/ipoib_main.c
===================================================================
--- linux-2.6.15.orig/drivers/infiniband/ulp/ipoib/ipoib_main.c 2006-01-12 20:30:52.000000000 +0200
+++ linux-2.6.15/drivers/infiniband/ulp/ipoib/ipoib_main.c 2006-01-12 20:31:26.000000000 +0200
@@ -247,7 +247,6 @@ static void path_free(struct net_device
if (neigh->ah)
ipoib_put_ah(neigh->ah);
*to_ipoib_neigh(neigh->neighbour) = NULL;
- neigh->neighbour->ops->destructor = NULL;
kfree(neigh);
}
@@ -530,7 +529,6 @@ static void neigh_add_path(struct sk_buf
err:
*to_ipoib_neigh(skb->dst->neighbour) = NULL;
list_del(&neigh->list);
- neigh->neighbour->ops->destructor = NULL;
kfree(neigh);
++priv->stats.tx_dropped;
@@ -769,21 +767,9 @@ static void ipoib_neigh_destructor(struc
ipoib_put_ah(ah);
}
-static int ipoib_neigh_setup(struct neighbour *neigh)
-{
- /*
- * Is this kosher? I can't find anybody in the kernel that
- * sets neigh->destructor, so we should be able to set it here
- * without trouble.
- */
- neigh->ops->destructor = ipoib_neigh_destructor;
-
- return 0;
-}
-
static int ipoib_neigh_setup_dev(struct net_device *dev, struct neigh_parms *parms)
{
- parms->neigh_setup = ipoib_neigh_setup;
+ parms->neigh_destructor = ipoib_neigh_destructor;
return 0;
}
--
MST
^ permalink raw reply
* Repost [PATCH 3 of 3] ipoib: fix error handling
From: Michael S. Tsirkin @ 2006-01-18 21:20 UTC (permalink / raw)
To: LKML, netdev; +Cc: openib-general
Sorry about reposting: the message didnt seem to make it to netdev.
---
The following patch is not directly related to the destructor issue,
but I'm posting it here fore completeness since it needs to be applied on top of
the previous pair of patches in the destructor series.
---
Fix error handling in neigh_add_path.
Reduce code duplication by implementing alloc/free functions for ipoib_neigh.
Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Index: linux-2.6.15/drivers/infiniband/ulp/ipoib/ipoib_main.c
===================================================================
--- linux-2.6.15.orig/drivers/infiniband/ulp/ipoib/ipoib_main.c 2006-01-12 20:48:06.000000000 +0200
+++ linux-2.6.15/drivers/infiniband/ulp/ipoib/ipoib_main.c 2006-01-12 20:48:43.000000000 +0200
@@ -246,8 +246,7 @@ static void path_free(struct net_device
*/
if (neigh->ah)
ipoib_put_ah(neigh->ah);
- *to_ipoib_neigh(neigh->neighbour) = NULL;
- kfree(neigh);
+ ipoib_neigh_free(neigh);
}
spin_unlock_irqrestore(&priv->lock, flags);
@@ -475,7 +474,7 @@ static void neigh_add_path(struct sk_buf
struct ipoib_path *path;
struct ipoib_neigh *neigh;
- neigh = kmalloc(sizeof *neigh, GFP_ATOMIC);
+ neigh = ipoib_neigh_alloc(skb->dst->neighbour);
if (!neigh) {
++priv->stats.tx_dropped;
dev_kfree_skb_any(skb);
@@ -483,8 +482,6 @@ static void neigh_add_path(struct sk_buf
}
skb_queue_head_init(&neigh->queue);
- neigh->neighbour = skb->dst->neighbour;
- *to_ipoib_neigh(skb->dst->neighbour) = neigh;
/*
* We can only be called from ipoib_start_xmit, so we're
@@ -497,7 +494,7 @@ static void neigh_add_path(struct sk_buf
path = path_rec_create(dev,
(union ib_gid *) (skb->dst->neighbour->ha + 4));
if (!path)
- goto err;
+ goto err_path;
__path_add(dev, path);
}
@@ -527,10 +524,9 @@ static void neigh_add_path(struct sk_buf
return;
err:
- *to_ipoib_neigh(skb->dst->neighbour) = NULL;
list_del(&neigh->list);
- kfree(neigh);
-
+err_path:
+ ipoib_neigh_free(neigh);
++priv->stats.tx_dropped;
dev_kfree_skb_any(skb);
@@ -757,8 +753,7 @@ static void ipoib_neigh_destructor(struc
if (neigh->ah)
ah = neigh->ah;
list_del(&neigh->list);
- *to_ipoib_neigh(n) = NULL;
- kfree(neigh);
+ ipoib_neigh_free(neigh);
}
spin_unlock_irqrestore(&priv->lock, flags);
@@ -766,6 +761,26 @@ static void ipoib_neigh_destructor(struc
if (ah)
ipoib_put_ah(ah);
}
+
+struct ipoib_neigh *ipoib_neigh_alloc(struct neighbour *neighbour)
+{
+ struct ipoib_neigh *neigh;
+
+ neigh = kmalloc(sizeof *neigh, GFP_ATOMIC);
+ if (!neigh)
+ return NULL;
+
+ neigh->neighbour = neighbour;
+ *to_ipoib_neigh(neighbour) = neigh;
+
+ return neigh;
+}
+
+void ipoib_neigh_free(struct ipoib_neigh *neigh)
+{
+ *to_ipoib_neigh(neigh->neighbour) = NULL;
+ kfree(neigh);
+}
static int ipoib_neigh_setup_dev(struct net_device *dev, struct neigh_parms *parms)
{
Index: linux-2.6.15/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
===================================================================
--- linux-2.6.15.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c 2006-01-12 20:32:08.000000000 +0200
+++ linux-2.6.15/drivers/infiniband/ulp/ipoib/ipoib_multicast.c 2006-01-12 20:48:43.000000000 +0200
@@ -113,8 +113,7 @@ static void ipoib_mcast_free(struct ipoi
*/
if (neigh->ah)
ipoib_put_ah(neigh->ah);
- *to_ipoib_neigh(neigh->neighbour) = NULL;
- kfree(neigh);
+ ipoib_neigh_free(neigh);
}
spin_unlock_irqrestore(&priv->lock, flags);
@@ -720,13 +719,11 @@ out:
if (skb->dst &&
skb->dst->neighbour &&
!*to_ipoib_neigh(skb->dst->neighbour)) {
- struct ipoib_neigh *neigh = kmalloc(sizeof *neigh, GFP_ATOMIC);
+ struct ipoib_neigh *neigh = ipoib_neigh_alloc(skb->dst->neighbour);
if (neigh) {
kref_get(&mcast->ah->ref);
neigh->ah = mcast->ah;
- neigh->neighbour = skb->dst->neighbour;
- *to_ipoib_neigh(skb->dst->neighbour) = neigh;
list_add_tail(&neigh->list, &mcast->neigh_list);
}
}
Index: linux-2.6.15/drivers/infiniband/ulp/ipoib/ipoib.h
===================================================================
--- linux-2.6.15.orig/drivers/infiniband/ulp/ipoib/ipoib.h 2006-01-12 20:27:47.000000000 +0200
+++ linux-2.6.15/drivers/infiniband/ulp/ipoib/ipoib.h 2006-01-12 20:48:43.000000000 +0200
@@ -222,6 +222,9 @@ static inline struct ipoib_neigh **to_ip
(offsetof(struct neighbour, ha) & 4));
}
+struct ipoib_neigh *ipoib_neigh_alloc(struct neighbour *neigh);
+void ipoib_neigh_free(struct ipoib_neigh *neigh);
+
extern struct workqueue_struct *ipoib_workqueue;
/* functions */
--
MST
^ permalink raw reply
* Re: Fwd: [PATCH 1 of 3] move destructor to struct neigh_parms
From: Michael S. Tsirkin @ 2006-01-18 21:27 UTC (permalink / raw)
To: Shirley Ma; +Cc: netdev, openib-general-bounces, LKML, openib-general
In-Reply-To: <OFB2D358DB.F7A4CFB5-ON872570FA.007138E4-882570FA.00714019@us.ibm.com>
Quoting Shirley Ma <xma@us.ibm.com>:
> Subject: Re: Fwd: [PATCH 1 of 3] move destructor to struct neigh_parms
>
>
> >+ if (neigh->parms->neigh_destructor)
> >+ (neigh->parms->neigh_destructor)(neigh);
>
> Is that safe without checking neigh->parms here?
Yes, we have neigh_parms_put(neigh->parms); a couple of lines below.
--
MST
^ permalink raw reply
* Re: [git patches] e1000 fixes
From: Andrew Morton @ 2006-01-18 22:11 UTC (permalink / raw)
To: Jeff Garzik; +Cc: torvalds, netdev, linux-kernel
In-Reply-To: <20060118212449.GA13260@havoc.gtf.org>
Jeff Garzik <jgarzik@pobox.com> wrote:
>
> Let's see how this goes... if there are further problems, I'll just
> revert the entire thing, and push these changes (and the previous set)
> into upstream-2.6.17 branch.
>
> I don't mind them updating the defconfig files, even though most people
> are too slack to worry about it, since its pretty clear the default
> choice.
>
>
> Please pull from 'upstream-fixes' branch of
> master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
These patches fix e1000 for me, thanks.
^ permalink raw reply
* [patch 1/2] MAINTAINERS: correct location for net-2.6.git
From: John W. Linville @ 2006-01-18 22:43 UTC (permalink / raw)
To: linux-kernel; +Cc: netdev, davem
Correct location info for net-2.6 git tree.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
MAINTAINERS | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 6d1b048..0d0f8a8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1841,7 +1841,7 @@ M: yoshfuji@linux-ipv6.org
P: Patrick McHardy
M: kaber@coreworks.de
L: netdev@vger.kernel.org
-T: git kernel.org:/pub/scm/linux/kernel/davem/net-2.6.git
+T: git kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
S: Maintained
IPVS
--
John W. Linville
linville@tuxdriver.com
^ permalink raw reply related
* [patch 2/2] MAINTAINERS: add entry for wireless networking
From: John W. Linville @ 2006-01-18 22:44 UTC (permalink / raw)
To: linux-kernel; +Cc: netdev, davem
In-Reply-To: <20060118224300.GF6583@tuxdriver.com>
Add an entry to MAINTAINERS for wireless networking, just so people
know whom to bless with patches.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
MAINTAINERS | 7 +++++++
1 files changed, 7 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 6d1b048..23aca6f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1844,6 +1844,13 @@ L: netdev@vger.kernel.org
T: git kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
S: Maintained
+NETWORKING [WIRELESS]
+P: John W. Linville
+M: linville@tuxdriver.com
+L: netdev@vger.kernel.org
+T: git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
+S: Maintained
+
IPVS
P: Wensong Zhang
M: wensong@linux-vs.org
--
John W. Linville
linville@tuxdriver.com
^ permalink raw reply related
* Re: [patch 2/2] MAINTAINERS: add entry for wireless networking
From: David S. Miller @ 2006-01-18 22:53 UTC (permalink / raw)
To: linville; +Cc: linux-kernel, netdev
In-Reply-To: <20060118224453.GG6583@tuxdriver.com>
Both applied, thanks John.
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox