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

Commit d8894a08 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 crash on bpf_prog_load() errors, from Daniel Borkmann.

 2) Fix ATM VCC memory accounting, from David Woodhouse.

 3) fib6_info objects need RCU freeing, from Eric Dumazet.

 4) Fix SO_BINDTODEVICE handling for TCP sockets, from David Ahern.

 5) Fix clobbered error code in enic_open() failure path, from
    Govindarajulu Varadarajan.

 6) Propagate dev_get_valid_name() error returns properly, from Li
    RongQing.

 7) Fix suspend/resume in davinci_emac driver, from Bartosz Golaszewski.

 8) Various act_ife fixes (recursive locking, IDR leaks, etc.) from
    Davide Caratti.

 9) Fix buggy checksum handling in sungem driver, from Eric Dumazet.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (40 commits)
  ip: limit use of gso_size to udp
  stmmac: fix DMA channel hang in half-duplex mode
  net: stmmac: socfpga: add additional ocp reset line for Stratix10
  net: sungem: fix rx checksum support
  bpfilter: ignore binary files
  bpfilter: fix build error
  net/usb/drivers: Remove useless hrtimer_active check
  net/sched: act_ife: preserve the action control in case of error
  net/sched: act_ife: fix recursive lock and idr leak
  net: ethernet: fix suspend/resume in davinci_emac
  net: propagate dev_get_valid_name return code
  enic: do not overwrite error code
  net/tcp: Fix socket lookups with SO_BINDTODEVICE
  ptp: replace getnstimeofday64() with ktime_get_real_ts64()
  net/ipv6: respect rcu grace period before freeing fib6_info
  net: net_failover: fix typo in net_failover_slave_register()
  ipvlan: use ETH_MAX_MTU as max mtu
  net: hamradio: use eth_broadcast_addr
  enic: initialize enic->rfs_h.lock in enic_probe
  MAINTAINERS: Add Sam as the maintainer for NCSI
  ...
parents 81e97f01 9887cba1

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -9751,6 +9751,11 @@ L: linux-scsi@vger.kernel.org 
S:	Maintained

F:	drivers/scsi/NCR_D700.*



NCSI LIBRARY:

M:	Samuel Mendoza-Jonas <sam@mendozajonas.com>

S:	Maintained

F:	net/ncsi/



NCT6775 HARDWARE MONITOR DRIVER

M:	Guenter Roeck <linux@roeck-us.net>

L:	linux-hwmon@vger.kernel.org

drivers/bluetooth/hci_nokia.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include <linux/slab.h>

#include <linux/string.h>

#include <linux/types.h>

#include <linux/unaligned/le_struct.h>

#include <asm/unaligned.h>

#include <net/bluetooth/bluetooth.h>

#include <net/bluetooth/hci_core.h>

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

+1 −2
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ void enic_rfs_flw_tbl_init(struct enic *enic) 
	enic->rfs_h.max = enic->config.num_arfs;

	enic->rfs_h.free = enic->rfs_h.max;

	enic->rfs_h.toclean = 0;

	enic_rfs_timer_start(enic);

}



void enic_rfs_flw_tbl_free(struct enic *enic)
@@ -88,7 +87,6 @@ void enic_rfs_flw_tbl_free(struct enic *enic) 


	enic_rfs_timer_stop(enic);

	spin_lock_bh(&enic->rfs_h.lock);

	enic->rfs_h.free = 0;

	for (i = 0; i < (1 << ENIC_RFS_FLW_BITSHIFT); i++) {

		struct hlist_head *hhead;

		struct hlist_node *tmp;
@@ -99,6 +97,7 @@ void enic_rfs_flw_tbl_free(struct enic *enic) 
			enic_delfltr(enic, n->fltr_id);

			hlist_del(&n->node);

			kfree(n);

			enic->rfs_h.free++;

		}

	}

	spin_unlock_bh(&enic->rfs_h.lock);

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

+6 −6
Original line number Diff line number Diff line
@@ -1920,7 +1920,7 @@ static int enic_open(struct net_device *netdev) 
{

	struct enic *enic = netdev_priv(netdev);

	unsigned int i;

	int err;

	int err, ret;



	err = enic_request_intr(enic);

	if (err) {
@@ -1971,15 +1971,14 @@ static int enic_open(struct net_device *netdev) 
		vnic_intr_unmask(&enic->intr[i]);



	enic_notify_timer_start(enic);

	enic_rfs_flw_tbl_init(enic);

	enic_rfs_timer_start(enic);



	return 0;



err_out_free_rq:

	for (i = 0; i < enic->rq_count; i++) {

		err = vnic_rq_disable(&enic->rq[i]);

		if (err)

			return err;

		ret = vnic_rq_disable(&enic->rq[i]);

		if (!ret)

			vnic_rq_clean(&enic->rq[i], enic_free_rq_buf);

	}

	enic_dev_notify_unset(enic);
@@ -2904,6 +2903,7 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	timer_setup(&enic->notify_timer, enic_notify_timer, 0);



	enic_rfs_flw_tbl_init(enic);

	enic_set_rx_coal_setting(enic);

	INIT_WORK(&enic->reset, enic_reset);

	INIT_WORK(&enic->tx_hang_reset, enic_tx_hang_reset);

drivers/net/ethernet/faraday/ftgmac100.c

+2 −2
Original line number Diff line number Diff line
@@ -1735,7 +1735,7 @@ static void ftgmac100_ncsi_handler(struct ncsi_dev *nd) 
	if (unlikely(nd->state != ncsi_dev_state_functional))

		return;



	netdev_info(nd->dev, "NCSI interface %s\n",

	netdev_dbg(nd->dev, "NCSI interface %s\n",

		   nd->link_up ? "up" : "down");

}