/spare/repo/netdev-2.6 branch 'ieee80211'

diff --combined MAINTAINERS
index 423103e,ec8433c..4b39069
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -991,13 -991,6 +991,13 @@@ M:       mike.miller@hp.co
  L:    iss_storagedev@hp.com
  S:    Supported
   
 +HOST AP DRIVER
 +P:    Jouni Malinen
 +M:    jkmaline@cc.hut.fi
 +L:    hostap@shmoo.com
 +W:    http://hostap.epitest.fi/
 +S:    Maintained
 +
  HP100:        Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series
  P:    Jaroslav Kysela
  M:    perex@suse.cz
@@@ -1176,6 -1169,12 +1176,12 @@@ L:    linux-input@atrey.karlin.mff.cuni.c
  L:    linux-joystick@atrey.karlin.mff.cuni.cz
  S:    Maintained
  
+ INOTIFY
+ P:    John McCutchan and Robert Love
+ M:    ttb@tentacle.dhs.org and rml@novell.com
+ L:    linux-kernel@vger.kernel.org
+ S:    Maintained
+ 
  INTEL 810/815 FRAMEBUFFER DRIVER
  P:      Antonino Daplas
  M:      adaplas@pol.net
@@@ -1417,13 -1416,20 +1423,20 @@@ W:   http://www.penguinppc.org
  L:    linuxppc-embedded@ozlabs.org
  S:    Maintained
  
- LINUX FOR POWERPC EMBEDDED PPC8XX AND BOOT CODE
+ LINUX FOR POWERPC BOOT CODE
  P:    Tom Rini
  M:    trini@kernel.crashing.org
  W:    http://www.penguinppc.org/
  L:    linuxppc-embedded@ozlabs.org
  S:    Maintained
  
+ LINUX FOR POWERPC EMBEDDED PPC8XX
+ P:    Marcelo Tosatti
+ M:    marcelo.tosatti@cyclades.com
+ W:    http://www.penguinppc.org/
+ L:    linuxppc-embedded@ozlabs.org
+ S:    Maintained
+ 
  LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX
  P:     Kumar Gala
  M:     kumar.gala@freescale.com
@@@ -2427,6 -2433,12 +2440,12 @@@ L:    linux-usb-users@lists.sourceforge.ne
  L:    linux-usb-devel@lists.sourceforge.net
  S:    Maintained
  
+ USB OPTION-CARD DRIVER
+ P:    Matthias Urlichs
+ M:    smurf@smurf.noris.de
+ L:    linux-usb-devel@lists.sourceforge.net
+ S:    Maintained
+ 
  USB OV511 DRIVER
  P:    Mark McClelland
  M:    mmcclell@bigfoot.com

diff --combined drivers/net/wireless/airo.c
index 6110187,df20adc..6db1fb6
--- 1/drivers/net/wireless/airo.c
--- 2/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@@ -1040,7 -1040,7 +1040,7 @@@ typedef struct 
        u16 status;
  } WifiCtlHdr;
  
 -WifiCtlHdr wifictlhdr8023 = {
 +static WifiCtlHdr wifictlhdr8023 = {
        .ctlhdr = {
                .ctl    = HOST_DONT_RLSE,
        }
@@@ -1111,13 -1111,13 +1111,13 @@@ static int airo_thread(void *data)
  static void timer_func( struct net_device *dev );
  static int airo_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
  #ifdef WIRELESS_EXT
 -struct iw_statistics *airo_get_wireless_stats (struct net_device *dev);
 +static struct iw_statistics *airo_get_wireless_stats (struct net_device *dev);
  static void airo_read_wireless_stats (struct airo_info *local);
  #endif /* WIRELESS_EXT */
  #ifdef CISCO_EXT
  static int readrids(struct net_device *dev, aironet_ioctl *comp);
  static int writerids(struct net_device *dev, aironet_ioctl *comp);
 -int flashcard(struct net_device *dev, aironet_ioctl *comp);
 +static int flashcard(struct net_device *dev, aironet_ioctl *comp);
  #endif /* CISCO_EXT */
  #ifdef MICSUPPORT
  static void micinit(struct airo_info *ai);
@@@ -1226,12 -1226,6 +1226,12 @@@ static int setup_proc_entry( struct net
  static int takedown_proc_entry( struct net_device *dev,
                                struct airo_info *apriv );
  
 +static int cmdreset(struct airo_info *ai);
 +static int setflashmode (struct airo_info *ai);
 +static int flashgchar(struct airo_info *ai,int matchbyte,int dwelltime);
 +static int flashputbuf(struct airo_info *ai);
 +static int flashrestart(struct airo_info *ai,struct net_device *dev);
 +
  #ifdef MICSUPPORT
  /***********************************************************************
   *                              MIC ROUTINES                           *
@@@ -1240,11 -1234,10 +1240,11 @@@
  
  static int RxSeqValid (struct airo_info *ai,miccntx *context,int mcast,u32 micSeq);
  static void MoveWindow(miccntx *context, u32 micSeq);
 -void emmh32_setseed(emmh32_context *context, u8 *pkey, int keylen, struct crypto_tfm *);
 -void emmh32_init(emmh32_context *context);
 -void emmh32_update(emmh32_context *context, u8 *pOctets, int len);
 -void emmh32_final(emmh32_context *context, u8 digest[4]);
 +static void emmh32_setseed(emmh32_context *context, u8 *pkey, int keylen, struct crypto_tfm *);
 +static void emmh32_init(emmh32_context *context);
 +static void emmh32_update(emmh32_context *context, u8 *pOctets, int len);
 +static void emmh32_final(emmh32_context *context, u8 digest[4]);
 +static int flashpchar(struct airo_info *ai,int byte,int dwelltime);
  
  /* micinit - Initialize mic seed */
  
@@@ -1322,7 -1315,7 +1322,7 @@@ static int micsetup(struct airo_info *a
        return SUCCESS;
  }
  
 -char micsnap[]= {0xAA,0xAA,0x03,0x00,0x40,0x96,0x00,0x02};
 +static char micsnap[] = {0xAA,0xAA,0x03,0x00,0x40,0x96,0x00,0x02};
  
  /*===========================================================================
   * Description: Mic a packet
@@@ -1577,7 -1570,7 +1577,7 @@@ static void MoveWindow(miccntx *context
  static unsigned char aes_counter[16];
  
  /* expand the key to fill the MMH coefficient array */
 -void emmh32_setseed(emmh32_context *context, u8 *pkey, int keylen, struct crypto_tfm *tfm)
 +static void emmh32_setseed(emmh32_context *context, u8 *pkey, int keylen, struct crypto_tfm *tfm)
  {
    /* take the keying material, expand if necessary, truncate at 16-bytes */
    /* run through AES counter mode to generate context->coeff[] */
@@@ -1609,7 -1602,7 +1609,7 @@@
  }
  
  /* prepare for calculation of a new mic */
 -void emmh32_init(emmh32_context *context)
 +static void emmh32_init(emmh32_context *context)
  {
        /* prepare for new mic calculation */
        context->accum = 0;
@@@ -1617,7 -1610,7 +1617,7 @@@
  }
  
  /* add some bytes to the mic calculation */
 -void emmh32_update(emmh32_context *context, u8 *pOctets, int len)
 +static void emmh32_update(emmh32_context *context, u8 *pOctets, int len)
  {
        int     coeff_position, byte_position;
    
@@@ -1659,7 -1652,7 +1659,7 @@@
  static u32 mask32[4] = { 0x00000000L, 0xFF000000L, 0xFFFF0000L, 0xFFFFFF00L };
  
  /* calculate the mic */
 -void emmh32_final(emmh32_context *context, u8 digest[4])
 +static void emmh32_final(emmh32_context *context, u8 digest[4])
  {
        int     coeff_position, byte_position;
        u32     val;
@@@ -2262,7 -2255,7 +2262,7 @@@ static void airo_read_stats(struct airo
        ai->stats.rx_fifo_errors = vals[0];
  }
  
 -struct net_device_stats *airo_get_stats(struct net_device *dev)
 +static struct net_device_stats *airo_get_stats(struct net_device *dev)
  {
        struct airo_info *local =  dev->priv;
  
@@@ -2421,7 -2414,7 +2421,7 @@@ EXPORT_SYMBOL(stop_airo_card)
  
  static int add_airo_dev( struct net_device *dev );
  
 -int wll_header_parse(struct sk_buff *skb, unsigned char *haddr)
 +static int wll_header_parse(struct sk_buff *skb, unsigned char *haddr)
  {
        memcpy(haddr, skb->mac.raw + 10, ETH_ALEN);
        return ETH_ALEN;
@@@ -2688,7 -2681,7 +2688,7 @@@ static struct net_device *init_wifidev(
        return dev;
  }
  
 -int reset_card( struct net_device *dev , int lock) {
 +static int reset_card( struct net_device *dev , int lock) {
        struct airo_info *ai = dev->priv;
  
        if (lock && down_interruptible(&ai->sem))
@@@ -2703,9 -2696,9 +2703,9 @@@
        return 0;
  }
  
 -struct net_device *_init_airo_card( unsigned short irq, int port,
 -                                  int is_pcmcia, struct pci_dev *pci,
 -                                  struct device *dmdev )
 +static struct net_device *_init_airo_card( unsigned short irq, int port,
 +                                         int is_pcmcia, struct pci_dev *pci,
 +                                         struct device *dmdev )
  {
        struct net_device *dev;
        struct airo_info *ai;
@@@ -5020,7 -5013,7 +5020,7 @@@ static void proc_SSID_on_close( struct 
        enable_MAC(ai, &rsp, 1);
  }
  
- inline static u8 hexVal(char c) {
+ static inline u8 hexVal(char c) {
        if (c>='0' && c<='9') return c -= '0';
        if (c>='a' && c<='f') return c -= 'a'-10;
        if (c>='A' && c<='F') return c -= 'A'-10;
@@@ -7242,7 -7235,7 +7242,7 @@@ static void airo_read_wireless_stats(st
        local->wstats.miss.beacon = vals[34];
  }
  
 -struct iw_statistics *airo_get_wireless_stats(struct net_device *dev)
 +static struct iw_statistics *airo_get_wireless_stats(struct net_device *dev)
  {
        struct airo_info *local =  dev->priv;
  
@@@ -7457,8 -7450,14 +7457,8 @@@ static int writerids(struct net_device 
   * Flash command switch table
   */
  
 -int flashcard(struct net_device *dev, aironet_ioctl *comp) {
 +static int flashcard(struct net_device *dev, aironet_ioctl *comp) {
        int z;
 -      int cmdreset(struct airo_info *);
 -      int setflashmode(struct airo_info *);
 -      int flashgchar(struct airo_info *,int,int);
 -      int flashpchar(struct airo_info *,int,int);
 -      int flashputbuf(struct airo_info *);
 -      int flashrestart(struct airo_info *,struct net_device *);
  
        /* Only super-user can modify flash */
        if (!capable(CAP_NET_ADMIN))
@@@ -7516,7 -7515,7 +7516,7 @@@
   * card.
   */
  
 -int cmdreset(struct airo_info *ai) {
 +static int cmdreset(struct airo_info *ai) {
        disable_MAC(ai, 1);
  
        if(!waitbusy (ai)){
@@@ -7540,7 -7539,7 +7540,7 @@@
   * mode
   */
  
 -int setflashmode (struct airo_info *ai) {
 +static int setflashmode (struct airo_info *ai) {
        set_bit (FLAG_FLASHING, &ai->flags);
  
        OUT4500(ai, SWS0, FLASH_COMMAND);
@@@ -7567,7 -7566,7 +7567,7 @@@
   * x 50us for  echo .
   */
  
 -int flashpchar(struct airo_info *ai,int byte,int dwelltime) {
 +static int flashpchar(struct airo_info *ai,int byte,int dwelltime) {
        int echo;
        int waittime;
  
@@@ -7607,7 -7606,7 +7607,7 @@@
   * Get a character from the card matching matchbyte
   * Step 3)
   */
 -int flashgchar(struct airo_info *ai,int matchbyte,int dwelltime){
 +static int flashgchar(struct airo_info *ai,int matchbyte,int dwelltime){
        int           rchar;
        unsigned char rbyte=0;
  
@@@ -7638,7 -7637,7 +7638,7 @@@
   * send to the card
   */
  
 -int flashputbuf(struct airo_info *ai){
 +static int flashputbuf(struct airo_info *ai){
        int            nwords;
  
        /* Write stuff */
@@@ -7660,7 -7659,7 +7660,7 @@@
  /*
   *
   */
 -int flashrestart(struct airo_info *ai,struct net_device *dev){
 +static int flashrestart(struct airo_info *ai,struct net_device *dev){
        int    i,status;
  
        ssleep(1);                      /* Added 12/7/00 */