Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4721d221 authored by David S. Miller's avatar David S. Miller
Browse files

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

parents 220b07e9 70350b06

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -5910,7 +5910,6 @@ F: drivers/net/ethernet/emulex/benet/ 


SFC NETWORK DRIVER

M:	Solarflare linux maintainers <linux-net-drivers@solarflare.com>

M:	Steve Hodgson <shodgson@solarflare.com>

M:	Ben Hutchings <bhutchings@solarflare.com>

L:	netdev@vger.kernel.org

S:	Supported

drivers/net/ethernet/sfc/efx.c

+2 −2
Original line number Diff line number Diff line
@@ -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 */

};

drivers/net/ethernet/sfc/efx.h

+0 −4
Original line number Diff line number Diff line
@@ -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

drivers/net/ethernet/sfc/rx.c

+2 −5
Original line number Diff line number Diff line
@@ -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;