Commit 4530cca1 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:
 "The pull requests are getting smaller, that's progress I suppose :-)

   1) Fix infinite loop in CIPSO option parsing, from Yujuan Qi.

   2) Fix remote checksum handling in VXLAN and GUE tunneling drivers,
      from Koichiro Den.

   3) Missing u64_stats_init() calls in several drivers, from Florian
      Fainelli.

   4) TCP can set the congestion window to an invalid ssthresh value
      after congestion window reductions, from Yuchung Cheng.

   5) Fix BPF jit branch generation on s390, from Daniel Borkmann.

   6) Correct MIPS ebpf JIT merge, from David Daney.

   7) Correct byte order test in BPF test_verifier.c, from Daniel
      Borkmann.

   8) Fix various crashes and leaks in ASIX driver, from Dean Jenkins.

   9) Handle SCTP checksums properly in mlx4 driver, from Davide
      Caratti.

  10) We can potentially enter tcp_connect() with a cached route
      already, due to fastopen, so we have to explicitly invalidate it.

  11) skb_warn_bad_offload() can bark in legitimate situations, fix from
      Willem de Bruijn"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (52 commits)
  net: avoid skb_warn_bad_offload false positives on UFO
  qmi_wwan: fix NULL deref on disconnect
  ppp: fix xmit recursion detection on ppp channels
  rds: Reintroduce statistics counting
  tcp: fastopen: tcp_connect() must refresh the route
  net: sched: set xt_tgchk_param par.net properly in ipt_init_target
  net: dsa: mediatek: add adjust link support for user ports
  net/mlx4_en: don't set CHECKSUM_COMPLETE on SCTP packets
  qed: Fix a memory allocation failure test in 'qed_mcp_cmd_init()'
  hysdn: fix to a race condition in put_log_buffer
  s390/qeth: fix L3 next-hop in xmit qeth hdr
  asix: Fix small memory leak in ax88772_unbind()
  asix: Ensure asix_rx_fixup_info members are all reset
  asix: Add rx->ax_skb = NULL after usbnet_skb_return()
  bpf: fix selftest/bpf/test_pkt_md_access on s390x
  netvsc: fix race on sub channel creation
  bpf: fix byte order test in test_verifier
  xgene: Always get clk source, but ignore if it's missing for SGMII ports
  MIPS: Add missing file for eBPF JIT.
  bpf, s390: fix build for libbpf and selftest suite
  ...
parents bfa738cf 8d63bee6

arch/mips/net/ebpf_jit.c

0 → 100644
+1950 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/s390/net/bpf_jit_comp.c

+2 −1
Original line number Diff line number Diff line
@@ -1253,7 +1253,8 @@ static int bpf_jit_prog(struct bpf_jit *jit, struct bpf_prog *fp) 
		insn_count = bpf_jit_insn(jit, fp, i);

		if (insn_count < 0)

			return -1;

		jit->addrs[i + 1] = jit->prg; /* Next instruction address */

		/* Next instruction address */

		jit->addrs[i + insn_count] = jit->prg;

	}

	bpf_jit_epilogue(jit);

drivers/isdn/hysdn/hysdn_proclog.c

+13 −15
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ struct procdata { 
	char log_name[15];	/* log filename */

	struct log_data *log_head, *log_tail;	/* head and tail for queue */

	int if_used;		/* open count for interface */

	int volatile del_lock;	/* lock for delete operations */

	unsigned char logtmp[LOG_MAX_LINELEN];

	wait_queue_head_t rd_queue;

};
@@ -102,7 +101,6 @@ put_log_buffer(hysdn_card *card, char *cp) 
{

	struct log_data *ib;

	struct procdata *pd = card->proclog;

	int i;

	unsigned long flags;



	if (!pd)
@@ -126,21 +124,21 @@ put_log_buffer(hysdn_card *card, char *cp) 
	else

		pd->log_tail->next = ib;	/* follows existing messages */

	pd->log_tail = ib;	/* new tail */

	i = pd->del_lock++;	/* get lock state */

	spin_unlock_irqrestore(&card->hysdn_lock, flags);



	/* delete old entrys */

	if (!i)

	while (pd->log_head->next) {

		if ((pd->log_head->usage_cnt <= 0) &&

		    (pd->log_head->next->usage_cnt <= 0)) {

			ib = pd->log_head;

			pd->log_head = pd->log_head->next;

			kfree(ib);

			} else

		} else {

			break;

		}

	}		/* pd->log_head->next */

	pd->del_lock--;		/* release lock level */



	spin_unlock_irqrestore(&card->hysdn_lock, flags);



	wake_up_interruptible(&(pd->rd_queue));		/* announce new entry */

}				/* put_log_buffer */

drivers/net/dsa/mt7530.c

+38 −0
Original line number Diff line number Diff line
@@ -625,6 +625,44 @@ static void mt7530_adjust_link(struct dsa_switch *ds, int port, 
		 * all finished.

		 */

		mt7623_pad_clk_setup(ds);

	} else {

		u16 lcl_adv = 0, rmt_adv = 0;

		u8 flowctrl;

		u32 mcr = PMCR_USERP_LINK | PMCR_FORCE_MODE;



		switch (phydev->speed) {

		case SPEED_1000:

			mcr |= PMCR_FORCE_SPEED_1000;

			break;

		case SPEED_100:

			mcr |= PMCR_FORCE_SPEED_100;

			break;

		};



		if (phydev->link)

			mcr |= PMCR_FORCE_LNK;



		if (phydev->duplex) {

			mcr |= PMCR_FORCE_FDX;



			if (phydev->pause)

				rmt_adv = LPA_PAUSE_CAP;

			if (phydev->asym_pause)

				rmt_adv |= LPA_PAUSE_ASYM;



			if (phydev->advertising & ADVERTISED_Pause)

				lcl_adv |= ADVERTISE_PAUSE_CAP;

			if (phydev->advertising & ADVERTISED_Asym_Pause)

				lcl_adv |= ADVERTISE_PAUSE_ASYM;



			flowctrl = mii_resolve_flowctrl_fdx(lcl_adv, rmt_adv);



			if (flowctrl & FLOW_CTRL_TX)

				mcr |= PMCR_TX_FC_EN;

			if (flowctrl & FLOW_CTRL_RX)

				mcr |= PMCR_RX_FC_EN;

		}

		mt7530_write(priv, MT7530_PMCR_P(port), mcr);

	}

}

drivers/net/dsa/mt7530.h

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ enum mt7530_stp_state { 
#define  PMCR_TX_FC_EN			BIT(5)

#define  PMCR_RX_FC_EN			BIT(4)

#define  PMCR_FORCE_SPEED_1000		BIT(3)

#define  PMCR_FORCE_SPEED_100		BIT(2)

#define  PMCR_FORCE_FDX			BIT(1)

#define  PMCR_FORCE_LNK			BIT(0)

#define  PMCR_COMMON_LINK		(PMCR_IFG_XMIT(1) | PMCR_MAC_MODE | \

CRA Git | Maintained and supported by SUSTech CRA and CCSE