Re: [PATCH 2.6.18-rc7 1/9] NetXen: Makefile and driver main file

2006-09-19 Thread Pradeep Dalvi 

Randy,

Thanks for feedback. We have incorporated all of the suggestions.

--
pradeep

diff -u linux-2.6.18-rc7/drivers/net/netxen/netxen_nic_main.c 
linux-2.6.18-rc7/drivers/net/netxen/netxen_nic_main.c
--- linux-2.6.18-rc7/drivers/net/netxen/netxen_nic_main.c   2006-09-15 
10:51:59.0 -0700
+++ linux-2.6.18-rc7/drivers/net/netxen/netxen_nic_main.c   2006-09-19 
07:51:20.0 -0700
@@ -561,9 +561,9 @@
return 0;
 }

-/**
+/*
  * netxen_nic_close - Disables a network interface entry point
- **/
+ */
 static int netxen_nic_close(struct net_device *netdev)
 {
struct netxen_port *port = netdev_priv(netdev);
@@ -628,7 +628,7 @@

u32 producer = 0;
u32 saved_producer = 0;
-   struct cmd_desc_type0_t *hwdesc;
+   struct cmd_desc_type0 *hwdesc;
int k;
struct netxen_cmd_buffer *pbuf = NULL;
unsigned int tries = 0;
@@ -691,7 +691,7 @@
if (((skb-nh.iph)-ihl * sizeof(u32)) +
((skb-h.th)-doff * sizeof(u32)) +
sizeof(struct ethhdr) 
-   (sizeof(struct cmd_desc_type0_t) - NET_IP_ALIGN)) {
+   (sizeof(struct cmd_desc_type0) - NET_IP_ALIGN)) {
no_of_desc++;
}
}
@@ -733,7 +733,7 @@
producer = local_producer;
saved_producer = producer;
hwdesc = hw-cmd_desc_head[producer];
-   memset(hwdesc, 0, sizeof(struct cmd_desc_type0_t));
+   memset(hwdesc, 0, sizeof(struct cmd_desc_type0));
/* Take skb-data itself */
pbuf = adapter-cmd_buf_arr[producer];
if (skb_shinfo(skb)-gso_size  0) {
@@ -773,7 +773,7 @@
producer = get_next_index(producer,
  adapter-max_tx_desc_count);
hwdesc = hw-cmd_desc_head[producer];
-   memset(hwdesc, 0, sizeof(struct cmd_desc_type0_t));
+   memset(hwdesc, 0, sizeof(struct cmd_desc_type0));
}
frag = skb_shinfo(skb)-frags[i - 1];
len = frag-size;
@@ -819,9 +819,9 @@
if (hw-cmd_desc_head[saved_producer].opcode == TX_TCP_LSO) {
int hdr_len, first_hdr_len, more_hdr;
hdr_len = hw-cmd_desc_head[saved_producer].total_hdr_length;
-   if (hdr_len  (sizeof(struct cmd_desc_type0_t) - NET_IP_ALIGN)) 
{
+   if (hdr_len  (sizeof(struct cmd_desc_type0) - NET_IP_ALIGN)) {
first_hdr_len =
-   sizeof(struct cmd_desc_type0_t) - NET_IP_ALIGN;
+   sizeof(struct cmd_desc_type0) - NET_IP_ALIGN;
more_hdr = 1;
} else {
first_hdr_len = hdr_len;
@@ -964,11 +964,11 @@
return ret;
 }

-/**
+/*
  * netxen_intr - Interrupt Handler
  * @irq: interrupt number
  * data points to adapter stucture (which may be handling more than 1 port
- **/
+ */
 irqreturn_t netxen_intr(int irq, void *data, struct pt_regs * regs)
 {
struct netxen_adapter *adapter;

-
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 2.6.18-rc7 1/9] NetXen: Makefile and driver main file

2006-09-15 Thread Amit S. Kale 

diff -Narup -X linux-2.6.18-rc7.orig/Documentation/dontdiff 
linux-2.6.18-rc7.orig/MAINTAINERS linux-2.6.18-rc7/MAINTAINERS
--- linux-2.6.18-rc7.orig/MAINTAINERS   2006-09-15 09:27:56.0 -0700
+++ linux-2.6.18-rc7/MAINTAINERS2006-09-15 09:32:05.0 -0700
@@ -2060,6 +2060,13 @@ L:   netdev@vger.kernel.org
 T: git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
 S: Maintained

+NETXEN (1/10) GbE SUPPORT
+P: Amit S. Kale
+M: [EMAIL PROTECTED]
+L: netdev@vger.kernel.org
+W: http://www.netxen.com
+S: Supported
+
 IPVS
 P: Wensong Zhang
 M: [EMAIL PROTECTED]
diff -Narup -X linux-2.6.18-rc7.orig/Documentation/dontdiff 
linux-2.6.18-rc7.orig/drivers/net/Kconfig linux-2.6.18-rc7/drivers/net/Kconfig
--- linux-2.6.18-rc7.orig/drivers/net/Kconfig   2006-09-15 09:27:55.0 
-0700
+++ linux-2.6.18-rc7/drivers/net/Kconfig2006-09-15 09:33:43.0 
-0700
@@ -2399,6 +2399,11 @@ config MYRI10GE
  file:Documentation/networking/net-modules.txt.  The module
  will be called myri10ge.

+config NETXEN_NIC
+   tristate NetXen Multi port (1/10) Gigabit Ethernet NIC
+   help
+ This enables the support for NetXen's Gigabit Ethernet card.
+
 endmenu

 source drivers/net/tokenring/Kconfig
diff -Narup -X linux-2.6.18-rc7.orig/Documentation/dontdiff 
linux-2.6.18-rc7.orig/drivers/net/Makefile linux-2.6.18-rc7/drivers/net/Makefile
--- linux-2.6.18-rc7.orig/drivers/net/Makefile  2006-09-15 09:27:55.0 
-0700
+++ linux-2.6.18-rc7/drivers/net/Makefile   2006-09-15 10:51:59.0 
-0700
@@ -219,3 +219,4 @@ obj-$(CONFIG_NETCONSOLE) += netconsole.o

 obj-$(CONFIG_FS_ENET) += fs_enet/

+obj-$(CONFIG_NETXEN_NIC) += netxen/
diff -Narup -X linux-2.6.18-rc7.orig/Documentation/dontdiff 
linux-2.6.18-rc7.orig/drivers/net/netxen/Makefile 
linux-2.6.18-rc7/drivers/net/netxen/Makefile
--- linux-2.6.18-rc7.orig/drivers/net/netxen/Makefile   1969-12-31 
16:00:00.0 -0800
+++ linux-2.6.18-rc7/drivers/net/netxen/Makefile2006-09-15 
10:51:59.0 -0700
@@ -0,0 +1,35 @@
+# Copyright (C) 2003 - 2006 NetXen, Inc.
+# All rights reserved.
+# 
+# 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
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful, but

+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License

+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+# MA  02111-1307, USA.
+# 
+# The full GNU General Public License is included in this distribution

+# in the file called LICENSE.
+# 
+# Contact Information:

+#[EMAIL PROTECTED]
+# NetXen,
+# 3965 Freedom Circle, Fourth floor,
+# Santa Clara, CA 95054
+#
+# Makefile for the NetXen NIC Driver
+#
+
+
+obj-$(CONFIG_NETXEN_NIC) := netxen_nic.o
+
+netxen_nic-y := netxen_nic_hw.o netxen_nic_main.o netxen_nic_init.o \
+   netxen_nic_isr.o netxen_nic_ethtool.o netxen_nic_niu.o
diff -Narup -X linux-2.6.18-rc7.orig/Documentation/dontdiff 
linux-2.6.18-rc7.orig/drivers/net/netxen/netxen_nic_main.c 
linux-2.6.18-rc7/drivers/net/netxen/netxen_nic_main.c
--- linux-2.6.18-rc7.orig/drivers/net/netxen/netxen_nic_main.c  1969-12-31 
16:00:00.0 -0800
+++ linux-2.6.18-rc7/drivers/net/netxen/netxen_nic_main.c   2006-09-15 
10:51:59.0 -0700
@@ -0,0 +1,1116 @@
+/*
+ * Copyright (C) 2003 - 2006 NetXen, Inc.
+ * All rights reserved.
+ * 
+ * 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
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but

+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA  02111-1307, USA.
+ * 
+ * The full GNU General Public License is included in this distribution

+ * in the file called LICENSE.
+ * 
+ * Contact Information:

+ *[EMAIL PROTECTED]
+ * NetXen,
+ * 3965 Freedom Circle, Fourth floor,
+ * Santa Clara, CA 95054
+ *
+ *
+ *  Main source file for NetXen NIC Driver on Linux
+ *
+ */
+
+#include netxen_nic_hw.h
+
+#include netxen_nic.h
+#define DEFINE_GLOBAL_RECV_CRB
+#include