Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1674 commits)
  qlcnic: adding co maintainer
  ixgbe: add support for active DA cables
  ixgbe: dcb, do not tag tc_prio_control frames
  ixgbe: fix ixgbe_tx_is_paused logic
  ixgbe: always enable vlan strip/insert when DCB is enabled
  ixgbe: remove some redundant code in setting FCoE FIP filter
  ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp
  ixgbe: fix header len when unsplit packet overflows to data buffer
  ipv6: Never schedule DAD timer on dead address
  ipv6: Use POSTDAD state
  ipv6: Use state_lock to protect ifa state
  ipv6: Replace inet6_ifaddr->dead with state
  cxgb4: notify upper drivers if the device is already up when they load
  cxgb4: keep interrupts available when the ports are brought down
  cxgb4: fix initial addition of MAC address
  cnic: Return SPQ credit to bnx2x after ring setup and shutdown.
  cnic: Convert cnic_local_flags to atomic ops.
  can: Fix SJA1000 command register writes on SMP systems
  bridge: fix build for CONFIG_SYSFS disabled
  ARCNET: Limit com20020 PCI ID matches for SOHARD cards
  ...

Fix up various conflicts with pcmcia tree drivers/net/
{pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and
wireless/orinoco/spectrum_cs.c} and feature removal
(Documentation/feature-removal-schedule.txt).

Also fix a non-content conflict due to pm_qos_requirement getting
renamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c

1 files changed, 36 insertions, 38 deletions

diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ps3_gelic_wireless.c
index 369a8016b1ff..43b8d7797f0a 100644
--- a/drivers/net/ps3_gelic_wireless.c
+++ b/drivers/net/ps3_gelic_wireless.c
@@ -301,7 +301,6 @@ static void gelic_wl_get_ch_info(struct gelic_wl_info *wl)
                         /* 16 bits of MSB has available channels */
                         wl->ch_info = ch_info_raw >> 48;
         }
-        return;
 }
 
 /* SIOGIWRANGE */
@@ -528,7 +527,7 @@ static void gelic_wl_parse_ie(u8 *data, size_t len,
         u8 item_len;
         u8 item_id;
 
-        pr_debug("%s: data=%p len=%ld \n", __func__,
+        pr_debug("%s: data=%p len=%ld\n", __func__,
                  data, len);
         memset(ie_info, 0, sizeof(struct ie_info));
 
@@ -897,7 +896,7 @@ static int gelic_wl_set_auth(struct net_device *netdev,
         default:
                 ret = -EOPNOTSUPP;
                 break;
-        };
+        }
 
         if (!ret)
                 set_bit(GELIC_WL_STAT_CONFIGURED, &wl->stat);
@@ -979,7 +978,7 @@ static int gelic_wl_set_essid(struct net_device *netdev,
                 pr_debug("%s: essid = '%s'\n", __func__, extra);
                 set_bit(GELIC_WL_STAT_ESSID_SET, &wl->stat);
         } else {
-                pr_debug("%s: ESSID any \n", __func__);
+                pr_debug("%s: ESSID any\n", __func__);
                 clear_bit(GELIC_WL_STAT_ESSID_SET, &wl->stat);
         }
         set_bit(GELIC_WL_STAT_CONFIGURED, &wl->stat);
@@ -987,7 +986,7 @@ static int gelic_wl_set_essid(struct net_device *netdev,
 
 
         gelic_wl_try_associate(netdev); /* FIXME */
-        pr_debug("%s: -> \n", __func__);
+        pr_debug("%s: ->\n", __func__);
         return 0;
 }
 
@@ -998,7 +997,7 @@ static int gelic_wl_get_essid(struct net_device *netdev,
         struct gelic_wl_info *wl = port_wl(netdev_priv(netdev));
         unsigned long irqflag;
 
-        pr_debug("%s: <- \n", __func__);
+        pr_debug("%s: <-\n", __func__);
         mutex_lock(&wl->assoc_stat_lock);
         spin_lock_irqsave(&wl->lock, irqflag);
         if (test_bit(GELIC_WL_STAT_ESSID_SET, &wl->stat) ||
@@ -1011,7 +1010,7 @@ static int gelic_wl_get_essid(struct net_device *netdev,
 
         mutex_unlock(&wl->assoc_stat_lock);
         spin_unlock_irqrestore(&wl->lock, irqflag);
-        pr_debug("%s: -> len=%d \n", __func__, data->essid.length);
+        pr_debug("%s: -> len=%d\n", __func__, data->essid.length);
 
         return 0;
 }
@@ -1028,7 +1027,7 @@ static int gelic_wl_set_encode(struct net_device *netdev,
         int key_index, index_specified;
         int ret = 0;
 
-        pr_debug("%s: <- \n", __func__);
+        pr_debug("%s: <-\n", __func__);
         flags = enc->flags & IW_ENCODE_FLAGS;
         key_index = enc->flags & IW_ENCODE_INDEX;
 
@@ -1087,7 +1086,7 @@ static int gelic_wl_set_encode(struct net_device *netdev,
         set_bit(GELIC_WL_STAT_CONFIGURED, &wl->stat);
 done:
         spin_unlock_irqrestore(&wl->lock, irqflag);
-        pr_debug("%s: -> \n", __func__);
+        pr_debug("%s: ->\n", __func__);
         return ret;
 }
 
@@ -1101,7 +1100,7 @@ static int gelic_wl_get_encode(struct net_device *netdev,
         unsigned int key_index, index_specified;
         int ret = 0;
 
-        pr_debug("%s: <- \n", __func__);
+        pr_debug("%s: <-\n", __func__);
         key_index = enc->flags & IW_ENCODE_INDEX;
         pr_debug("%s: flag=%#x point=%p len=%d extra=%p\n", __func__,
                  enc->flags, enc->pointer, enc->length, extra);
@@ -1215,7 +1214,7 @@ static int gelic_wl_set_encodeext(struct net_device *netdev,
         int key_index;
         int ret = 0;
 
-        pr_debug("%s: <- \n", __func__);
+        pr_debug("%s: <-\n", __func__);
         flags = enc->flags & IW_ENCODE_FLAGS;
         alg = ext->alg;
         key_index = enc->flags & IW_ENCODE_INDEX;
@@ -1288,7 +1287,7 @@ static int gelic_wl_set_encodeext(struct net_device *netdev,
         }
 done:
         spin_unlock_irqrestore(&wl->lock, irqflag);
-        pr_debug("%s: -> \n", __func__);
+        pr_debug("%s: ->\n", __func__);
         return ret;
 }
 
@@ -1304,7 +1303,7 @@ static int gelic_wl_get_encodeext(struct net_device *netdev,
         int ret = 0;
         int max_key_len;
 
-        pr_debug("%s: <- \n", __func__);
+        pr_debug("%s: <-\n", __func__);
 
         max_key_len = enc->length - sizeof(struct iw_encode_ext);
         if (max_key_len < 0)
@@ -1359,7 +1358,7 @@ static int gelic_wl_get_encodeext(struct net_device *netdev,
         }
 out:
         spin_unlock_irqrestore(&wl->lock, irqflag);
-        pr_debug("%s: -> \n", __func__);
+        pr_debug("%s: ->\n", __func__);
         return ret;
 }
 /* SIOC{S,G}IWMODE */
@@ -1370,7 +1369,7 @@ static int gelic_wl_set_mode(struct net_device *netdev,
         __u32 mode = data->mode;
         int ret;
 
-        pr_debug("%s: <- \n", __func__);
+        pr_debug("%s: <-\n", __func__);
         if (mode == IW_MODE_INFRA)
                 ret = 0;
         else
@@ -1384,7 +1383,7 @@ static int gelic_wl_get_mode(struct net_device *netdev,
                              union iwreq_data *data, char *extra)
 {
         __u32 *mode = &data->mode;
-        pr_debug("%s: <- \n", __func__);
+        pr_debug("%s: <-\n", __func__);
         *mode = IW_MODE_INFRA;
         pr_debug("%s: ->\n", __func__);
         return 0;
@@ -1992,7 +1991,7 @@ static int gelic_wl_associate_bss(struct gelic_wl_info *wl,
         case GELIC_WL_WPA_LEVEL_WPA2:
                 ret = gelic_wl_do_wpa_setup(wl);
                 break;
-        };
+        }
 
         if (ret) {
                 pr_debug("%s: WEP/WPA setup failed %d\n", __func__,
@@ -2022,7 +2021,7 @@ static int gelic_wl_associate_bss(struct gelic_wl_info *wl,
 
         if (!rc) {
                 /* timeouted.  Maybe key or cyrpt mode is wrong */
-                pr_info("%s: connect timeout \n", __func__);
+                pr_info("%s: connect timeout\n", __func__);
                 cmd = gelic_eurus_sync_cmd(wl, GELIC_EURUS_CMD_DISASSOC,
                                            NULL, 0);
                 kfree(cmd);
@@ -2063,7 +2062,7 @@ static void gelic_wl_connected_event(struct gelic_wl_info *wl,
         }
 
         if (desired_event == event) {
-                pr_debug("%s: completed \n", __func__);
+                pr_debug("%s: completed\n", __func__);
                 complete(&wl->assoc_done);
                 netif_carrier_on(port_to_netdev(wl_port(wl)));
         } else
@@ -2280,26 +2279,25 @@ void gelic_wl_interrupt(struct net_device *netdev, u64 status)
 /*
  * driver helpers
  */
-#define IW_IOCTL(n) [(n) - SIOCSIWCOMMIT]
 static const iw_handler gelic_wl_wext_handler[] =
 {
-        IW_IOCTL(SIOCGIWNAME)           = gelic_wl_get_name,
-        IW_IOCTL(SIOCGIWRANGE)          = gelic_wl_get_range,
-        IW_IOCTL(SIOCSIWSCAN)           = gelic_wl_set_scan,
-        IW_IOCTL(SIOCGIWSCAN)           = gelic_wl_get_scan,
-        IW_IOCTL(SIOCSIWAUTH)           = gelic_wl_set_auth,
-        IW_IOCTL(SIOCGIWAUTH)           = gelic_wl_get_auth,
-        IW_IOCTL(SIOCSIWESSID)          = gelic_wl_set_essid,
-        IW_IOCTL(SIOCGIWESSID)          = gelic_wl_get_essid,
-        IW_IOCTL(SIOCSIWENCODE)         = gelic_wl_set_encode,
-        IW_IOCTL(SIOCGIWENCODE)         = gelic_wl_get_encode,
-        IW_IOCTL(SIOCSIWAP)             = gelic_wl_set_ap,
-        IW_IOCTL(SIOCGIWAP)             = gelic_wl_get_ap,
-        IW_IOCTL(SIOCSIWENCODEEXT)      = gelic_wl_set_encodeext,
-        IW_IOCTL(SIOCGIWENCODEEXT)      = gelic_wl_get_encodeext,
-        IW_IOCTL(SIOCSIWMODE)           = gelic_wl_set_mode,
-        IW_IOCTL(SIOCGIWMODE)           = gelic_wl_get_mode,
-        IW_IOCTL(SIOCGIWNICKN)          = gelic_wl_get_nick,
+        IW_HANDLER(SIOCGIWNAME, gelic_wl_get_name),
+        IW_HANDLER(SIOCGIWRANGE, gelic_wl_get_range),
+        IW_HANDLER(SIOCSIWSCAN, gelic_wl_set_scan),
+        IW_HANDLER(SIOCGIWSCAN, gelic_wl_get_scan),
+        IW_HANDLER(SIOCSIWAUTH, gelic_wl_set_auth),
+        IW_HANDLER(SIOCGIWAUTH, gelic_wl_get_auth),
+        IW_HANDLER(SIOCSIWESSID, gelic_wl_set_essid),
+        IW_HANDLER(SIOCGIWESSID, gelic_wl_get_essid),
+        IW_HANDLER(SIOCSIWENCODE, gelic_wl_set_encode),
+        IW_HANDLER(SIOCGIWENCODE, gelic_wl_get_encode),
+        IW_HANDLER(SIOCSIWAP, gelic_wl_set_ap),
+        IW_HANDLER(SIOCGIWAP, gelic_wl_get_ap),
+        IW_HANDLER(SIOCSIWENCODEEXT, gelic_wl_set_encodeext),
+        IW_HANDLER(SIOCGIWENCODEEXT, gelic_wl_get_encodeext),
+        IW_HANDLER(SIOCSIWMODE, gelic_wl_set_mode),
+        IW_HANDLER(SIOCGIWMODE, gelic_wl_get_mode),
+        IW_HANDLER(SIOCGIWNICKN, gelic_wl_get_nick),
 };
 
 static const struct iw_handler_def gelic_wl_wext_handler_def = {
@@ -2318,7 +2316,7 @@ static struct net_device * __devinit gelic_wl_alloc(struct gelic_card *card)
         pr_debug("%s:start\n", __func__);
         netdev = alloc_etherdev(sizeof(struct gelic_port) +
                                 sizeof(struct gelic_wl_info));
-        pr_debug("%s: netdev =%p card=%p \np", __func__, netdev, card);
+        pr_debug("%s: netdev =%p card=%p\n", __func__, netdev, card);
         if (!netdev)
                 return NULL;