kern/77913: commit references a PR

[dfilter service]

The following reply was made to PR kern/77913; it has been noted by GNATS.

From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: kern/77913: commit references a PR
Date: Fri,  6 Aug 2010 18:57:22 +0000 (UTC)

 Author: bschmidt
 Date: Fri Aug  6 18:57:09 2010
 New Revision: 210949
 URL: http://svn.freebsd.org/changeset/base/210949
 
 Log:
   MFC r182236,r182238,182250,182251:
   - Add recent ELSA additions to wi(4), plus make sure the list matches
     the driver for ELSA.
   - The APDL-325 is a Wireless LAN pcmcia adapter that sits inside some
     Billion Access Points.  Fix wi(4) to recognise the adapter.
   - Remove opt_wi.h
   
   PR:		kern/77913
   Submitted by:	Daan Vreeken [PA4DAN] <Danovitsch at Vitsch.net>
 
 Modified:
   stable/7/share/man/man4/wi.4
   stable/7/sys/dev/pccard/pccarddevs
   stable/7/sys/dev/wi/if_wi_pccard.c
   stable/7/sys/modules/wi/Makefile
 Directory Properties:
   stable/7/share/man/man4/   (props changed)
   stable/7/sys/   (props changed)
   stable/7/sys/cddl/contrib/opensolaris/   (props changed)
   stable/7/sys/contrib/dev/acpica/   (props changed)
   stable/7/sys/contrib/pf/   (props changed)
 
 Modified: stable/7/share/man/man4/wi.4
 ==============================================================================
 --- stable/7/share/man/man4/wi.4	Fri Aug  6 18:55:49 2010	(r210948)
 +++ stable/7/share/man/man4/wi.4	Fri Aug  6 18:57:09 2010	(r210949)
 @@ -189,6 +189,9 @@ Dlink DWL650	Prism-2.5	PCMCIA
  ELECOM Air at Hawk/LD-WL11/PCC		PCMCIA
  ELSA MC-11		PCMCIA
  ELSA XI300	Prism-II	PCMCIA
 +ELSA XI325	Prism-2.5	PCMCIA
 +ELSA APDL325	Prism-2.5	PCMCIA
 +ELSA XI330	Prism-3	PCMCIA
  ELSA XI800	Prism-II	CF
  EMTAC A2424i	Prism-II	PCMCIA
  Ericsson Wireless LAN CARD C11	Spectrum24	PCMCIA
 
 Modified: stable/7/sys/dev/pccard/pccarddevs
 ==============================================================================
 --- stable/7/sys/dev/pccard/pccarddevs	Fri Aug  6 18:55:49 2010	(r210948)
 +++ stable/7/sys/dev/pccard/pccarddevs	Fri Aug  6 18:57:09 2010	(r210949)
 @@ -320,6 +320,7 @@ product ELSA MC2_IEEE		0x0001 AirLancer 
  product ELSA XI300_IEEE		0x0002 XI300 Wireless LAN
  product ELSA XI800_IEEE		0x0004 XI800 CF Wireless LAN
  product ELSA XI325_IEEE		0x0005 XI325 Wireless LAN
 +product ELSA APDL325_IEEE	0x0006 ADPL325 Wireless LAN
  product ELSA XI330_IEEE		0x0010 XI330 Wireless LAN
  product ELSA WIFI_FLASH		0x0101 802.11b plus 128MB Flash
  
 
 Modified: stable/7/sys/dev/wi/if_wi_pccard.c
 ==============================================================================
 --- stable/7/sys/dev/wi/if_wi_pccard.c	Fri Aug  6 18:55:49 2010	(r210948)
 +++ stable/7/sys/dev/wi/if_wi_pccard.c	Fri Aug  6 18:57:09 2010	(r210949)
 @@ -41,8 +41,6 @@
  #include <sys/cdefs.h>
  __FBSDID("$FreeBSD$");
  
 -#include "opt_wi.h"
 -
  #include <sys/param.h>
  #include <sys/kernel.h>
  #include <sys/socket.h>
 @@ -126,6 +124,7 @@ static const struct pccard_product wi_pc
  	PCMCIA_CARD(DLINK, DWL650H),
  	PCMCIA_CARD(ELSA, XI300_IEEE),
  	PCMCIA_CARD(ELSA, XI325_IEEE),
 +	PCMCIA_CARD(ELSA, APDL325_IEEE),
  	PCMCIA_CARD(ELSA, XI330_IEEE),
  	PCMCIA_CARD(ELSA, XI800_IEEE),
  	PCMCIA_CARD(ELSA, WIFI_FLASH),
 
 Modified: stable/7/sys/modules/wi/Makefile
 ==============================================================================
 --- stable/7/sys/modules/wi/Makefile	Fri Aug  6 18:55:49 2010	(r210948)
 +++ stable/7/sys/modules/wi/Makefile	Fri Aug  6 18:57:09 2010	(r210949)
 @@ -3,12 +3,7 @@
  .PATH: ${.CURDIR}/../../dev/wi
  
  KMOD=	if_wi
 -SRCS=	opt_wi.h if_wi.c if_wi_pccard.c if_wi_pci.c \
 +SRCS=	if_wi.c if_wi_pccard.c if_wi_pci.c \
  	card_if.h device_if.h bus_if.h pci_if.h pccarddevs.h
  
 -.if !defined(KERNBUILDDIR)
 -opt_wi.h:
 -	echo "#define WI_SYMBOL_FIRMWARE 1" > ${.TARGET}
 -.endif
 -
  .include <bsd.kmod.mk>
 _______________________________________________
 svn-src-all at freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe at freebsd.org"