Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc...

diff --combined net/core/net-sysfs.c
index cd59ac6,6189dc0..4cbb129
--- 1/net/core/net-sysfs.c
--- 2/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@@ -2,7 -2,7 +2,7 @@@
   * net-sysfs.c - network device class and attributes
   *
   * Copyright (c) 2003 Stephen Hemminger <shemminger@osdl.org>
-  * 
+  *
   *    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
@@@ -23,7 -23,7 +23,7 @@@ static const char fmt_long_hex[] = "%#l
  static const char fmt_dec[] = "%d\n";
  static const char fmt_ulong[] = "%lu\n";
  
- static inline int dev_isalive(const struct net_device *dev) 
+ static inline int dev_isalive(const struct net_device *dev)
  {
        return dev->reg_state <= NETREG_REGISTERED;
  }
@@@ -265,7 -265,7 +265,7 @@@ static ssize_t netstat_show(const struc
  
        read_lock(&dev_base_lock);
        if (dev_isalive(dev) && dev->get_stats &&
-           (stats = (*dev->get_stats)(dev))) 
+           (stats = (*dev->get_stats)(dev)))
                ret = sprintf(buf, fmt_ulong,
                              *(unsigned long *)(((u8 *) stats) + offset));
  
@@@ -340,7 -340,7 +340,7 @@@ static struct attribute_group netstat_g
        .attrs  = netstat_attrs,
  };
  
 -#ifdef WIRELESS_EXT
 +#ifdef CONFIG_WIRELESS_EXT
  /* helper function that does all the locking etc for wireless stats */
  static ssize_t wireless_show(struct device *d, char *buf,
                             ssize_t (*format)(const struct iw_statistics *,
@@@ -349,7 -349,7 +349,7 @@@
        struct net_device *dev = to_net_dev(d);
        const struct iw_statistics *iw = NULL;
        ssize_t ret = -EINVAL;
-       
+ 
        read_lock(&dev_base_lock);
        if (dev_isalive(dev)) {
                if(dev->wireless_handlers &&
@@@ -430,7 -430,7 +430,7 @@@ static int netdev_uevent(struct device 
  #endif
  
  /*
-  *    netdev_release -- destroy and free a dead device. 
+  *    netdev_release -- destroy and free a dead device.
   *    Called when last reference to device kobject is gone.
   */
  static void netdev_release(struct device *d)
@@@ -473,7 -473,7 +473,7 @@@ int netdev_register_sysfs(struct net_de
        if (net->get_stats)
                *groups++ = &netstat_group;
  
 -#ifdef WIRELESS_EXT
 +#ifdef CONFIG_WIRELESS_EXT
        if (net->wireless_handlers && net->wireless_handlers->get_wireless_stats)
                *groups++ = &wireless_group;
  #endif

diff --combined net/ieee80211/ieee80211_tx.c
index 54e0116,c55949e..0292d63
--- 1/net/ieee80211/ieee80211_tx.c
--- 2/net/ieee80211/ieee80211_tx.c
+++ b/net/ieee80211/ieee80211_tx.c
@@@ -54,7 -54,7 +54,7 @@@ Desc. | ctrl | dura |  DA/RA  |   T
        |      | tion | (BSSID) |         |         | ence |  data   |      |
        `--------------------------------------------------|         |------'
  Total: 28 non-data bytes                                 `----.----'
-                                                               |
+                                                             |
         .- 'Frame data' expands, if WEP enabled, to <----------'
         |
         V
@@@ -64,8 -64,8 +64,8 @@@ Bytes |  4  |   0-2296  |  4  
  Desc. | IV  | Encrypted | ICV |
        |     | Packet    |     |
        `-----|           |-----'
-             `-----.-----'
-                   |
+           `-----.-----'
+                 |
         .- 'Encrypted Packet' expands to
         |
         V
@@@ -502,6 -502,9 +502,6 @@@ int ieee80211_xmit(struct sk_buff *skb
                if (host_encrypt)
                        ieee80211_encrypt_fragment(ieee, skb_frag, hdr_len);
                else if (host_build_iv) {
 -                      struct ieee80211_crypt_data *crypt;
 -
 -                      crypt = ieee->crypt[ieee->tx_keyidx];
                        atomic_inc(&crypt->refcnt);
                        if (crypt->ops->build_iv)
                                crypt->ops->build_iv(skb_frag, hdr_len,