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

Commit c31eeace authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking changes from David Miller:

 1) Multiply in netfilter IPVS can overflow when calculating destination
    weight.  From Simon Kirby.

 2) Use after free fixes in IPVS from Julian Anastasov.

 3) SFC driver bug fixes from Daniel Pieczko.

 4) Memory leak in pcan_usb_core failure paths, from Alexey Khoroshilov.

 5) Locking and encapsulation fixes to serial line CAN driver, from
    Andrew Naujoks.

 6) Duplex and VF handling fixes to bnx2x driver from Yaniv Rosner,
    Eilon Greenstein, and Ariel Elior.

 7) In lapb, if no other packets are outstanding, T1 timeouts actually
    stall things and no packet gets sent.  Fix from Josselin Costanzi.

 8) ICMP redirects should not make it to the socket error queues, from
    Duan Jiong.

 9) Fix bugs in skge DMA mapping error handling, from Nikulas Patocka.

10) Fix setting of VLAN priority field on via-rhine driver, from Roget
    Luethi.

11) Fix TX stalls and VLAN promisc programming in be2net driver from
    Ajit Khaparde.

12) Packet padding doesn't get handled correctly in new usbnet SG
    support code, from Ming Lei.

13) Fix races in netdevice teardown wrt.  network namespace closing.
    From Eric W.  Biederman.

14) Fix potential missed initialization of net_secret if not TCP
    connections are openned.  From Eric Dumazet.

15) Cinterion PLXX product ID in qmi_wwan driver is wrong, from
    Aleksander Morgado.

16) skb_cow_head() can change skb->data and thus packet header pointers,
    don't use stale ip_hdr reference in ip_tunnel code.

17) Backend state transition handling fixes in xen-netback, from Paul
    Durrant.

18) Packet offset for AH protocol is handled wrong in flow dissector,
    from Eric Dumazet.

19) Taking down an fq packet scheduler instance can leave stale packets
    in the queues, fix from Eric Dumazet.

20) Fix performance regressions introduced by TCP Small Queues.  From
    Eric Dumazet.

21) IPV6 GRE tunneling code calculates max_headroom incorrectly, from
    Hannes Frederic Sowa.

22) Multicast timer handlers in ipv4 and ipv6 can be the last and final
    reference to the ipv4/ipv6 specific network device state, so use the
    reference put that will check and release the object if the
    reference hits zero.  From Salam Noureddine.

23) Fix memory corruption in ip_tunnel driver, and use skb_push()
    instead of __skb_push() so that similar bugs are less hard to find.
    From Steffen Klassert.

24) Add forgotten hookup of rtnl_ops in SIT and ip6tnl drivers, from
    Nicolas Dichtel.

25) fq scheduler doesn't accurately rate limit in certain circumstances,
    from Eric Dumazet.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (103 commits)
  pkt_sched: fq: rate limiting improvements
  ip6tnl: allow to use rtnl ops on fb tunnel
  sit: allow to use rtnl ops on fb tunnel
  ip_tunnel: Remove double unregister of the fallback device
  ip_tunnel_core: Change __skb_push back to skb_push
  ip_tunnel: Add fallback tunnels to the hash lists
  ip_tunnel: Fix a memory corruption in ip_tunnel_xmit
  qlcnic: Fix SR-IOV configuration
  ll_temac: Reset dma descriptors indexes on ndo_open
  skbuff: size of hole is wrong in a comment
  ipv6 mcast: use in6_dev_put in timer handlers instead of __in6_dev_put
  ipv4 igmp: use in_dev_put in timer handlers instead of __in_dev_put
  ethernet: moxa: fix incorrect placement of __initdata tag
  ipv6: gre: correct calculation of max_headroom
  powerpc/83xx: gianfar_ptp: select 1588 clock source through dts file
  Revert "powerpc/83xx: gianfar_ptp: select 1588 clock source through dts file"
  bonding: Fix broken promiscuity reference counting issue
  tcp: TSQ can use a dynamic limit
  dm9601: fix IFF_ALLMULTI handling
  pkt_sched: fq: qdisc dismantle fixes
  ...
parents 0b936842 0eab5eb7

Documentation/devicetree/bindings/net/fsl-tsec-phy.txt

+17 −1
Original line number Original line Diff line number Diff line
@@ -86,6 +86,7 @@ General Properties: 




Clock Properties:

Clock Properties:





  - fsl,cksel        Timer reference clock source.

  - fsl,tclk-period  Timer reference clock period in nanoseconds.

  - fsl,tclk-period  Timer reference clock period in nanoseconds.

  - fsl,tmr-prsc     Prescaler, divides the output clock.

  - fsl,tmr-prsc     Prescaler, divides the output clock.

  - fsl,tmr-add      Frequency compensation value.

  - fsl,tmr-add      Frequency compensation value.
@@ -97,7 +98,7 @@ Clock Properties: 
  clock. You must choose these carefully for the clock to work right.

  clock. You must choose these carefully for the clock to work right.

  Here is how to figure good values:

  Here is how to figure good values:





  TimerOsc     = system clock               MHz

  TimerOsc     = selected reference clock   MHz

  tclk_period  = desired clock period       nanoseconds

  tclk_period  = desired clock period       nanoseconds

  NominalFreq  = 1000 / tclk_period         MHz

  NominalFreq  = 1000 / tclk_period         MHz

  FreqDivRatio = TimerOsc / NominalFreq     (must be greater that 1.0)

  FreqDivRatio = TimerOsc / NominalFreq     (must be greater that 1.0)
@@ -114,6 +115,20 @@ Clock Properties: 
  Pulse Per Second (PPS) signal, since this will be offered to the PPS

  Pulse Per Second (PPS) signal, since this will be offered to the PPS

  subsystem to synchronize the Linux clock.

  subsystem to synchronize the Linux clock.





  Reference clock source is determined by the value, which is holded

  in CKSEL bits in TMR_CTRL register. "fsl,cksel" property keeps the

  value, which will be directly written in those bits, that is why,

  according to reference manual, the next clock sources can be used:



  <0> - external high precision timer reference clock (TSEC_TMR_CLK

        input is used for this purpose);

  <1> - eTSEC system clock;

  <2> - eTSEC1 transmit clock;

  <3> - RTC clock input.



  When this attribute is not used, eTSEC system clock will serve as

  IEEE 1588 timer reference clock.



Example:

Example:





	ptp_clock@24E00 {

	ptp_clock@24E00 {
@@ -121,6 +136,7 @@ Example: 
		reg = <0x24E00 0xB0>;

		reg = <0x24E00 0xB0>;

		interrupts = <12 0x8 13 0x8>;

		interrupts = <12 0x8 13 0x8>;

		interrupt-parent = < &ipic >;

		interrupt-parent = < &ipic >;

		fsl,cksel       = <1>;

		fsl,tclk-period = <10>;

		fsl,tclk-period = <10>;

		fsl,tmr-prsc    = <100>;

		fsl,tmr-prsc    = <100>;

		fsl,tmr-add     = <0x999999A4>;

		fsl,tmr-add     = <0x999999A4>;

MAINTAINERS

+1 −0
Original line number Original line Diff line number Diff line
@@ -9378,6 +9378,7 @@ F: arch/arm64/include/asm/xen/ 




XEN NETWORK BACKEND DRIVER

XEN NETWORK BACKEND DRIVER

M:	Ian Campbell <ian.campbell@citrix.com>

M:	Ian Campbell <ian.campbell@citrix.com>

M:	Wei Liu <wei.liu2@citrix.com>

L:	xen-devel@lists.xenproject.org (moderated for non-subscribers)

L:	xen-devel@lists.xenproject.org (moderated for non-subscribers)

L:	netdev@vger.kernel.org

L:	netdev@vger.kernel.org

S:	Supported

S:	Supported

drivers/bcma/driver_pci.c

+26 −23
Original line number Original line Diff line number Diff line
@@ -210,25 +210,6 @@ static void bcma_core_pci_config_fixup(struct bcma_drv_pci *pc) 
	}

	}

}

}





static void bcma_core_pci_power_save(struct bcma_drv_pci *pc, bool up)

{

	u16 data;



	if (pc->core->id.rev >= 15 && pc->core->id.rev <= 20) {

		data = up ? 0x74 : 0x7C;

		bcma_pcie_mdio_writeread(pc, BCMA_CORE_PCI_MDIO_BLK1,

					 BCMA_CORE_PCI_MDIO_BLK1_MGMT1, 0x7F64);

		bcma_pcie_mdio_writeread(pc, BCMA_CORE_PCI_MDIO_BLK1,

					 BCMA_CORE_PCI_MDIO_BLK1_MGMT3, data);

	} else if (pc->core->id.rev >= 21 && pc->core->id.rev <= 22) {

		data = up ? 0x75 : 0x7D;

		bcma_pcie_mdio_writeread(pc, BCMA_CORE_PCI_MDIO_BLK1,

					 BCMA_CORE_PCI_MDIO_BLK1_MGMT1, 0x7E65);

		bcma_pcie_mdio_writeread(pc, BCMA_CORE_PCI_MDIO_BLK1,

					 BCMA_CORE_PCI_MDIO_BLK1_MGMT3, data);

	}

}



/**************************************************

/**************************************************

 * Init.

 * Init.

 **************************************************/

 **************************************************/
@@ -255,6 +236,32 @@ void bcma_core_pci_init(struct bcma_drv_pci *pc) 
		bcma_core_pci_clientmode_init(pc);

		bcma_core_pci_clientmode_init(pc);

}

}





void bcma_core_pci_power_save(struct bcma_bus *bus, bool up)

{

	struct bcma_drv_pci *pc;

	u16 data;



	if (bus->hosttype != BCMA_HOSTTYPE_PCI)

		return;



	pc = &bus->drv_pci[0];



	if (pc->core->id.rev >= 15 && pc->core->id.rev <= 20) {

		data = up ? 0x74 : 0x7C;

		bcma_pcie_mdio_writeread(pc, BCMA_CORE_PCI_MDIO_BLK1,

					 BCMA_CORE_PCI_MDIO_BLK1_MGMT1, 0x7F64);

		bcma_pcie_mdio_writeread(pc, BCMA_CORE_PCI_MDIO_BLK1,

					 BCMA_CORE_PCI_MDIO_BLK1_MGMT3, data);

	} else if (pc->core->id.rev >= 21 && pc->core->id.rev <= 22) {

		data = up ? 0x75 : 0x7D;

		bcma_pcie_mdio_writeread(pc, BCMA_CORE_PCI_MDIO_BLK1,

					 BCMA_CORE_PCI_MDIO_BLK1_MGMT1, 0x7E65);

		bcma_pcie_mdio_writeread(pc, BCMA_CORE_PCI_MDIO_BLK1,

					 BCMA_CORE_PCI_MDIO_BLK1_MGMT3, data);

	}

}

EXPORT_SYMBOL_GPL(bcma_core_pci_power_save);



int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc, struct bcma_device *core,

int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc, struct bcma_device *core,

			  bool enable)

			  bool enable)

{

{
@@ -310,8 +317,6 @@ void bcma_core_pci_up(struct bcma_bus *bus) 




	pc = &bus->drv_pci[0];

	pc = &bus->drv_pci[0];





	bcma_core_pci_power_save(pc, true);



	bcma_core_pci_extend_L1timer(pc, true);

	bcma_core_pci_extend_L1timer(pc, true);

}

}

EXPORT_SYMBOL_GPL(bcma_core_pci_up);

EXPORT_SYMBOL_GPL(bcma_core_pci_up);
@@ -326,7 +331,5 @@ void bcma_core_pci_down(struct bcma_bus *bus) 
	pc = &bus->drv_pci[0];

	pc = &bus->drv_pci[0];





	bcma_core_pci_extend_L1timer(pc, false);

	bcma_core_pci_extend_L1timer(pc, false);



	bcma_core_pci_power_save(pc, false);

}

}

EXPORT_SYMBOL_GPL(bcma_core_pci_down);
 
EXPORT_SYMBOL_GPL(bcma_core_pci_down);

drivers/bluetooth/ath3k.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -85,6 +85,7 @@ static struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x04CA, 0x3008) },

	{ USB_DEVICE(0x04CA, 0x3008) },

	{ USB_DEVICE(0x13d3, 0x3362) },

	{ USB_DEVICE(0x13d3, 0x3362) },

	{ USB_DEVICE(0x0CF3, 0xE004) },

	{ USB_DEVICE(0x0CF3, 0xE004) },

	{ USB_DEVICE(0x0CF3, 0xE005) },

	{ USB_DEVICE(0x0930, 0x0219) },

	{ USB_DEVICE(0x0930, 0x0219) },

	{ USB_DEVICE(0x0489, 0xe057) },

	{ USB_DEVICE(0x0489, 0xe057) },

	{ USB_DEVICE(0x13d3, 0x3393) },

	{ USB_DEVICE(0x13d3, 0x3393) },
@@ -126,6 +127,7 @@ static struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe005), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },

drivers/bluetooth/btusb.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -102,6 +102,7 @@ static struct usb_device_id btusb_table[] = { 




	/* Broadcom BCM20702A0 */

	/* Broadcom BCM20702A0 */

	{ USB_DEVICE(0x0b05, 0x17b5) },

	{ USB_DEVICE(0x0b05, 0x17b5) },

	{ USB_DEVICE(0x0b05, 0x17cb) },

	{ USB_DEVICE(0x04ca, 0x2003) },

	{ USB_DEVICE(0x04ca, 0x2003) },

	{ USB_DEVICE(0x0489, 0xe042) },

	{ USB_DEVICE(0x0489, 0xe042) },

	{ USB_DEVICE(0x413c, 0x8197) },

	{ USB_DEVICE(0x413c, 0x8197) },
@@ -112,6 +113,9 @@ static struct usb_device_id btusb_table[] = { 
	/*Broadcom devices with vendor specific id */

	/*Broadcom devices with vendor specific id */

	{ USB_VENDOR_AND_INTERFACE_INFO(0x0a5c, 0xff, 0x01, 0x01) },

	{ USB_VENDOR_AND_INTERFACE_INFO(0x0a5c, 0xff, 0x01, 0x01) },





	/* Belkin F8065bf - Broadcom based */

	{ USB_VENDOR_AND_INTERFACE_INFO(0x050d, 0xff, 0x01, 0x01) },



	{ }	/* Terminating entry */

	{ }	/* Terminating entry */

};

};
@@ -148,6 +152,7 @@ static struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe005), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },