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

Commit 4c844d97 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-2.6

parents 66ee33bf c5e129ac

drivers/net/sfc/efx.c

+17 −3
Original line number Diff line number Diff line
@@ -1874,6 +1874,17 @@ static void efx_set_multicast_list(struct net_device *net_dev) 
	/* Otherwise efx_start_port() will do this */

}



static int efx_set_features(struct net_device *net_dev, u32 data)

{

	struct efx_nic *efx = netdev_priv(net_dev);



	/* If disabling RX n-tuple filtering, clear existing filters */

	if (net_dev->features & ~data & NETIF_F_NTUPLE)

		efx_filter_clear_rx(efx, EFX_FILTER_PRI_MANUAL);



	return 0;

}



static const struct net_device_ops efx_netdev_ops = {

	.ndo_open		= efx_net_open,

	.ndo_stop		= efx_net_stop,
@@ -1885,6 +1896,7 @@ static const struct net_device_ops efx_netdev_ops = { 
	.ndo_change_mtu		= efx_change_mtu,

	.ndo_set_mac_address	= efx_set_mac_address,

	.ndo_set_multicast_list = efx_set_multicast_list,

	.ndo_set_features	= efx_set_features,

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller = efx_netpoll,

#endif
@@ -2269,7 +2281,6 @@ static int efx_init_struct(struct efx_nic *efx, struct efx_nic_type *type, 
	strlcpy(efx->name, pci_name(pci_dev), sizeof(efx->name));



	efx->net_dev = net_dev;

	efx->rx_checksum_enabled = true;

	spin_lock_init(&efx->stats_lock);

	mutex_init(&efx->mac_lock);

	efx->mac_op = type->default_mac_ops;
@@ -2452,12 +2463,15 @@ static int __devinit efx_pci_probe(struct pci_dev *pci_dev, 
		return -ENOMEM;

	net_dev->features |= (type->offload_features | NETIF_F_SG |

			      NETIF_F_HIGHDMA | NETIF_F_TSO |

			      NETIF_F_GRO);

			      NETIF_F_RXCSUM);

	if (type->offload_features & NETIF_F_V6_CSUM)

		net_dev->features |= NETIF_F_TSO6;

	/* Mask for features that also apply to VLAN devices */

	net_dev->vlan_features |= (NETIF_F_ALL_CSUM | NETIF_F_SG |

				   NETIF_F_HIGHDMA | NETIF_F_TSO);

				   NETIF_F_HIGHDMA | NETIF_F_ALL_TSO |

				   NETIF_F_RXCSUM);

	/* All offloads can be toggled */

	net_dev->hw_features = net_dev->features & ~NETIF_F_HIGHDMA;

	efx = netdev_priv(net_dev);

	pci_set_drvdata(pci_dev, efx);

	SET_NETDEV_DEV(net_dev, &pci_dev->dev);

drivers/net/sfc/ethtool.c

+18 −88
Original line number Diff line number Diff line
@@ -178,19 +178,27 @@ static struct efx_ethtool_stat efx_ethtool_stats[] = { 
 */



/* Identify device by flashing LEDs */

static int efx_ethtool_phys_id(struct net_device *net_dev, u32 count)

static int efx_ethtool_phys_id(struct net_device *net_dev,

			       enum ethtool_phys_id_state state)

{

	struct efx_nic *efx = netdev_priv(net_dev);

	enum efx_led_mode mode;



	do {

		efx->type->set_id_led(efx, EFX_LED_ON);

		schedule_timeout_interruptible(HZ / 2);



		efx->type->set_id_led(efx, EFX_LED_OFF);

		schedule_timeout_interruptible(HZ / 2);

	} while (!signal_pending(current) && --count != 0);

	switch (state) {

	case ETHTOOL_ID_ON:

		mode = EFX_LED_ON;

		break;

	case ETHTOOL_ID_OFF:

		mode = EFX_LED_OFF;

		break;

	case ETHTOOL_ID_INACTIVE:

		mode = EFX_LED_DEFAULT;

		break;

	default:

		return -EINVAL;

	}



	efx->type->set_id_led(efx, EFX_LED_DEFAULT);

	efx->type->set_id_led(efx, mode);

	return 0;

}
@@ -518,72 +526,6 @@ static void efx_ethtool_get_stats(struct net_device *net_dev, 
	}

}



static int efx_ethtool_set_tso(struct net_device *net_dev, u32 enable)

{

	struct efx_nic *efx __attribute__ ((unused)) = netdev_priv(net_dev);

	u32 features;



	features = NETIF_F_TSO;

	if (efx->type->offload_features & NETIF_F_V6_CSUM)

		features |= NETIF_F_TSO6;



	if (enable)

		net_dev->features |= features;

	else

		net_dev->features &= ~features;



	return 0;

}



static int efx_ethtool_set_tx_csum(struct net_device *net_dev, u32 enable)

{

	struct efx_nic *efx = netdev_priv(net_dev);

	u32 features = efx->type->offload_features & NETIF_F_ALL_CSUM;



	if (enable)

		net_dev->features |= features;

	else

		net_dev->features &= ~features;



	return 0;

}



static int efx_ethtool_set_rx_csum(struct net_device *net_dev, u32 enable)

{

	struct efx_nic *efx = netdev_priv(net_dev);



	/* No way to stop the hardware doing the checks; we just

	 * ignore the result.

	 */

	efx->rx_checksum_enabled = !!enable;



	return 0;

}



static u32 efx_ethtool_get_rx_csum(struct net_device *net_dev)

{

	struct efx_nic *efx = netdev_priv(net_dev);



	return efx->rx_checksum_enabled;

}



static int efx_ethtool_set_flags(struct net_device *net_dev, u32 data)

{

	struct efx_nic *efx = netdev_priv(net_dev);

	u32 supported = (efx->type->offload_features &

			 (ETH_FLAG_RXHASH | ETH_FLAG_NTUPLE));

	int rc;



	rc = ethtool_op_set_flags(net_dev, data, supported);

	if (rc)

		return rc;



	if (!(data & ETH_FLAG_NTUPLE))

		efx_filter_clear_rx(efx, EFX_FILTER_PRI_MANUAL);



	return 0;

}



static void efx_ethtool_self_test(struct net_device *net_dev,

				  struct ethtool_test *test, u64 *data)

{
@@ -1070,22 +1012,10 @@ const struct ethtool_ops efx_ethtool_ops = { 
	.set_ringparam		= efx_ethtool_set_ringparam,

	.get_pauseparam         = efx_ethtool_get_pauseparam,

	.set_pauseparam         = efx_ethtool_set_pauseparam,

	.get_rx_csum		= efx_ethtool_get_rx_csum,

	.set_rx_csum		= efx_ethtool_set_rx_csum,

	.get_tx_csum		= ethtool_op_get_tx_csum,

	/* Need to enable/disable IPv6 too */

	.set_tx_csum		= efx_ethtool_set_tx_csum,

	.get_sg			= ethtool_op_get_sg,

	.set_sg			= ethtool_op_set_sg,

	.get_tso		= ethtool_op_get_tso,

	/* Need to enable/disable TSO-IPv6 too */

	.set_tso		= efx_ethtool_set_tso,

	.get_flags		= ethtool_op_get_flags,

	.set_flags		= efx_ethtool_set_flags,

	.get_sset_count		= efx_ethtool_get_sset_count,

	.self_test		= efx_ethtool_self_test,

	.get_strings		= efx_ethtool_get_strings,

	.phys_id		= efx_ethtool_phys_id,

	.set_phys_id		= efx_ethtool_phys_id,

	.get_ethtool_stats	= efx_ethtool_get_stats,

	.get_wol                = efx_ethtool_get_wol,

	.set_wol                = efx_ethtool_set_wol,

drivers/net/sfc/net_driver.h

+0 −2
Original line number Diff line number Diff line
@@ -681,7 +681,6 @@ struct efx_filter_state; 
 * @port_inhibited: If set, the netif_carrier is always off. Hold the mac_lock

 * @port_initialized: Port initialized?

 * @net_dev: Operating system network device. Consider holding the rtnl lock

 * @rx_checksum_enabled: RX checksumming enabled

 * @stats_buffer: DMA buffer for statistics

 * @mac_op: MAC interface

 * @phy_type: PHY type
@@ -771,7 +770,6 @@ struct efx_nic { 


	bool port_initialized;

	struct net_device *net_dev;

	bool rx_checksum_enabled;



	struct efx_buffer stats_buffer;

drivers/net/sfc/nic.c

+2 −4
Original line number Diff line number Diff line
@@ -850,7 +850,6 @@ efx_handle_rx_event(struct efx_channel *channel, const efx_qword_t *event) 
	unsigned expected_ptr;

	bool rx_ev_pkt_ok, discard = false, checksummed;

	struct efx_rx_queue *rx_queue;

	struct efx_nic *efx = channel->efx;



	/* Basic packet information */

	rx_ev_byte_cnt = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_BYTE_CNT);
@@ -873,9 +872,8 @@ efx_handle_rx_event(struct efx_channel *channel, const efx_qword_t *event) 
		 * UDP/IP, then we can rely on the hardware checksum.

		 */

		checksummed =

			likely(efx->rx_checksum_enabled) &&

			(rx_ev_hdr_type == FSE_CZ_RX_EV_HDR_TYPE_IPV4V6_TCP ||

			 rx_ev_hdr_type == FSE_CZ_RX_EV_HDR_TYPE_IPV4V6_UDP);

			rx_ev_hdr_type == FSE_CZ_RX_EV_HDR_TYPE_IPV4V6_TCP ||

			rx_ev_hdr_type == FSE_CZ_RX_EV_HDR_TYPE_IPV4V6_UDP;

	} else {

		efx_handle_rx_not_ok(rx_queue, event, &rx_ev_pkt_ok, &discard);

		checksummed = false;

drivers/net/sfc/rx.c

+3 −0
Original line number Diff line number Diff line
@@ -605,6 +605,9 @@ void __efx_rx_packet(struct efx_channel *channel, 
		skb_record_rx_queue(skb, channel->channel);

	}



	if (unlikely(!(efx->net_dev->features & NETIF_F_RXCSUM)))

		checksummed = false;



	if (likely(checksummed || rx_buf->is_page)) {

		efx_rx_packet_gro(channel, rx_buf, eh, checksummed);

		return;