Commit a13511df 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) Handle errors mid-stream of an all dump, from Alexey Kodanev.

 2) Fix build of openvswitch with certain combinations of netfilter
    options, from Arnd Bergmann.

 3) Fix interactions between GSO and BQL, from Eric Dumazet.

 4) Don't put a '/' in RTL8201F's sysfs file name, from Holger
    Hoffstätte.

 5) S390 qeth driver fixes from Julian Wiedmann.

 6) Allow ipv6 link local addresses for netconsole when both source and
    destination are link local, from Matwey V. Kornilov.

 7) Fix the BPF program address seen in /proc/kallsyms, from Song Liu.

 8) Initialize mutex before use in dsa microchip driver, from Tristram
    Ha.

 9) Out-of-bounds access in hns3, from Yunsheng Lin.

10) Various netfilter fixes from Stefano Brivio, Jozsef Kadlecsik, Jiri
    Slaby, Florian Westphal, Eric Westbrook, Andrey Ryabinin, and Pablo
    Neira Ayuso.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (50 commits)
  net: alx: make alx_drv_name static
  net: bpfilter: fix iptables failure if bpfilter_umh is disabled
  sock_diag: fix autoloading of the raw_diag module
  net: core: netpoll: Enable netconsole IPv6 link local address
  ipv6: properly check return value in inet6_dump_all()
  rtnetlink: restore handling of dumpit return value in rtnl_dump_all()
  net/ipv6: Move anycast init/cleanup functions out of CONFIG_PROC_FS
  bonding/802.3ad: fix link_failure_count tracking
  net: phy: realtek: fix RTL8201F sysfs name
  sctp: define SCTP_SS_DEFAULT for Stream schedulers
  sctp: fix strchange_flags name for Stream Change Event
  mlxsw: spectrum: Fix IP2ME CPU policer configuration
  openvswitch: fix linking without CONFIG_NF_CONNTRACK_LABELS
  qed: fix link config error handling
  net: hns3: Fix for out-of-bounds access when setting pfc back pressure
  net/mlx4_en: use __netdev_tx_sent_queue()
  net: do not abort bulk send on BQL status
  net: bql: add __netdev_tx_sent_queue()
  s390/qeth: report 25Gbit link speed
  s390/qeth: sanitize ARP requests
  ...
parents 163c8d54 a422757e

drivers/net/bonding/bond_main.c

+2 −2
Original line number Diff line number Diff line
@@ -3112,13 +3112,13 @@ static int bond_slave_netdev_event(unsigned long event, 
	case NETDEV_CHANGE:

		/* For 802.3ad mode only:

		 * Getting invalid Speed/Duplex values here will put slave

		 * in weird state. So mark it as link-down for the time

		 * in weird state. So mark it as link-fail for the time

		 * being and let link-monitoring (miimon) set it right when

		 * correct speeds/duplex are available.

		 */

		if (bond_update_speed_duplex(slave) &&

		    BOND_MODE(bond) == BOND_MODE_8023AD)

			slave->link = BOND_LINK_DOWN;

			slave->link = BOND_LINK_FAIL;



		if (BOND_MODE(bond) == BOND_MODE_8023AD)

			bond_3ad_adapter_speed_duplex_changed(slave);

drivers/net/dsa/microchip/ksz_common.c

+5 −5
Original line number Diff line number Diff line
@@ -1117,11 +1117,6 @@ static int ksz_switch_init(struct ksz_device *dev) 
{

	int i;



	mutex_init(&dev->reg_mutex);

	mutex_init(&dev->stats_mutex);

	mutex_init(&dev->alu_mutex);

	mutex_init(&dev->vlan_mutex);



	dev->ds->ops = &ksz_switch_ops;



	for (i = 0; i < ARRAY_SIZE(ksz_switch_chips); i++) {
@@ -1206,6 +1201,11 @@ int ksz_switch_register(struct ksz_device *dev) 
	if (dev->pdata)

		dev->chip_id = dev->pdata->chip_id;



	mutex_init(&dev->reg_mutex);

	mutex_init(&dev->stats_mutex);

	mutex_init(&dev->alu_mutex);

	mutex_init(&dev->vlan_mutex);



	if (ksz_switch_detect(dev))

		return -EINVAL;

drivers/net/ethernet/atheros/alx/alx.h

+0 −1
Original line number Diff line number Diff line
@@ -140,6 +140,5 @@ struct alx_priv { 
};



extern const struct ethtool_ops alx_ethtool_ops;

extern const char alx_drv_name[];



#endif

drivers/net/ethernet/atheros/alx/main.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
#include "hw.h"

#include "reg.h"



const char alx_drv_name[] = "alx";

static const char alx_drv_name[] = "alx";



static void alx_free_txbuf(struct alx_tx_queue *txq, int entry)

{

drivers/net/ethernet/broadcom/bcmsysport.c

+7 −8
Original line number Diff line number Diff line
@@ -1902,9 +1902,6 @@ static void bcm_sysport_netif_start(struct net_device *dev) 
		intrl2_1_mask_clear(priv, 0xffffffff);

	else

		intrl2_0_mask_clear(priv, INTRL2_0_TDMA_MBDONE_MASK);



	/* Last call before we start the real business */

	netif_tx_start_all_queues(dev);

}



static void rbuf_init(struct bcm_sysport_priv *priv)
@@ -2048,6 +2045,8 @@ static int bcm_sysport_open(struct net_device *dev) 


	bcm_sysport_netif_start(dev);



	netif_tx_start_all_queues(dev);



	return 0;



out_clear_rx_int:
@@ -2071,7 +2070,7 @@ static void bcm_sysport_netif_stop(struct net_device *dev) 
	struct bcm_sysport_priv *priv = netdev_priv(dev);



	/* stop all software from updating hardware */

	netif_tx_stop_all_queues(dev);

	netif_tx_disable(dev);

	napi_disable(&priv->napi);

	cancel_work_sync(&priv->dim.dim.work);

	phy_stop(dev->phydev);
@@ -2658,12 +2657,12 @@ static int __maybe_unused bcm_sysport_suspend(struct device *d) 
	if (!netif_running(dev))

		return 0;



	netif_device_detach(dev);



	bcm_sysport_netif_stop(dev);



	phy_suspend(dev->phydev);



	netif_device_detach(dev);



	/* Disable UniMAC RX */

	umac_enable_set(priv, CMD_RX_EN, 0);
@@ -2746,8 +2745,6 @@ static int __maybe_unused bcm_sysport_resume(struct device *d) 
		goto out_free_rx_ring;

	}



	netif_device_attach(dev);



	/* RX pipe enable */

	topctrl_writel(priv, 0, RX_FLUSH_CNTL);
@@ -2788,6 +2785,8 @@ static int __maybe_unused bcm_sysport_resume(struct device *d) 


	bcm_sysport_netif_start(dev);



	netif_device_attach(dev);



	return 0;



out_free_rx_ring:

CRA Git | Maintained and supported by SUSTech CRA and CCSE