Applied to gPXE main branch. Thanks Stefan, Masroor, and the whole Neterion team for your work.
/ Marty / Masroor Vettuparambil wrote on 3/5/10 5:11 AM: > Hi Stefan, > > Thanks for the fix. I have tested it on our end. > Could you please apply it? > > Thanks, > Masroor > > -----Original Message----- > From: Stefan Hajnoczi [mailto:[email protected]] > Sent: Thursday, March 04, 2010 2:37 PM > To: Masroor Vettuparambil > Cc: [email protected]; Marty Connor; Sivakumar > Subramani; Ramkrishna Vepa; Stefan Hajnoczi > Subject: [PATCH] [vxge] Add stub vxge.c file so bin/vxge.usb can be > built > > The vxge driver code is split over several files, including vxge_main.c. > This causes the build system and ROM-o-matic to see the driver as > "vxge_main". > > This patch adds a stub vxge.c which takes up no space but gives the > driver its proper name, "vxge". > > Signed-off-by: Stefan Hajnoczi<[email protected]> > --- > src/drivers/net/vxge/vxge.c | 18 ++++++++++++++++++ > src/drivers/net/vxge/vxge_main.c | 9 +++++---- > 2 files changed, 23 insertions(+), 4 deletions(-) > create mode 100644 src/drivers/net/vxge/vxge.c > > diff --git a/src/drivers/net/vxge/vxge.c b/src/drivers/net/vxge/vxge.c > new file mode 100644 > index 0000000..a24932e > --- /dev/null > +++ b/src/drivers/net/vxge/vxge.c > @@ -0,0 +1,18 @@ > +/** @file Stub file for vxge driver > + * > + * This file drags in the rest of the driver for Neterion Inc's X3100 > Series > + * 10GbE PCIe I/O Virtualized Server Adapter, allowing the driver to be > built > + * as "vxge" even though the code is in vxge_* named files. > + */ > + > +FILE_LICENCE(GPL2_OR_LATER); > + > +#include<gpxe/pci.h> > + > +REQUIRE_OBJECT(vxge_main); > + > +/** vxge PCI IDs for util/parserom.pl which are put into bin/NIC */ > +static struct pci_device_id vxge_nics[] __unused = { > + /* If you change this, also adjust vxge_main_nics[] in > vxge_main.c */ > + PCI_ROM(0x17d5, 0x5833, "vxge-x3100", "Neterion X3100 Series", > 0), > +}; > diff --git a/src/drivers/net/vxge/vxge_main.c > b/src/drivers/net/vxge/vxge_main.c > index f69cdd2..8f5ba47 100644 > --- a/src/drivers/net/vxge/vxge_main.c > +++ b/src/drivers/net/vxge/vxge_main.c > @@ -712,13 +712,14 @@ static struct net_device_operations > vxge_operations = { > .irq = vxge_irq, > }; > > -static struct pci_device_id vxge_nics[] = { > - PCI_ROM(0x17d5, 0x5833, "vxge-x3100", "Neterion X3100 Series", > 0), > +static struct pci_device_id vxge_main_nics[] = { > + /* If you change this, also adjust vxge_nics[] in vxge.c */ > + PCI_ID(0x17d5, 0x5833, "vxge-x3100", "Neterion X3100 Series", > 0), > }; > > struct pci_driver vxge_driver __pci_driver = { > - .ids = vxge_nics, > - .id_count = (sizeof(vxge_nics) / sizeof(vxge_nics[0])), > + .ids = vxge_main_nics, > + .id_count = (sizeof(vxge_main_nics) / > sizeof(vxge_main_nics[0])), > .probe = vxge_probe, > .remove = vxge_remove, > }; _______________________________________________ gPXE-devel mailing list [email protected] http://etherboot.org/mailman/listinfo/gpxe-devel
