3 files changed, 8 insertions, 5 deletions

diff --git a/drivers/scsi/bnx2fc/Kconfig b/drivers/scsi/bnx2fc/Kconfig
index 6a38080e35e..cfcad8bde7c 100644
--- a/drivers/scsi/bnx2fc/Kconfig
+++ b/drivers/scsi/bnx2fc/Kconfig
@@ -2,7 +2,8 @@ config SCSI_BNX2X_FCOE
         tristate "Broadcom NetXtreme II FCoE support"
         depends on PCI
         select NETDEVICES
-        select NETDEV_1000
+        select ETHERNET
+        select NET_VENDOR_BROADCOM
         select LIBFC
         select LIBFCOE
         select CNIC
diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
index d882a2d1aac..63de1c7cd0c 100644
--- a/drivers/scsi/bnx2fc/bnx2fc.h
+++ b/drivers/scsi/bnx2fc/bnx2fc.h
@@ -58,7 +58,7 @@
 
 #include "57xx_hsi_bnx2fc.h"
 #include "bnx2fc_debug.h"
-#include "../../net/cnic_if.h"
+#include "../../net/ethernet/broadcom/cnic_if.h"
 #include "bnx2fc_constants.h"
 
 #define BNX2FC_NAME             "bnx2fc"
@@ -81,7 +81,7 @@
 #define BNX2FC_RQ_WQES_MAX      16
 #define BNX2FC_CQ_WQES_MAX      (BNX2FC_SQ_WQES_MAX + BNX2FC_RQ_WQES_MAX)
 
-#define BNX2FC_NUM_MAX_SESS     128
+#define BNX2FC_NUM_MAX_SESS     1024
 #define BNX2FC_NUM_MAX_SESS_LOG (ilog2(BNX2FC_NUM_MAX_SESS))
 
 #define BNX2FC_MAX_OUTSTANDING_CMNDS    2048
diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index ba7ecb152a3..85bcc4b5596 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -322,7 +322,7 @@ static int bnx2fc_xmit(struct fc_lport *lport, struct fc_frame *fp)
                         return -ENOMEM;
                 }
                 frag = &skb_shinfo(skb)->frags[skb_shinfo(skb)->nr_frags - 1];
-                cp = kmap_atomic(frag->page, KM_SKB_DATA_SOFTIRQ)
+                cp = kmap_atomic(skb_frag_page(frag), KM_SKB_DATA_SOFTIRQ)
                                 + frag->page_offset;
         } else {
                 cp = (struct fcoe_crc_eof *)skb_put(skb, tlen);
@@ -701,7 +701,7 @@ static void bnx2fc_link_speed_update(struct fc_lport *lport)
         struct net_device *netdev = interface->netdev;
         struct ethtool_cmd ecmd;
 
-        if (!dev_ethtool_get_settings(netdev, &ecmd)) {
+        if (!__ethtool_get_settings(netdev, &ecmd)) {
                 lport->link_supported_speeds &=
                         ~(FC_PORTSPEED_1GBIT | FC_PORTSPEED_10GBIT);
                 if (ecmd.supported & (SUPPORTED_1000baseT_Half |
@@ -1063,9 +1063,11 @@ static int bnx2fc_vport_create(struct fc_vport *vport, bool disabled)
                         "this interface\n");
                 return -EIO;
         }
+        rtnl_lock();
         mutex_lock(&bnx2fc_dev_lock);
         vn_port = bnx2fc_if_create(interface, &vport->dev, 1);
         mutex_unlock(&bnx2fc_dev_lock);
+        rtnl_unlock();
 
         if (IS_ERR(vn_port)) {
                 printk(KERN_ERR PFX "bnx2fc_vport_create (%s) failed\n",