aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Leon <santil@linux.vnet.ibm.com>2010-09-03 14:29:53 -0400
committerDavid S. Miller <davem@davemloft.net>2010-09-06 21:21:56 -0400
commit9d348af47656a65a697ff55a53daf294ea4d5662 (patch)
treeab68117d8cb037a26ad90f76697f25f24679ace4
parentc22960977ad4b01dc608579e0865eac3b2bc9ce8 (diff)
ibmveth: Update module information and version
Add an entry to the MAINTAINERS file for ibmveth, clean up the copyright and add all authors. Change the name of the module to reflect the product name over the last number of years. Considering all the changes we have made, bump the driver version. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Santiago Leon <santil@linux.vnet.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--MAINTAINERS6
-rw-r--r--drivers/net/ibmveth.c48
-rw-r--r--drivers/net/ibmveth.h48
3 files changed, 54 insertions, 48 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 7a49a7b5af1d..24fbd772e3b7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2856,6 +2856,12 @@ M: Brian King <brking@us.ibm.com>
2856S: Supported 2856S: Supported
2857F: drivers/scsi/ipr.* 2857F: drivers/scsi/ipr.*
2858 2858
2859IBM Power Virtual Ethernet Device Driver
2860M: Santiago Leon <santil@linux.vnet.ibm.com>
2861L: netdev@vger.kernel.org
2862S: Supported
2863F: drivers/net/ibmveth.*
2864
2859IBM ServeRAID RAID DRIVER 2865IBM ServeRAID RAID DRIVER
2860P: Jack Hammer 2866P: Jack Hammer
2861M: Dave Jeffery <ipslinux@adaptec.com> 2867M: Dave Jeffery <ipslinux@adaptec.com>
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index dfa2ee7a92c8..b3e157ed6776 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -1,28 +1,27 @@
1/* 1/*
2 * IBM eServer i/pSeries Virtual Ethernet Device Driver 2 * IBM Power Virtual Ethernet Device Driver
3 * Copyright (C) 2003 IBM Corp.
4 * Originally written by Dave Larson (larson1@us.ibm.com)
5 * Maintained by Santiago Leon (santil@us.ibm.com)
6 * 3 *
7 * This program is free software; you can redistribute it and/or modify 4 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 5 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 6 * the Free Software Foundation; either version 2 of the License, or
10 * (at your option) any later version. 7 * (at your option) any later version.
11 * 8 *
12 * This program is distributed in the hope that it will be useful, 9 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details. 12 * GNU General Public License for more details.
16 * 13 *
17 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software 15 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 16 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
20 * USA
21 * 17 *
22 * This module contains the implementation of a virtual ethernet device 18 * Copyright (C) IBM Corporation, 2003, 2010
23 * for use with IBM i/pSeries LPAR Linux. It utilizes the logical LAN 19 *
24 * option of the RS/6000 Platform Architechture to interface with virtual 20 * Authors: Dave Larson <larson1@us.ibm.com>
25 * ethernet NICs that are presented to the partition by the hypervisor. 21 * Santiago Leon <santil@linux.vnet.ibm.com>
22 * Brian King <brking@linux.vnet.ibm.com>
23 * Robert Jennings <rcj@linux.vnet.ibm.com>
24 * Anton Blanchard <anton@au.ibm.com>
26 */ 25 */
27 26
28#include <linux/module.h> 27#include <linux/module.h>
@@ -58,12 +57,11 @@ static struct kobj_type ktype_veth_pool;
58 57
59 58
60static const char ibmveth_driver_name[] = "ibmveth"; 59static const char ibmveth_driver_name[] = "ibmveth";
61static const char ibmveth_driver_string[] = "IBM i/pSeries Virtual Ethernet " 60static const char ibmveth_driver_string[] = "IBM Power Virtual Ethernet Driver";
62 "Driver"; 61#define ibmveth_driver_version "1.04"
63#define ibmveth_driver_version "1.03"
64 62
65MODULE_AUTHOR("Santiago Leon <santil@us.ibm.com>"); 63MODULE_AUTHOR("Santiago Leon <santil@linux.vnet.ibm.com>");
66MODULE_DESCRIPTION("IBM i/pSeries Virtual Ethernet Driver"); 64MODULE_DESCRIPTION("IBM Power Virtual Ethernet Driver");
67MODULE_LICENSE("GPL"); 65MODULE_LICENSE("GPL");
68MODULE_VERSION(ibmveth_driver_version); 66MODULE_VERSION(ibmveth_driver_version);
69 67
diff --git a/drivers/net/ibmveth.h b/drivers/net/ibmveth.h
index e6d779471770..43a794fab9ff 100644
--- a/drivers/net/ibmveth.h
+++ b/drivers/net/ibmveth.h
@@ -1,26 +1,28 @@
1/**************************************************************************/ 1/*
2/* */ 2 * IBM Power Virtual Ethernet Device Driver
3/* IBM eServer i/[Series Virtual Ethernet Device Driver */ 3 *
4/* Copyright (C) 2003 IBM Corp. */ 4 * This program is free software; you can redistribute it and/or modify
5/* Dave Larson (larson1@us.ibm.com) */ 5 * it under the terms of the GNU General Public License as published by
6/* Santiago Leon (santil@us.ibm.com) */ 6 * the Free Software Foundation; either version 2 of the License, or
7/* */ 7 * (at your option) any later version.
8/* This program is free software; you can redistribute it and/or modify */ 8 *
9/* it under the terms of the GNU General Public License as published by */ 9 * This program is distributed in the hope that it will be useful,
10/* the Free Software Foundation; either version 2 of the License, or */ 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11/* (at your option) any later version. */ 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12/* */ 12 * GNU General Public License for more details.
13/* This program is distributed in the hope that it will be useful, */ 13 *
14/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ 14 * You should have received a copy of the GNU General Public License
15/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ 15 * along with this program; if not, write to the Free Software
16/* GNU General Public License for more details. */ 16 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
17/* */ 17 *
18/* You should have received a copy of the GNU General Public License */ 18 * Copyright (C) IBM Corporation, 2003, 2010
19/* along with this program; if not, write to the Free Software */ 19 *
20/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 */ 20 * Authors: Dave Larson <larson1@us.ibm.com>
21/* USA */ 21 * Santiago Leon <santil@linux.vnet.ibm.com>
22/* */ 22 * Brian King <brking@linux.vnet.ibm.com>
23/**************************************************************************/ 23 * Robert Jennings <rcj@linux.vnet.ibm.com>
24 * Anton Blanchard <anton@au.ibm.com>
25 */
24 26
25#ifndef _IBMVETH_H 27#ifndef _IBMVETH_H
26#define _IBMVETH_H 28#define _IBMVETH_H