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

Commit 5c16807d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

Conflicts:
	drivers/net/netxen/netxen_nic_main.c
parents e5e2a8fd 232e7d68

drivers/net/8139cp.c

+2 −3
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ static int cp_rx_poll(struct napi_struct *napi, int budget) 
		dma_addr_t mapping;

		struct sk_buff *skb, *new_skb;

		struct cp_desc *desc;

		unsigned buflen;

		const unsigned buflen = cp->rx_buf_sz;



		skb = cp->rx_skb[rx_tail];

		BUG_ON(!skb);
@@ -549,8 +549,7 @@ static int cp_rx_poll(struct napi_struct *napi, int budget) 
			pr_debug("%s: rx slot %d status 0x%x len %d\n",

			       dev->name, rx_tail, status, len);



		buflen = cp->rx_buf_sz + NET_IP_ALIGN;

		new_skb = netdev_alloc_skb(dev, buflen);

		new_skb = netdev_alloc_skb(dev, buflen + NET_IP_ALIGN);

		if (!new_skb) {

			dev->stats.rx_dropped++;

			goto rx_next;

drivers/net/can/dev.c

+7 −0
Original line number Diff line number Diff line
@@ -611,11 +611,18 @@ static int can_fill_xstats(struct sk_buff *skb, const struct net_device *dev) 
	return -EMSGSIZE;

}



static int can_newlink(struct net_device *dev,

		       struct nlattr *tb[], struct nlattr *data[])

{

	return -EOPNOTSUPP;

}



static struct rtnl_link_ops can_link_ops __read_mostly = {

	.kind		= "can",

	.maxtype	= IFLA_CAN_MAX,

	.policy		= can_policy,

	.setup		= can_setup,

	.newlink	= can_newlink,

	.changelink	= can_changelink,

	.fill_info	= can_fill_info,

	.fill_xstats	= can_fill_xstats,

drivers/net/ixgbe/ixgbe_ethtool.c

+19 −8
Original line number Diff line number Diff line
@@ -1953,6 +1953,7 @@ static int ixgbe_set_coalesce(struct net_device *netdev, 
                              struct ethtool_coalesce *ec)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_q_vector *q_vector;

	int i;



	if (ec->tx_max_coalesced_frames_irq)
@@ -1987,8 +1988,12 @@ static int ixgbe_set_coalesce(struct net_device *netdev, 
		adapter->itr_setting = 0;

	}



	for (i = 0; i < adapter->num_msix_vectors - NON_Q_VECTORS; i++) {

		struct ixgbe_q_vector *q_vector = adapter->q_vector[i];

	/* MSI/MSIx Interrupt Mode */

	if (adapter->flags &

	    (IXGBE_FLAG_MSIX_ENABLED | IXGBE_FLAG_MSI_ENABLED)) {

		int num_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;

		for (i = 0; i < num_vectors; i++) {

			q_vector = adapter->q_vector[i];

			if (q_vector->txr_count && !q_vector->rxr_count)

				/* tx vector gets half the rate */

				q_vector->eitr = (adapter->eitr_param >> 1);
@@ -1997,6 +2002,12 @@ static int ixgbe_set_coalesce(struct net_device *netdev, 
				q_vector->eitr = adapter->eitr_param;

			ixgbe_write_eitr(q_vector);

		}

	/* Legacy Interrupt Mode */

	} else {

		q_vector = adapter->q_vector[0];

		q_vector->eitr = adapter->eitr_param;

		ixgbe_write_eitr(q_vector);

	}



	return 0;

}

drivers/net/netxen/netxen_nic.h

+1 −1
Original line number Diff line number Diff line
@@ -1112,7 +1112,7 @@ struct netxen_adapter { 
	u8 mc_enabled;

	u8 max_mc_count;

	u8 rss_supported;

	u8 resv2;

	u8 link_changed;

	u32 resv3;



	u8 has_link_events;

drivers/net/netxen/netxen_nic_init.c

+0 −7
Original line number Diff line number Diff line
@@ -184,13 +184,6 @@ void netxen_free_sw_resources(struct netxen_adapter *adapter) 
	kfree(recv_ctx->rds_rings);



skip_rds:

	if (recv_ctx->sds_rings == NULL)

		goto skip_sds;



	for(ring = 0; ring < adapter->max_sds_rings; ring++)

		recv_ctx->sds_rings[ring].consumer = 0;



skip_sds:

	if (adapter->tx_ring == NULL)

		return;