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

Commit 869e3305 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) Off by one and bounds checking fixes in NFC, from Dan Carpenter.

 2) There have been many weird regressions in r8169 since we turned ASPM
    support on, some are still not understood nor completely resolved.
    Let's turn this back off for now. From Heiner Kallweit.

 3) Signess fixes for ethtool speed value handling, from Michael
    Zhivich.

 4) Handle timestamps properly in macb driver, from Paul Thomas.

 5) Two erspan fixes, it's the usual "skb ->data potentially reallocated
    and we're holding a stale protocol header pointer". From Lorenzo
    Bianconi.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  bnxt_en: Reset device on RX buffer errors.
  bnxt_en: Improve RX consumer index validity check.
  net: macb driver, check for SKBTX_HW_TSTAMP
  qlogic: qlcnic: fix use of SPEED_UNKNOWN ethtool constant
  broadcom: tg3: fix use of SPEED_UNKNOWN ethtool constant
  ethtool: avoid signed-unsigned comparison in ethtool_validate_speed()
  net: ip6_gre: fix possible use-after-free in ip6erspan_rcv
  net: ip_gre: fix possible use-after-free in erspan_rcv
  r8169: disable ASPM again
  MAINTAINERS: ieee802154: update documentation file pattern
  net: vrf: Fix ping failed when vrf mtu is set to 0
  selftests: add a tc matchall test case
  nfc: nci: Potential off by one in ->pipes[] array
  NFC: nci: Add some bounds checking in nci_hci_cmd_received()
parents a556810d e063f459

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -7516,7 +7516,7 @@ F: include/net/mac802154.h 
F:	include/net/af_ieee802154.h

F:	include/net/cfg802154.h

F:	include/net/ieee802154_netdev.h

F:	Documentation/networking/ieee802154.txt

F:	Documentation/networking/ieee802154.rst



IFE PROTOCOL

M:	Yotam Gigi <yotam.gi@gmail.com>

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+13 −3
Original line number Diff line number Diff line
@@ -1133,6 +1133,8 @@ static void bnxt_tpa_start(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, 
	tpa_info = &rxr->rx_tpa[agg_id];



	if (unlikely(cons != rxr->rx_next_cons)) {

		netdev_warn(bp->dev, "TPA cons %x != expected cons %x\n",

			    cons, rxr->rx_next_cons);

		bnxt_sched_reset(bp, rxr);

		return;

	}
@@ -1585,15 +1587,17 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr, 
	}



	cons = rxcmp->rx_cmp_opaque;

	rx_buf = &rxr->rx_buf_ring[cons];

	data = rx_buf->data;

	data_ptr = rx_buf->data_ptr;

	if (unlikely(cons != rxr->rx_next_cons)) {

		int rc1 = bnxt_discard_rx(bp, cpr, raw_cons, rxcmp);



		netdev_warn(bp->dev, "RX cons %x != expected cons %x\n",

			    cons, rxr->rx_next_cons);

		bnxt_sched_reset(bp, rxr);

		return rc1;

	}

	rx_buf = &rxr->rx_buf_ring[cons];

	data = rx_buf->data;

	data_ptr = rx_buf->data_ptr;

	prefetch(data_ptr);



	misc = le32_to_cpu(rxcmp->rx_cmp_misc_v1);
@@ -1610,11 +1614,17 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr, 


	rx_buf->data = NULL;

	if (rxcmp1->rx_cmp_cfa_code_errors_v2 & RX_CMP_L2_ERRORS) {

		u32 rx_err = le32_to_cpu(rxcmp1->rx_cmp_cfa_code_errors_v2);



		bnxt_reuse_rx_data(rxr, cons, data);

		if (agg_bufs)

			bnxt_reuse_rx_agg_bufs(cpr, cp_cons, agg_bufs);



		rc = -EIO;

		if (rx_err & RX_CMPL_ERRORS_BUFFER_ERROR_MASK) {

			netdev_warn(bp->dev, "RX buffer error %x\n", rx_err);

			bnxt_sched_reset(bp, rxr);

		}

		goto next_rx;

	}

drivers/net/ethernet/broadcom/tg3.c

+4 −4
Original line number Diff line number Diff line
@@ -4283,7 +4283,7 @@ static void tg3_power_down(struct tg3 *tp) 
	pci_set_power_state(tp->pdev, PCI_D3hot);

}



static void tg3_aux_stat_to_speed_duplex(struct tg3 *tp, u32 val, u16 *speed, u8 *duplex)

static void tg3_aux_stat_to_speed_duplex(struct tg3 *tp, u32 val, u32 *speed, u8 *duplex)

{

	switch (val & MII_TG3_AUX_STAT_SPDMASK) {

	case MII_TG3_AUX_STAT_10HALF:
@@ -4787,7 +4787,7 @@ static int tg3_setup_copper_phy(struct tg3 *tp, bool force_reset) 
	bool current_link_up;

	u32 bmsr, val;

	u32 lcl_adv, rmt_adv;

	u16 current_speed;

	u32 current_speed;

	u8 current_duplex;

	int i, err;
@@ -5719,7 +5719,7 @@ static bool tg3_setup_fiber_by_hand(struct tg3 *tp, u32 mac_status) 
static int tg3_setup_fiber_phy(struct tg3 *tp, bool force_reset)

{

	u32 orig_pause_cfg;

	u16 orig_active_speed;

	u32 orig_active_speed;

	u8 orig_active_duplex;

	u32 mac_status;

	bool current_link_up;
@@ -5823,7 +5823,7 @@ static int tg3_setup_fiber_mii_phy(struct tg3 *tp, bool force_reset) 
{

	int err = 0;

	u32 bmsr, bmcr;

	u16 current_speed = SPEED_UNKNOWN;

	u32 current_speed = SPEED_UNKNOWN;

	u8 current_duplex = DUPLEX_UNKNOWN;

	bool current_link_up = false;

	u32 local_adv, remote_adv, sgsr;

drivers/net/ethernet/broadcom/tg3.h

+2 −2
Original line number Diff line number Diff line
@@ -2873,7 +2873,7 @@ struct tg3_tx_ring_info { 
struct tg3_link_config {

	/* Describes what we're trying to get. */

	u32				advertising;

	u16				speed;

	u32				speed;

	u8				duplex;

	u8				autoneg;

	u8				flowctrl;
@@ -2882,7 +2882,7 @@ struct tg3_link_config { 
	u8				active_flowctrl;



	u8				active_duplex;

	u16				active_speed;

	u32				active_speed;

	u32				rmt_adv;

};

drivers/net/ethernet/cadence/macb_main.c

+3 −1
Original line number Diff line number Diff line
@@ -898,7 +898,9 @@ static void macb_tx_interrupt(struct macb_queue *queue) 


			/* First, update TX stats if needed */

			if (skb) {

				if (gem_ptp_do_txstamp(queue, skb, desc) == 0) {

				if (unlikely(skb_shinfo(skb)->tx_flags &

					     SKBTX_HW_TSTAMP) &&

				    gem_ptp_do_txstamp(queue, skb, desc) == 0) {

					/* skb now belongs to timestamp buffer

					 * and will be removed later

					 */