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

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

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

Pull networking fixes from David Miller:

 1) Fix uninitialized struct station_info in cfg80211_wireless_stats(),
    from Johannes Berg.

 2) Revert commit attempt to fix ipv6 protocol resubmission, it adds
    regressions.

 3) Endless loops can be created in bridge port lists, fix from Nikolay
    Aleksandrov.

 4) Don't WARN_ON() if sk->sk_forward_alloc is non-zero in
    sk_clear_memalloc, it is a legal situation during swap deactivation.
    Fix from Mel Gorman.

 5) Fix order of disabling interrupts and unlocking NAPI in enic driver
    to avoid a race.  From Govindarajulu Varadarajan.

 6) High and low register writes are swapped when programming the start
    of periodic output in igb driver.  From Richard Cochran.

 7) Fix device rename handling in mpls stack, from Robert Shearman.

 8) Do not trigger compaction synchronously when optimistically trying
    to allocate an order 3 page in alloc_skb_with_frags() and
    skb_page_frag_refill().  From Shaohua Li.

 9) Authentication with COOKIE_ECHO is not handled properly in SCTP, fix
    from Marcelo Ricardo Leitner.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  Doc: networking: Fix URL for wiki.wireshark.org in udplite.txt
  sctp: allow authenticating DATA chunks that are bundled with COOKIE_ECHO
  net: don't wait for order-3 page allocation
  mpls: handle device renames for per-device sysctls
  net: igb: fix the start time for periodic output signals
  enic: fix memory leak in rq_clean
  enic: check return value for stat dump
  enic: unlock napi busy poll before unmasking intr
  net, swap: Remove a warning and clarify why sk_mem_reclaim is required when deactivating swap
  bridge: fix multicast router rlist endless loop
  tipc: disconnect socket directly after probe failure
  Revert "ipv6: Fix protocol resubmission"
  cfg80211: wext: clear sinfo struct before calling driver
parents b85dfd30 b07d4961

Documentation/networking/udplite.txt

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
	files/UDP-Lite-HOWTO.txt



   o The Wireshark UDP-Lite WiKi (with capture files):

       http://wiki.wireshark.org/Lightweight_User_Datagram_Protocol

       https://wiki.wireshark.org/Lightweight_User_Datagram_Protocol



   o The Protocol Spec, RFC 3828, http://www.ietf.org/rfc/rfc3828.txt

drivers/net/ethernet/cisco/enic/enic_ethtool.c

+17 −3
Original line number Diff line number Diff line
@@ -131,8 +131,15 @@ static void enic_get_drvinfo(struct net_device *netdev, 
{

	struct enic *enic = netdev_priv(netdev);

	struct vnic_devcmd_fw_info *fw_info;

	int err;



	enic_dev_fw_info(enic, &fw_info);

	err = enic_dev_fw_info(enic, &fw_info);

	/* return only when pci_zalloc_consistent fails in vnic_dev_fw_info

	 * For other failures, like devcmd failure, we return previously

	 * recorded info.

	 */

	if (err == -ENOMEM)

		return;



	strlcpy(drvinfo->driver, DRV_NAME, sizeof(drvinfo->driver));

	strlcpy(drvinfo->version, DRV_VERSION, sizeof(drvinfo->version));
@@ -181,8 +188,15 @@ static void enic_get_ethtool_stats(struct net_device *netdev, 
	struct enic *enic = netdev_priv(netdev);

	struct vnic_stats *vstats;

	unsigned int i;

	int err;



	enic_dev_stats_dump(enic, &vstats);

	err = enic_dev_stats_dump(enic, &vstats);

	/* return only when pci_zalloc_consistent fails in vnic_dev_stats_dump

	 * For other failures, like devcmd failure, we return previously

	 * recorded stats.

	 */

	if (err == -ENOMEM)

		return;



	for (i = 0; i < enic_n_tx_stats; i++)

		*(data++) = ((u64 *)&vstats->tx)[enic_tx_stats[i].index];

drivers/net/ethernet/cisco/enic/enic_main.c

+9 −2
Original line number Diff line number Diff line
@@ -615,8 +615,15 @@ static struct rtnl_link_stats64 *enic_get_stats(struct net_device *netdev, 
{

	struct enic *enic = netdev_priv(netdev);

	struct vnic_stats *stats;

	int err;



	enic_dev_stats_dump(enic, &stats);

	err = enic_dev_stats_dump(enic, &stats);

	/* return only when pci_zalloc_consistent fails in vnic_dev_stats_dump

	 * For other failures, like devcmd failure, we return previously

	 * recorded stats.

	 */

	if (err == -ENOMEM)

		return net_stats;



	net_stats->tx_packets = stats->tx.tx_frames_ok;

	net_stats->tx_bytes = stats->tx.tx_bytes_ok;
@@ -1407,6 +1414,7 @@ static int enic_poll_msix_rq(struct napi_struct *napi, int budget) 
		 */

		enic_calc_int_moderation(enic, &enic->rq[rq]);



	enic_poll_unlock_napi(&enic->rq[rq]);

	if (work_done < work_to_do) {



		/* Some work done, but not enough to stay in polling,
@@ -1418,7 +1426,6 @@ static int enic_poll_msix_rq(struct napi_struct *napi, int budget) 
			enic_set_int_moderation(enic, &enic->rq[rq]);

		vnic_intr_unmask(&enic->intr[intr]);

	}

	enic_poll_unlock_napi(&enic->rq[rq]);



	return work_done;

}

drivers/net/ethernet/cisco/enic/vnic_rq.c

+4 −5
Original line number Diff line number Diff line
@@ -188,16 +188,15 @@ void vnic_rq_clean(struct vnic_rq *rq, 
	struct vnic_rq_buf *buf;

	u32 fetch_index;

	unsigned int count = rq->ring.desc_count;

	int i;



	buf = rq->to_clean;



	while (vnic_rq_desc_used(rq) > 0) {



	for (i = 0; i < rq->ring.desc_count; i++) {

		(*buf_clean)(rq, buf);



		buf = rq->to_clean = buf->next;

		rq->ring.desc_avail++;

		buf = buf->next;

	}

	rq->ring.desc_avail = rq->ring.desc_count - 1;



	/* Use current fetch_index as the ring starting point */

	fetch_index = ioread32(&rq->ctrl->fetch_index);

drivers/net/ethernet/intel/igb/igb_ptp.c

+2 −2
Original line number Diff line number Diff line
@@ -538,8 +538,8 @@ static int igb_ptp_feature_enable_i210(struct ptp_clock_info *ptp, 
			igb->perout[i].start.tv_nsec = rq->perout.start.nsec;

			igb->perout[i].period.tv_sec = ts.tv_sec;

			igb->perout[i].period.tv_nsec = ts.tv_nsec;

			wr32(trgttiml, rq->perout.start.sec);

			wr32(trgttimh, rq->perout.start.nsec);

			wr32(trgttimh, rq->perout.start.sec);

			wr32(trgttiml, rq->perout.start.nsec);

			tsauxc |= tsauxc_mask;

			tsim |= tsim_mask;

		} else {