Please pull from 'new-drivers' branch of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git new-driversto receive the following updates:
Documentation/networking/LICENSE.qlge | 46 +
MAINTAINERS | 20 +
drivers/net/Kconfig | 39 +
drivers/net/Makefile | 4 +
drivers/net/atlx/Makefile | 2 +
drivers/net/atlx/atl2.c | 3127 ++++++++++++++++++++++++++
drivers/net/atlx/atl2.h | 530 +++++
drivers/net/enic/Makefile | 5 +
drivers/net/enic/cq_desc.h | 79 +
drivers/net/enic/cq_enet_desc.h | 169 ++
drivers/net/enic/enic.h | 115 +
drivers/net/enic/enic_main.c | 1949 ++++++++++++++++
drivers/net/enic/enic_res.c | 370 +++
drivers/net/enic/enic_res.h | 151 ++
drivers/net/enic/rq_enet_desc.h | 60 +
drivers/net/enic/vnic_cq.c | 89 +
drivers/net/enic/vnic_cq.h | 113 +
drivers/net/enic/vnic_dev.c | 674 ++++++
drivers/net/enic/vnic_dev.h | 106 +
drivers/net/enic/vnic_devcmd.h | 282 +++
drivers/net/enic/vnic_enet.h | 47 +
drivers/net/enic/vnic_intr.c | 62 +
drivers/net/enic/vnic_intr.h | 92 +
drivers/net/enic/vnic_nic.h | 65 +
drivers/net/enic/vnic_resource.h | 63 +
drivers/net/enic/vnic_rq.c | 199 ++
drivers/net/enic/vnic_rq.h | 204 ++
drivers/net/enic/vnic_rss.h | 32 +
drivers/net/enic/vnic_stats.h | 70 +
drivers/net/enic/vnic_wq.c | 184 ++
drivers/net/enic/vnic_wq.h | 154 ++
drivers/net/enic/wq_enet_desc.h | 98 +
drivers/net/jme.c | 3019 +++++++++++++++++++++++++
drivers/net/jme.h | 1199 ++++++++++
drivers/net/qlge/Makefile | 7 +
drivers/net/qlge/qlge.h | 1593 +++++++++++++
drivers/net/qlge...
From: Jeff Garzik <jeff@garzik.org>
Pulled, thanks Jeff.
I'll push this to net-next-2.6 after a quick build sanity test.
--
Hi,
with new enic driver I get the following build error on i386 (config attached):
CC [M] drivers/net/enic/vnic_cq.o
drivers/net/enic/vnic_cq.c: In function 'vnic_cq_init':
drivers/net/enic/vnic_cq.c:65: error: implicit declaration of function 'writeq'
make[2]: *** [drivers/net/enic/vnic_cq.o] Error 1
make[1]: *** [drivers/net/enic] Error 2
make: *** [_module_drivers/net] Error 2Something like patch below (borrowed from net/s2io.h, ok to use it?) fixes it:
--- linux-2.6.27/drivers/net/enic/vnic_dev.h.orig 2008-09-19 13:57:43.000000000 -0300
+++ linux-2.6.27/drivers/net/enic/vnic_dev.h 2008-09-19 14:00:57.000000000 -0300
@@ -23,6 +23,26 @@
#include "vnic_resource.h"
#include "vnic_devcmd.h"+#include <linux/io.h>
+#ifndef readq
+static inline u64 readq(void __iomem *addr)
+{
+ u64 ret = 0;
+ ret = readl(addr + 4);
+ ret <<= 32;
+ ret |= readl(addr);
+
+ return ret;
+}
+#endif
+#ifndef writeq
+static inline void writeq(u64 val, void __iomem *addr)
+{
+ writel((u32) (val), addr);
+ writel((u32) (val >> 32), (addr + 4));
+}
+#endif
+
#ifndef VNIC_PADDR_TARGET
#define VNIC_PADDR_TARGET 0x0000000000000000ULL
#endif--
[]'s
Herton
From: Jeff Garzik <jeff@garzik.org>
So, new-drivers destined for net-2.6 right?
Just making sure :-)
--
I based it on top of net-next for 2.6.28, but can easily retarget it for
net-2.6...Jeff
--
From: Jeff Garzik <jeff@garzik.org>
Since I really want to concentrate on killing as many regression list
network driver entries as possible, I'd much rather:1) You concentrate on building that net-2.6 bug fix tree for me
2) I pull these new drivers into net-next-2.6 for now and we can
think about putting these into net-2.6 for a subsequent push
to Linus, rather than the current one.Sound good to you?
--
Also, there is still a net-next batch outstanding to be pulled, which is
totally unrelated to the recently-rejected fixes push:http://marc.info/?l=linux-netdev&m=122135907115163&w=2
I will have the updated 2.6.27-rc fixes push to you today.
Jeff
--
| monstr | [PATCH 27/56] microblaze_v2: support for a.out |
| Tarkan Erimer | Re: Dual-Licensing Linux Kernel with GPL V2 and GPL V3 |
| Greg KH | [GIT PATCH] driver core patches against 2.6.24 |
| Rafael J. Wysocki | [Bug #10493] mips BCM47XX compile error |
git: | |
| Jarek Poplawski | [PATCH] pkt_sched: Destroy gen estimators under rtnl_lock(). |
| Gerrit Renker | [PATCH 27/37] dccp: Integration of dynamic feature activation - part 2 (server side) |
| David Miller | [GIT]: Networking |
| Frans Pop | svc: failed to register lockdv1 RPC service (errno 97). |
