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

Commit 2080cee4 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) e1000e computes header length incorrectly wrt vlans, fix from Vlad
    Yasevich.

 2) ns_capable() check in sock_diag netlink code, from Andrew
    Lutomirski.

 3) Fix invalid queue pairs handling in virtio_net, from Amos Kong.

 4) Checksum offloading busted in sxgbe driver due to incorrect
    descriptor layout, fix from Byungho An.

 5) Fix build failure with SMC_DEBUG set to 2 or larger, from Zi Shen
    Lim.

 6) Fix uninitialized A and X registers in BPF interpreter, from Alexei
    Starovoitov.

 7) Fix arch dependencies of candence driver.

 8) Fix netlink capabilities checking tree-wide, from Eric W Biederman.

 9) Don't dump IFLA_VF_PORTS if netlink request didn't ask for it in
    IFLA_EXT_MASK, from David Gibson.

10) IPV6 FIB dump restart doesn't handle table changes that happen
    meanwhile, causing the code to loop forever or emit dups, fix from
    Kumar Sandararajan.

11) Memory l...
parents 783e9e8e c8ea5a22

Documentation/devicetree/bindings/net/arc_emac.txt

+10 −2
Original line number Diff line number Diff line
@@ -4,11 +4,15 @@ Required properties: 
- compatible: Should be "snps,arc-emac"

- reg: Address and length of the register set for the device

- interrupts: Should contain the EMAC interrupts

- clock-frequency: CPU frequency. It is needed to calculate and set polling

period of EMAC.

- max-speed: see ethernet.txt file in the same directory.

- phy: see ethernet.txt file in the same directory.



Clock handling:

The clock frequency is needed to calculate and set polling period of EMAC.

It must be provided by one of:

- clock-frequency: CPU frequency.

- clocks: reference to the clock supplying the EMAC.



Child nodes of the driver are the individual PHY devices connected to the

MDIO bus. They must have a "reg" property given the PHY address on the MDIO bus.
@@ -19,7 +23,11 @@ Examples: 
		reg = <0xc0fc2000 0x3c>;

		interrupts = <6>;

		mac-address = [ 00 11 22 33 44 55 ];



		clock-frequency = <80000000>;

		/* or */

		clocks = <&emac_clock>;



		max-speed = <100>;

		phy = <&phy0>;

Documentation/networking/scaling.txt

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ RPS and RFS were introduced in kernel 2.6.35. XPS was incorporated into 
(therbert@google.com)



Accelerated RFS was introduced in 2.6.35. Original patches were

submitted by Ben Hutchings (bhutchings@solarflare.com)

submitted by Ben Hutchings (bwh@kernel.org)



Authors:

Tom Herbert (therbert@google.com)

MAINTAINERS

+0 −2
Original line number Diff line number Diff line
@@ -7288,7 +7288,6 @@ F: drivers/video/aty/aty128fb.c 
RALINK RT2X00 WIRELESS LAN DRIVER

P:	rt2x00 project

M:	Ivo van Doorn <IvDoorn@gmail.com>

M:	Gertjan van Wingerde <gwingerde@gmail.com>

M:	Helmut Schaa <helmut.schaa@googlemail.com>

L:	linux-wireless@vger.kernel.org

L:	users@rt2x00.serialmonkey.com (moderated for non-subscribers)
@@ -7685,7 +7684,6 @@ F: drivers/clk/samsung/ 
SAMSUNG SXGBE DRIVERS

M:	Byungho An <bh74.an@samsung.com>

M:	Girish K S <ks.giri@samsung.com>

M:	Siva Reddy Kallam <siva.kallam@samsung.com>

M:	Vipul Pandya <vipul.pandya@samsung.com>

S:	Supported

L:	netdev@vger.kernel.org

crypto/crypto_user.c

+1 −1
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ static int crypto_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) 
	type -= CRYPTO_MSG_BASE;

	link = &crypto_dispatch[type];



	if (!capable(CAP_NET_ADMIN))

	if (!netlink_capable(skb, CAP_NET_ADMIN))

		return -EPERM;



	if ((type == (CRYPTO_MSG_GETALG - CRYPTO_MSG_BASE) &&

drivers/bluetooth/ath3k.c

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

	{ USB_DEVICE(0x04CA, 0x3005) },

	{ USB_DEVICE(0x04CA, 0x3006) },

	{ USB_DEVICE(0x04CA, 0x3007) },

	{ USB_DEVICE(0x04CA, 0x3008) },

	{ USB_DEVICE(0x04CA, 0x300b) },

	{ USB_DEVICE(0x0930, 0x0219) },
@@ -131,6 +132,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },

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

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

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

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

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

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