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

Commit f887c21e 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:
 "Mostly small bits scattered all over the place, which is usually how
  things go this late in the -rc series.

   1) Proper driver init device resets in bnx2, from Baoquan He.

   2) Fix accounting overflow in __tcp_retransmit_skb(),
      sk_forward_alloc, and ip_idents_reserve, from Eric Dumazet.

   3) Fix crash in bna driver ethtool stats handling, from Ivan Vecera.

   4) Missing check of skb_linearize() return value in mac80211, from
      Johannes Berg.

   5) Endianness fix in nf_table_trace dumps, from Liping Zhang.

   6) SSN comparison fix in SCTP, from Marcelo Ricardo Leitner.

   7) Update DSA and b44 MAINTAINERS entries.

   8) Make input path of vti6 driver work again, from Nicolas Dichtel.

   9) Off-by-one in mlx4, from Sebastian Ott.

  10) Fix fallback route lookup handling in ipv6, from Vincent Bernat.

  11) Fix stack corruption on probe in qed driver, from Yuval Mintz.

  12) PHY init fixes in r8152 from Hayes Wang.

  13) Missing SKB free in irda_accept error path, from Phil Turnbull"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (61 commits)
  tcp: properly account Fast Open SYN-ACK retrans
  tcp: fix under-accounting retransmit SNMP counters
  MAINTAINERS: Update b44 maintainer.
  net: get rid of an signed integer overflow in ip_idents_reserve()
  net/mlx4_core: Fix to clean devlink resources
  net: can: ifi: Configure transmitter delay
  vti6: fix input path
  ipmr, ip6mr: return lastuse relative to now
  r8152: disable ALDPS and EEE before setting PHY
  r8152: remove r8153_enable_eee
  r8152: move PHY settings to hw_phy_cfg
  r8152: move enabling PHY
  r8152: move some functions
  cxgb4/cxgb4vf: Allocate more queues for 25G and 100G adapter
  qed: Fix stack corruption on probe
  MAINTAINERS: Add an entry for the core network DSA code
  net: ipv6: fallback to full lookup if table lookup is unsuitable
  net/mlx5: E-Switch, Handle mode change failures
  net/mlx5: E-Switch, Fix error flow in the SRIOV e-switch init code
  net/mlx5: Fix flow counter bulk command out mailbox allocation
  ...
parents 7d1e0423 7e32b443

MAINTAINERS

+10 −1
Original line number Diff line number Diff line
@@ -2501,7 +2501,7 @@ S: Supported 
F:	kernel/bpf/



BROADCOM B44 10/100 ETHERNET DRIVER

M:	Gary Zambrano <zambrano@broadcom.com>

M:	Michael Chan <michael.chan@broadcom.com>

L:	netdev@vger.kernel.org

S:	Supported

F:	drivers/net/ethernet/broadcom/b44.*
@@ -8161,6 +8161,15 @@ S: Maintained 
W:	https://fedorahosted.org/dropwatch/

F:	net/core/drop_monitor.c



NETWORKING [DSA]

M:	Andrew Lunn <andrew@lunn.ch>

M:	Vivien Didelot <vivien.didelot@savoirfairelinux.com>

M:	Florian Fainelli <f.fainelli@gmail.com>

S:	Maintained

F:	net/dsa/

F:	include/net/dsa.h

F:	drivers/net/dsa/



NETWORKING [GENERAL]

M:	"David S. Miller" <davem@davemloft.net>

L:	netdev@vger.kernel.org

drivers/net/can/flexcan.c

+8 −5
Original line number Diff line number Diff line
@@ -1268,11 +1268,10 @@ static int __maybe_unused flexcan_suspend(struct device *device) 
	struct flexcan_priv *priv = netdev_priv(dev);

	int err;



	if (netif_running(dev)) {

		err = flexcan_chip_disable(priv);

		if (err)

			return err;



	if (netif_running(dev)) {

		netif_stop_queue(dev);

		netif_device_detach(dev);

	}
@@ -1285,13 +1284,17 @@ static int __maybe_unused flexcan_resume(struct device *device) 
{

	struct net_device *dev = dev_get_drvdata(device);

	struct flexcan_priv *priv = netdev_priv(dev);

	int err;



	priv->can.state = CAN_STATE_ERROR_ACTIVE;

	if (netif_running(dev)) {

		netif_device_attach(dev);

		netif_start_queue(dev);

		err = flexcan_chip_enable(priv);

		if (err)

			return err;

	}

	return flexcan_chip_enable(priv);

	return 0;

}



static SIMPLE_DEV_PM_OPS(flexcan_pm_ops, flexcan_suspend, flexcan_resume);

drivers/net/can/ifi_canfd/ifi_canfd.c

+10 −1
Original line number Diff line number Diff line
@@ -81,6 +81,10 @@ 
#define IFI_CANFD_TIME_SET_TIMEA_4_12_6_6	BIT(15)



#define IFI_CANFD_TDELAY			0x1c

#define IFI_CANFD_TDELAY_DEFAULT		0xb

#define IFI_CANFD_TDELAY_MASK			0x3fff

#define IFI_CANFD_TDELAY_ABS			BIT(14)

#define IFI_CANFD_TDELAY_EN			BIT(15)



#define IFI_CANFD_ERROR				0x20

#define IFI_CANFD_ERROR_TX_OFFSET		0
@@ -641,7 +645,7 @@ static void ifi_canfd_set_bittiming(struct net_device *ndev) 
	struct ifi_canfd_priv *priv = netdev_priv(ndev);

	const struct can_bittiming *bt = &priv->can.bittiming;

	const struct can_bittiming *dbt = &priv->can.data_bittiming;

	u16 brp, sjw, tseg1, tseg2;

	u16 brp, sjw, tseg1, tseg2, tdc;



	/* Configure bit timing */

	brp = bt->brp - 2;
@@ -664,6 +668,11 @@ static void ifi_canfd_set_bittiming(struct net_device *ndev) 
	       (brp << IFI_CANFD_TIME_PRESCALE_OFF) |

	       (sjw << IFI_CANFD_TIME_SJW_OFF_7_9_8_8),

	       priv->base + IFI_CANFD_FTIME);



	/* Configure transmitter delay */

	tdc = (dbt->brp * (dbt->phase_seg1 + 1)) & IFI_CANFD_TDELAY_MASK;

	writel(IFI_CANFD_TDELAY_EN | IFI_CANFD_TDELAY_ABS | tdc,

	       priv->base + IFI_CANFD_TDELAY);

}



static void ifi_canfd_set_filter(struct net_device *ndev, const u32 id,

drivers/net/ethernet/broadcom/bnx2.c

+7 −5
Original line number Diff line number Diff line
@@ -6356,10 +6356,6 @@ bnx2_open(struct net_device *dev) 
	struct bnx2 *bp = netdev_priv(dev);

	int rc;



	rc = bnx2_request_firmware(bp);

	if (rc < 0)

		goto out;



	netif_carrier_off(dev);



	bnx2_disable_int(bp);
@@ -6428,7 +6424,6 @@ bnx2_open(struct net_device *dev) 
	bnx2_free_irq(bp);

	bnx2_free_mem(bp);

	bnx2_del_napi(bp);

	bnx2_release_firmware(bp);

	goto out;

}
@@ -8575,6 +8570,12 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 


	pci_set_drvdata(pdev, dev);



	rc = bnx2_request_firmware(bp);

	if (rc < 0)

		goto error;





	bnx2_reset_chip(bp, BNX2_DRV_MSG_CODE_RESET);

	memcpy(dev->dev_addr, bp->mac_addr, ETH_ALEN);



	dev->hw_features = NETIF_F_IP_CSUM | NETIF_F_SG |
@@ -8607,6 +8608,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	return 0;



error:

	bnx2_release_firmware(bp);

	pci_iounmap(pdev, bp->regview);

	pci_release_regions(pdev);

	pci_disable_device(pdev);

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

+29 −28
Original line number Diff line number Diff line
@@ -31,15 +31,10 @@ 
#define BNAD_NUM_TXF_COUNTERS 12

#define BNAD_NUM_RXF_COUNTERS 10

#define BNAD_NUM_CQ_COUNTERS (3 + 5)

#define BNAD_NUM_RXQ_COUNTERS 6

#define BNAD_NUM_RXQ_COUNTERS 7

#define BNAD_NUM_TXQ_COUNTERS 5



#define BNAD_ETHTOOL_STATS_NUM						\

	(sizeof(struct rtnl_link_stats64) / sizeof(u64) +	\

	sizeof(struct bnad_drv_stats) / sizeof(u64) +		\

	offsetof(struct bfi_enet_stats, rxf_stats[0]) / sizeof(u64))



static const char *bnad_net_stats_strings[BNAD_ETHTOOL_STATS_NUM] = {

static const char *bnad_net_stats_strings[] = {

	"rx_packets",

	"tx_packets",

	"rx_bytes",
@@ -50,22 +45,10 @@ static const char *bnad_net_stats_strings[BNAD_ETHTOOL_STATS_NUM] = { 
	"tx_dropped",

	"multicast",

	"collisions",



	"rx_length_errors",

	"rx_over_errors",

	"rx_crc_errors",

	"rx_frame_errors",

	"rx_fifo_errors",

	"rx_missed_errors",



	"tx_aborted_errors",

	"tx_carrier_errors",

	"tx_fifo_errors",

	"tx_heartbeat_errors",

	"tx_window_errors",



	"rx_compressed",

	"tx_compressed",



	"netif_queue_stop",

	"netif_queue_wakeup",
@@ -254,6 +237,8 @@ static const char *bnad_net_stats_strings[BNAD_ETHTOOL_STATS_NUM] = { 
	"fc_tx_fid_parity_errors",

};



#define BNAD_ETHTOOL_STATS_NUM	ARRAY_SIZE(bnad_net_stats_strings)



static int

bnad_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd)

{
@@ -658,6 +643,8 @@ bnad_get_strings(struct net_device *netdev, u32 stringset, u8 *string) 
				string += ETH_GSTRING_LEN;

				sprintf(string, "rxq%d_allocbuf_failed", q_num);

				string += ETH_GSTRING_LEN;

				sprintf(string, "rxq%d_mapbuf_failed", q_num);

				string += ETH_GSTRING_LEN;

				sprintf(string, "rxq%d_producer_index", q_num);

				string += ETH_GSTRING_LEN;

				sprintf(string, "rxq%d_consumer_index", q_num);
@@ -678,6 +665,9 @@ bnad_get_strings(struct net_device *netdev, u32 stringset, u8 *string) 
					sprintf(string, "rxq%d_allocbuf_failed",

								q_num);

					string += ETH_GSTRING_LEN;

					sprintf(string, "rxq%d_mapbuf_failed",

						q_num);

					string += ETH_GSTRING_LEN;

					sprintf(string, "rxq%d_producer_index",

								q_num);

					string += ETH_GSTRING_LEN;
@@ -854,9 +844,9 @@ bnad_get_ethtool_stats(struct net_device *netdev, struct ethtool_stats *stats, 
		       u64 *buf)

{

	struct bnad *bnad = netdev_priv(netdev);

	int i, j, bi;

	int i, j, bi = 0;

	unsigned long flags;

	struct rtnl_link_stats64 *net_stats64;

	struct rtnl_link_stats64 net_stats64;

	u64 *stats64;

	u32 bmap;
@@ -871,14 +861,25 @@ bnad_get_ethtool_stats(struct net_device *netdev, struct ethtool_stats *stats, 
	 * under the same lock

	 */

	spin_lock_irqsave(&bnad->bna_lock, flags);

	bi = 0;

	memset(buf, 0, stats->n_stats * sizeof(u64));



	net_stats64 = (struct rtnl_link_stats64 *)buf;

	bnad_netdev_qstats_fill(bnad, net_stats64);

	bnad_netdev_hwstats_fill(bnad, net_stats64);



	bi = sizeof(*net_stats64) / sizeof(u64);

	memset(&net_stats64, 0, sizeof(net_stats64));

	bnad_netdev_qstats_fill(bnad, &net_stats64);

	bnad_netdev_hwstats_fill(bnad, &net_stats64);



	buf[bi++] = net_stats64.rx_packets;

	buf[bi++] = net_stats64.tx_packets;

	buf[bi++] = net_stats64.rx_bytes;

	buf[bi++] = net_stats64.tx_bytes;

	buf[bi++] = net_stats64.rx_errors;

	buf[bi++] = net_stats64.tx_errors;

	buf[bi++] = net_stats64.rx_dropped;

	buf[bi++] = net_stats64.tx_dropped;

	buf[bi++] = net_stats64.multicast;

	buf[bi++] = net_stats64.collisions;

	buf[bi++] = net_stats64.rx_length_errors;

	buf[bi++] = net_stats64.rx_crc_errors;

	buf[bi++] = net_stats64.rx_frame_errors;

	buf[bi++] = net_stats64.tx_fifo_errors;



	/* Get netif_queue_stopped from stack */

	bnad->stats.drv_stats.netif_queue_stopped = netif_queue_stopped(netdev);