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

Commit e304dfdb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking from David Miller:

1) IPV4 routing metrics can become stale when routes are changed by the
   administrator, fix from Steffen Klassert.

2) atl1c does "val |= XXX;" where XXX is a bit number not a bit mask,
   fix by using set_bit.  From Dan Carpenter.

3) Memory accounting bug in carl9170 driver results in wedged TX queue.
   Fix from Nicolas Cavallari.

4) iwlwifi accidently uses "sizeof(ptr)" instead of "sizeof(*ptr)", fix
   from Johannes Berg.

5) Openvswitch doesn't honor dp_ifindex when doing vport lookups, fix
   from Ben Pfaff.

6) ehea conversion to 64-bit stats lost multicast and rx_errors
   accounting, fix from Eric Dumazet.

7) Bridge state transition logging in br_stp_disable_port() is busted,
   it's emitted at the wrong time and the message is in the wrong tense,
   fix from Paulius Zaleckas.

8) mlx4 device erroneously invokes the queue resize firmware operation
   twice, fix from Jack Morgenstein.

9) Fix deadlock in usbnet, need to drop lock when invoking usb_unlink_urb()
   otherwise we recurse into taking it again.  Fix from Sebastian Siewior.

10) hyperv network driver uses the wrong driver name string, fix from
    Haiyang Zhang.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  net/hyperv: Use the built-in macro KBUILD_MODNAME for this driver
  net/usbnet: avoid recursive locking in usbnet_stop()
  route: Remove redirect_genid
  inetpeer: Invalidate the inetpeer tree along with the routing cache
  mlx4_core: fix bug in modify_cq wrapper for resize flow.
  atl1c: set ATL1C_WORK_EVENT_RESET bit correctly
  bridge: fix state reporting when port is disabled
  bridge: br_log_state() s/entering/entered/
  ehea: restore multicast and rx_errors fields
  openvswitch: Fix checksum update for actions on UDP packets.
  openvswitch: Honor dp_ifindex, when specified, for vport lookup by name.
  iwlwifi: fix wowlan suspend
  mwifiex: reset encryption mode flag before association
  carl9170: fix frame delivery if sta is in powersave mode
  carl9170: Fix memory accounting when sta is in power-save mode.
parents 9f8050c4 d31b20fc

drivers/net/ethernet/atheros/atl1c/atl1c_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1710,7 +1710,7 @@ static irqreturn_t atl1c_intr(int irq, void *data) 
					"atl1c hardware error (status = 0x%x)\n",

					status & ISR_ERROR);

			/* reset MAC */

			adapter->work_event |= ATL1C_WORK_EVENT_RESET;

			set_bit(ATL1C_WORK_EVENT_RESET, &adapter->work_event);

			schedule_work(&adapter->common_task);

			return IRQ_HANDLED;

		}

drivers/net/ethernet/ibm/ehea/ehea_main.c

+3 −1
Original line number Diff line number Diff line
@@ -336,7 +336,9 @@ static struct rtnl_link_stats64 *ehea_get_stats64(struct net_device *dev, 
	stats->tx_bytes = tx_bytes;

	stats->rx_packets = rx_packets;



	return &port->stats;

	stats->multicast = port->stats.multicast;

	stats->rx_errors = port->stats.rx_errors;

	return stats;

}



static void ehea_update_stats(struct work_struct *work)

drivers/net/ethernet/mellanox/mlx4/resource_tracker.c

+1 −2
Original line number Diff line number Diff line
@@ -2255,7 +2255,6 @@ int mlx4_MODIFY_CQ_wrapper(struct mlx4_dev *dev, int slave, 


	if (vhcr->op_modifier == 0) {

		err = handle_resize(dev, slave, vhcr, inbox, outbox, cmd, cq);

		if (err)

		goto ex_put;

	}

drivers/net/hyperv/netvsc_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ int netvsc_recv_callback(struct hv_device *device_obj, 
static void netvsc_get_drvinfo(struct net_device *net,

			       struct ethtool_drvinfo *info)

{

	strcpy(info->driver, "hv_netvsc");

	strcpy(info->driver, KBUILD_MODNAME);

	strcpy(info->version, HV_DRV_VERSION);

	strcpy(info->fw_version, "N/A");

}
@@ -485,7 +485,7 @@ MODULE_DEVICE_TABLE(vmbus, id_table); 


/* The one and only one */

static struct  hv_driver netvsc_drv = {

	.name = "netvsc",

	.name = KBUILD_MODNAME,

	.id_table = id_table,

	.probe = netvsc_probe,

	.remove = netvsc_remove,

drivers/net/usb/usbnet.c

+2 −0
Original line number Diff line number Diff line
@@ -589,6 +589,7 @@ static int unlink_urbs (struct usbnet *dev, struct sk_buff_head *q) 
		entry = (struct skb_data *) skb->cb;

		urb = entry->urb;



		spin_unlock_irqrestore(&q->lock, flags);

		// during some PM-driven resume scenarios,

		// these (async) unlinks complete immediately

		retval = usb_unlink_urb (urb);
@@ -596,6 +597,7 @@ static int unlink_urbs (struct usbnet *dev, struct sk_buff_head *q) 
			netdev_dbg(dev->net, "unlink urb err, %d\n", retval);

		else

			count++;

		spin_lock_irqsave(&q->lock, flags);

	}

	spin_unlock_irqrestore (&q->lock, flags);

	return count;