Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next

3 files changed, 4 insertions, 11 deletions

diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index 44a82c6c60a7..e43702f33b62 100644
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -2236,9 +2236,9 @@ static DEFINE_PCI_DEVICE_TABLE(efx_pci_table) = {
         {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE,
                     PCI_DEVICE_ID_SOLARFLARE_SFC4000B),
          .driver_data = (unsigned long) &falcon_b0_nic_type},
-        {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, BETHPAGE_A_P_DEVID),
+        {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x0803),  /* SFC9020 */
          .driver_data = (unsigned long) &siena_a0_nic_type},
-        {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, SIENA_A_P_DEVID),
+        {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x0813),  /* SFL9021 */
          .driver_data = (unsigned long) &siena_a0_nic_type},
         {0}                     /* end of list */
 };
diff --git a/drivers/net/ethernet/sfc/efx.h b/drivers/net/ethernet/sfc/efx.h
index 4764793ed234..8a5336d86a12 100644
--- a/drivers/net/ethernet/sfc/efx.h
+++ b/drivers/net/ethernet/sfc/efx.h
@@ -14,10 +14,6 @@
 #include "net_driver.h"
 #include "filter.h"
 
-/* PCI IDs */
-#define BETHPAGE_A_P_DEVID      0x0803
-#define SIENA_A_P_DEVID         0x0813
-
 /* Solarstorm controllers use BAR 0 for I/O space and BAR 2(&3) for memory */
 #define EFX_MEM_BAR 2
 
diff --git a/drivers/net/ethernet/sfc/rx.c b/drivers/net/ethernet/sfc/rx.c
index 955b14956deb..aca349861767 100644
--- a/drivers/net/ethernet/sfc/rx.c
+++ b/drivers/net/ethernet/sfc/rx.c
@@ -479,11 +479,8 @@ static void efx_rx_packet_gro(struct efx_channel *channel,
                 if (efx->net_dev->features & NETIF_F_RXHASH)
                         skb->rxhash = efx_rx_buf_hash(eh);
 
-                skb_frag_set_page(skb, 0, page);
-                skb_shinfo(skb)->frags[0].page_offset =
-                        efx_rx_buf_offset(efx, rx_buf);
-                skb_frag_size_set(&skb_shinfo(skb)->frags[0], rx_buf->len);
-                skb_shinfo(skb)->nr_frags = 1;
+                skb_fill_page_desc(skb, 0, page,
+                                   efx_rx_buf_offset(efx, rx_buf), rx_buf->len);
 
                 skb->len = rx_buf->len;
                 skb->data_len = rx_buf->len;