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

2 files changed, 11 insertions, 11 deletions

diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index f01b9b44e8aa..54c870b8c328 100644
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -309,10 +309,10 @@ static int fcoe_interface_setup(struct fcoe_interface *fcoe,
          * for multiple unicast MACs.
          */
         memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN);
-        dev_unicast_add(netdev, flogi_maddr);
+        dev_uc_add(netdev, flogi_maddr);
         if (fip->spma)
-                dev_unicast_add(netdev, fip->ctl_src_addr);
-        dev_mc_add(netdev, FIP_ALL_ENODE_MACS, ETH_ALEN, 0);
+                dev_uc_add(netdev, fip->ctl_src_addr);
+        dev_mc_add(netdev, FIP_ALL_ENODE_MACS);
 
         /*
          * setup the receive function from ethernet driver
@@ -395,10 +395,10 @@ void fcoe_interface_cleanup(struct fcoe_interface *fcoe)
 
         /* Delete secondary MAC addresses */
         memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN);
-        dev_unicast_delete(netdev, flogi_maddr);
+        dev_uc_del(netdev, flogi_maddr);
         if (fip->spma)
-                dev_unicast_delete(netdev, fip->ctl_src_addr);
-        dev_mc_delete(netdev, FIP_ALL_ENODE_MACS, ETH_ALEN, 0);
+                dev_uc_del(netdev, fip->ctl_src_addr);
+        dev_mc_del(netdev, FIP_ALL_ENODE_MACS);
 
         /* Tell the LLD we are done w/ FCoE */
         ops = netdev->netdev_ops;
@@ -491,9 +491,9 @@ static void fcoe_update_src_mac(struct fc_lport *lport, u8 *addr)
 
         rtnl_lock();
         if (!is_zero_ether_addr(port->data_src_addr))
-                dev_unicast_delete(fcoe->netdev, port->data_src_addr);
+                dev_uc_del(fcoe->netdev, port->data_src_addr);
         if (!is_zero_ether_addr(addr))
-                dev_unicast_add(fcoe->netdev, addr);
+                dev_uc_add(fcoe->netdev, addr);
         memcpy(port->data_src_addr, addr, ETH_ALEN);
         rtnl_unlock();
 }
@@ -820,7 +820,7 @@ static void fcoe_if_destroy(struct fc_lport *lport)
 
         rtnl_lock();
         if (!is_zero_ether_addr(port->data_src_addr))
-                dev_unicast_delete(netdev, port->data_src_addr);
+                dev_uc_del(netdev, port->data_src_addr);
         rtnl_unlock();
 
         /* receives may not be stopped until after this */
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index 02143af7c1af..9eae04afa9a0 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -599,9 +599,9 @@ static void iscsi_sw_tcp_conn_stop(struct iscsi_cls_conn *cls_conn, int flag)
         set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_rx);
         write_unlock_bh(&tcp_sw_conn->sock->sk->sk_callback_lock);
 
-        if (sock->sk->sk_sleep) {
+        if (sk_sleep(sock->sk) && waitqueue_active(sk_sleep(sock->sk))) {
                 sock->sk->sk_err = EIO;
-                wake_up_interruptible(sock->sk->sk_sleep);
+                wake_up_interruptible(sk_sleep(sock->sk));
         }
 
         iscsi_conn_stop(cls_conn, flag);