2 files changed, 8 insertions, 5 deletions

diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index 34c8d82b7423..a1c0ddd53aa9 100644
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -1517,7 +1517,7 @@ int fcoe_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);
@@ -2045,7 +2045,7 @@ int fcoe_link_speed_update(struct fc_lport *lport)
         struct net_device *netdev = fcoe_netdev(lport);
         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 |
@@ -2454,7 +2454,9 @@ static int fcoe_vport_create(struct fc_vport *vport, bool disabled)
         }
 
         mutex_lock(&fcoe_config_mutex);
+        rtnl_lock();
         vn_port = fcoe_if_create(fcoe, &vport->dev, 1);
+        rtnl_unlock();
         mutex_unlock(&fcoe_config_mutex);
 
         if (IS_ERR(vn_port)) {
diff --git a/drivers/scsi/fcoe/fcoe_transport.c b/drivers/scsi/fcoe/fcoe_transport.c
index 41068e8748e7..dac8e39a5188 100644
--- a/drivers/scsi/fcoe/fcoe_transport.c
+++ b/drivers/scsi/fcoe/fcoe_transport.c
@@ -105,11 +105,12 @@ u32 fcoe_fc_crc(struct fc_frame *fp)
         for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                 frag = &skb_shinfo(skb)->frags[i];
                 off = frag->page_offset;
-                len = frag->size;
+                len = skb_frag_size(frag);
                 while (len > 0) {
                         clen = min(len, PAGE_SIZE - (off & ~PAGE_MASK));
-                        data = kmap_atomic(frag->page + (off >> PAGE_SHIFT),
-                                           KM_SKB_DATA_SOFTIRQ);
+                        data = kmap_atomic(
+                                skb_frag_page(frag) + (off >> PAGE_SHIFT),
+                                KM_SKB_DATA_SOFTIRQ);
                         crc = crc32(crc, data + (off & ~PAGE_MASK), clen);
                         kunmap_atomic(data, KM_SKB_DATA_SOFTIRQ);
                         off += clen;