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

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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Conflicts:
	drivers/net/Makefile
	net/ipv6/sysctl_net_ipv6.c

Two ipv6_table_template[] additions overlap, so the index
of the ipv6_table[x] assignments needed to be adjusted.

In the drivers/net/Makefile case, we've gotten rid of the
garbage whereby we had to list every single USB networking
driver in the top-level Makefile, there is just one
"USB_NETWORKING" that guards everything.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 30f00847 4d8fdc95

drivers/net/bonding/bond_sysfs_slave.c

+2 −2
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ int bond_sysfs_slave_add(struct slave *slave) 
	for (a = slave_attrs; *a; ++a) {

		err = sysfs_create_file(&slave->kobj, &((*a)->attr));

		if (err) {

			kobject_del(&slave->kobj);

			kobject_put(&slave->kobj);

			return err;

		}

	}
@@ -140,5 +140,5 @@ void bond_sysfs_slave_del(struct slave *slave) 
	for (a = slave_attrs; *a; ++a)

		sysfs_remove_file(&slave->kobj, &((*a)->attr));



	kobject_del(&slave->kobj);

	kobject_put(&slave->kobj);

}

drivers/net/ethernet/allwinner/sun4i-emac.c

+4 −2
Original line number Diff line number Diff line
@@ -633,8 +633,10 @@ static void emac_rx(struct net_device *dev) 
		}



		/* Move data from EMAC */

		skb = dev_alloc_skb(rxlen + 4);

		if (good_packet && skb) {

		if (good_packet) {

			skb = netdev_alloc_skb(dev, rxlen + 4);

			if (!skb)

				continue;

			skb_reserve(skb, 2);

			rdptr = (u8 *) skb_put(skb, rxlen - 4);

drivers/net/ethernet/broadcom/tg3.c

+12 −10
Original line number Diff line number Diff line
@@ -7830,17 +7830,18 @@ static int tigon3_dma_hwbug_workaround(struct tg3_napi *tnapi, 


static netdev_tx_t tg3_start_xmit(struct sk_buff *, struct net_device *);



/* Use GSO to workaround a rare TSO bug that may be triggered when the

 * TSO header is greater than 80 bytes.

/* Use GSO to workaround all TSO packets that meet HW bug conditions

 * indicated in tg3_tx_frag_set()

 */

static int tg3_tso_bug(struct tg3 *tp, struct sk_buff *skb)

static int tg3_tso_bug(struct tg3 *tp, struct tg3_napi *tnapi,

		       struct netdev_queue *txq, struct sk_buff *skb)

{

	struct sk_buff *segs, *nskb;

	u32 frag_cnt_est = skb_shinfo(skb)->gso_segs * 3;



	/* Estimate the number of fragments in the worst case */

	if (unlikely(tg3_tx_avail(&tp->napi[0]) <= frag_cnt_est)) {

		netif_stop_queue(tp->dev);

	if (unlikely(tg3_tx_avail(tnapi) <= frag_cnt_est)) {

		netif_tx_stop_queue(txq);



		/* netif_tx_stop_queue() must be done before checking

		 * checking tx index in tg3_tx_avail() below, because in
@@ -7848,13 +7849,14 @@ static int tg3_tso_bug(struct tg3 *tp, struct sk_buff *skb) 
		 * netif_tx_queue_stopped().

		 */

		smp_mb();

		if (tg3_tx_avail(&tp->napi[0]) <= frag_cnt_est)

		if (tg3_tx_avail(tnapi) <= frag_cnt_est)

			return NETDEV_TX_BUSY;



		netif_wake_queue(tp->dev);

		netif_tx_wake_queue(txq);

	}



	segs = skb_gso_segment(skb, tp->dev->features & ~(NETIF_F_TSO | NETIF_F_TSO6));

	segs = skb_gso_segment(skb, tp->dev->features &

				    ~(NETIF_F_TSO | NETIF_F_TSO6));

	if (IS_ERR(segs) || !segs)

		goto tg3_tso_bug_end;
@@ -7930,7 +7932,7 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) 
		if (!skb_is_gso_v6(skb)) {

			if (unlikely((ETH_HLEN + hdr_len) > 80) &&

			    tg3_flag(tp, TSO_BUG))

				return tg3_tso_bug(tp, skb);

				return tg3_tso_bug(tp, tnapi, txq, skb);



			ip_csum = iph->check;

			ip_tot_len = iph->tot_len;
@@ -8061,7 +8063,7 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) 
				iph->tot_len = ip_tot_len;

			}

			tcph->check = tcp_csum;

			return tg3_tso_bug(tp, skb);

			return tg3_tso_bug(tp, tnapi, txq, skb);

		}



		/* If the workaround fails due to memory/mapping

drivers/net/ethernet/brocade/bna/bnad.c

+1 −1
Original line number Diff line number Diff line
@@ -600,9 +600,9 @@ bnad_cq_process(struct bnad *bnad, struct bna_ccb *ccb, int budget) 
	prefetch(bnad->netdev);



	cq = ccb->sw_q;

	cmpl = &cq[ccb->producer_index];



	while (packets < budget) {

		cmpl = &cq[ccb->producer_index];

		if (!cmpl->valid)

			break;

		/* The 'valid' field is set by the adapter, only after writing

drivers/net/ethernet/brocade/bna/bnad_ethtool.c

+2 −4
Original line number Diff line number Diff line
@@ -997,10 +997,8 @@ bnad_get_eeprom(struct net_device *netdev, struct ethtool_eeprom *eeprom, 
	unsigned long flags = 0;

	int ret = 0;



	/* Check if the flash read request is valid */

	if (eeprom->magic != (bnad->pcidev->vendor |

			     (bnad->pcidev->device << 16)))

		return -EFAULT;

	/* Fill the magic value */

	eeprom->magic = bnad->pcidev->vendor | (bnad->pcidev->device << 16);



	/* Query the flash partition based on the offset */

	flash_part = bnad_get_flash_partition_by_offset(bnad,