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

Commit 5211da9c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge gitolite.kernel.org:/pub/scm/linux/kernel/git/davem/net 

Dave writes:
  "Various fixes, all over the place:

   1) OOB data generation fix in bluetooth, from Matias Karhumaa.

   2) BPF BTF boundary calculation fix, from Martin KaFai Lau.

   3) Don't bug on excessive frags, to be compatible in situations mixing
      older and newer kernels on each end.  From Juergen Gross.

   4) Scheduling in RCU fix in hv_netvsc, from Stephen Hemminger.

   5) Zero keying information in TLS layer before freeing copies
      of them, from Sabrina Dubroca.

   6) Fix NULL deref in act_sample, from Davide Caratti.

   7) Orphan SKB before GRO in veth to prevent crashes with XDP,
      from Toshiaki Makita.

   8) Fix use after free in ip6_xmit, from Eric Dumazet.

   9) Fix VF mac address regression in bnxt_en, from Micahel Chan.

   10) Fix MSG_PEEK behavior in TLS layer, from Daniel Borkmann.

   11) Programming adjustments to r8169 which fix not being to enter deep
       sleep states on some machines, from Kai-Heng Feng and Hans de
       Goede.

   12) Fix DST_NOCOUNT flag handling for ipv6 routes, from Peter
       Oskolkov."

* gitolite.kernel.org:/pub/scm/linux/kernel/git/davem/net: (45 commits)
  net/ipv6: do not copy dst flags on rt init
  qmi_wwan: set DTR for modems in forced USB2 mode
  clk: x86: Stop marking clocks as CLK_IS_CRITICAL
  r8169: Get and enable optional ether_clk clock
  clk: x86: add "ether_clk" alias for Bay Trail / Cherry Trail
  r8169: enable ASPM on RTL8106E
  r8169: Align ASPM/CLKREQ setting function with vendor driver
  Revert "kcm: remove any offset before parsing messages"
  kcm: remove any offset before parsing messages
  net: ethernet: Fix a unused function warning.
  net: dsa: mv88e6xxx: Fix ATU Miss Violation
  tls: fix currently broken MSG_PEEK behavior
  hv_netvsc: pair VF based on serial number
  PCI: hv: support reporting serial number as slot information
  bnxt_en: Fix VF mac address regression.
  ipv6: fix possible use-after-free in ip6_xmit()
  net: hp100: fix always-true check for link up state
  ARM: dts: at91: add new compatibility string for macb on sama5d3
  net: macb: disable scatter-gather for macb on sama5d3
  net: mvpp2: let phylink manage the carrier state
  ...
parents 3918c21e 30bfd930

Documentation/devicetree/bindings/net/macb.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Required properties: 
  Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on

  the Cadence GEM, or the generic form: "cdns,gem".

  Use "atmel,sama5d2-gem" for the GEM IP (10/100) available on Atmel sama5d2 SoCs.

  Use "atmel,sama5d3-macb" for the 10/100Mbit IP available on Atmel sama5d3 SoCs.

  Use "atmel,sama5d3-gem" for the Gigabit IP available on Atmel sama5d3 SoCs.

  Use "atmel,sama5d4-gem" for the GEM IP (10/100) available on Atmel sama5d4 SoCs.

  Use "cdns,zynq-gem" Xilinx Zynq-7xxx SoC.

arch/arm/boot/dts/sama5d3_emac.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
			};



			macb1: ethernet@f802c000 {

				compatible = "cdns,at91sam9260-macb", "cdns,macb";

				compatible = "atmel,sama5d3-macb", "cdns,at91sam9260-macb", "cdns,macb";

				reg = <0xf802c000 0x100>;

				interrupts = <35 IRQ_TYPE_LEVEL_HIGH 3>;

				pinctrl-names = "default";

drivers/bluetooth/hci_ldisc.c

+2 −0
Original line number Diff line number Diff line
@@ -543,6 +543,8 @@ static void hci_uart_tty_close(struct tty_struct *tty) 
	}

	clear_bit(HCI_UART_PROTO_SET, &hu->flags);



	percpu_free_rwsem(&hu->proto_lock);



	kfree(hu);

}

drivers/clk/x86/clk-pmc-atom.c

+11 −7
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ struct clk_plt_data { 
	u8 nparents;

	struct clk_plt *clks[PMC_CLK_NUM];

	struct clk_lookup *mclk_lookup;

	struct clk_lookup *ether_clk_lookup;

};



/* Return an index in parent table */
@@ -186,13 +187,6 @@ static struct clk_plt *plt_clk_register(struct platform_device *pdev, int id, 
	pclk->reg = base + PMC_CLK_CTL_OFFSET + id * PMC_CLK_CTL_SIZE;

	spin_lock_init(&pclk->lock);



	/*

	 * If the clock was already enabled by the firmware mark it as critical

	 * to avoid it being gated by the clock framework if no driver owns it.

	 */

	if (plt_clk_is_enabled(&pclk->hw))

		init.flags |= CLK_IS_CRITICAL;



	ret = devm_clk_hw_register(&pdev->dev, &pclk->hw);

	if (ret) {

		pclk = ERR_PTR(ret);
@@ -351,11 +345,20 @@ static int plt_clk_probe(struct platform_device *pdev) 
		goto err_unreg_clk_plt;

	}



	data->ether_clk_lookup = clkdev_hw_create(&data->clks[4]->hw,

						  "ether_clk", NULL);

	if (!data->ether_clk_lookup) {

		err = -ENOMEM;

		goto err_drop_mclk;

	}



	plt_clk_free_parent_names_loop(parent_names, data->nparents);



	platform_set_drvdata(pdev, data);

	return 0;



err_drop_mclk:

	clkdev_drop(data->mclk_lookup);

err_unreg_clk_plt:

	plt_clk_unregister_loop(data, i);

	plt_clk_unregister_parents(data);
@@ -369,6 +372,7 @@ static int plt_clk_remove(struct platform_device *pdev) 


	data = platform_get_drvdata(pdev);



	clkdev_drop(data->ether_clk_lookup);

	clkdev_drop(data->mclk_lookup);

	plt_clk_unregister_loop(data, PMC_CLK_NUM);

	plt_clk_unregister_parents(data);

drivers/net/appletalk/ipddp.c

+6 −2
Original line number Diff line number Diff line
@@ -283,8 +283,12 @@ static int ipddp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
                case SIOCFINDIPDDPRT:

			spin_lock_bh(&ipddp_route_lock);

			rp = __ipddp_find_route(&rcp);

			if (rp)

				memcpy(&rcp2, rp, sizeof(rcp2));

			if (rp) {

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

				rcp2.ip    = rp->ip;

				rcp2.at    = rp->at;

				rcp2.flags = rp->flags;

			}

			spin_unlock_bh(&ipddp_route_lock);



			if (rp) {