Commit 91fcb99c authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sfc-siena-next' 



Martin Habets says:

====================
sfc: Remove Siena bits from sfc.ko

Last year we split off Siena into it's own driver under directory siena.
This patch series removes the now unused Falcon and Siena code from sfc.ko.
No functional changes are intended.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents be923772 3771c878

drivers/net/ethernet/sfc/ef10.c

+1 −3
Original line number Diff line number Diff line
@@ -2209,7 +2209,7 @@ static int efx_ef10_tx_probe(struct efx_tx_queue *tx_queue) 
	/* low two bits of label are what we want for type */

	BUILD_BUG_ON((EFX_TXQ_TYPE_OUTER_CSUM | EFX_TXQ_TYPE_INNER_CSUM) != 3);

	tx_queue->type = tx_queue->label & 3;

	return efx_nic_alloc_buffer(tx_queue->efx, &tx_queue->txd.buf,

	return efx_nic_alloc_buffer(tx_queue->efx, &tx_queue->txd,

				    (tx_queue->ptr_mask + 1) *

				    sizeof(efx_qword_t),

				    GFP_KERNEL);
@@ -4267,8 +4267,6 @@ const struct efx_nic_type efx_hunt_a0_nic_type = { 
	.sriov_init = efx_ef10_sriov_init,

	.sriov_fini = efx_ef10_sriov_fini,

	.sriov_wanted = efx_ef10_sriov_wanted,

	.sriov_reset = efx_ef10_sriov_reset,

	.sriov_flr = efx_ef10_sriov_flr,

	.sriov_set_vf_mac = efx_ef10_sriov_set_vf_mac,

	.sriov_set_vf_vlan = efx_ef10_sriov_set_vf_vlan,

	.sriov_set_vf_spoofchk = efx_ef10_sriov_set_vf_spoofchk,

drivers/net/ethernet/sfc/ef100_nic.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ int efx_ef100_init_datapath_caps(struct efx_nic *efx) 
static int ef100_ev_probe(struct efx_channel *channel)

{

	/* Allocate an extra descriptor for the QMDA status completion entry */

	return efx_nic_alloc_buffer(channel->efx, &channel->eventq.buf,

	return efx_nic_alloc_buffer(channel->efx, &channel->eventq,

				    (channel->eventq_mask + 2) *

				    sizeof(efx_qword_t),

				    GFP_KERNEL);

drivers/net/ethernet/sfc/ef100_tx.c

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
int ef100_tx_probe(struct efx_tx_queue *tx_queue)

{

	/* Allocate an extra descriptor for the QMDA status completion entry */

	return efx_nic_alloc_buffer(tx_queue->efx, &tx_queue->txd.buf,

	return efx_nic_alloc_buffer(tx_queue->efx, &tx_queue->txd,

				    (tx_queue->ptr_mask + 2) *

				    sizeof(efx_oword_t),

				    GFP_KERNEL);
@@ -101,8 +101,8 @@ static bool ef100_tx_can_tso(struct efx_tx_queue *tx_queue, struct sk_buff *skb) 


static efx_oword_t *ef100_tx_desc(struct efx_tx_queue *tx_queue, unsigned int index)

{

	if (likely(tx_queue->txd.buf.addr))

		return ((efx_oword_t *)tx_queue->txd.buf.addr) + index;

	if (likely(tx_queue->txd.addr))

		return ((efx_oword_t *)tx_queue->txd.addr) + index;

	else

		return NULL;

}

drivers/net/ethernet/sfc/ef10_sriov.h

+0 −2
Original line number Diff line number Diff line
@@ -35,9 +35,7 @@ static inline bool efx_ef10_sriov_wanted(struct efx_nic *efx) 


int efx_ef10_sriov_configure(struct efx_nic *efx, int num_vfs);

int efx_ef10_sriov_init(struct efx_nic *efx);

static inline void efx_ef10_sriov_reset(struct efx_nic *efx) {}

void efx_ef10_sriov_fini(struct efx_nic *efx);

static inline void efx_ef10_sriov_flr(struct efx_nic *efx, unsigned vf_i) {}



int efx_ef10_sriov_set_vf_mac(struct efx_nic *efx, int vf, const u8 *mac);

drivers/net/ethernet/sfc/efx.c

+0 −1
Original line number Diff line number Diff line
@@ -605,7 +605,6 @@ static const struct net_device_ops efx_netdev_ops = { 
#endif

	.ndo_get_phys_port_id   = efx_get_phys_port_id,

	.ndo_get_phys_port_name	= efx_get_phys_port_name,

	.ndo_setup_tc		= efx_setup_tc,

#ifdef CONFIG_RFS_ACCEL

	.ndo_rx_flow_steer	= efx_filter_rfs,

#endif