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

Commit cae61ba3 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) Unbreak zebra and other netlink apps, from Eric W Biederman.

 2) Some new qmi_wwan device IDs, from Aleksander Morgado.

 3) Fix info leak in DCB netlink handler of qlcnic driver, from Dan
    Carpenter.

 4) inet_getid() and ipv6_select_ident() do not generate monotonically
    increasing ID numbers, fix from Eric Dumazet.

 5) Fix memory leak in __sk_prepare_filter(), from Leon Yu.

 6) Netlink leftover bytes warning message is user triggerable, rate
    limit it.  From Michal Schmidt.

 7) Fix non-linear SKB panic in ipvs, from Peter Christensen.

 8) Congestion window undo needs to be performed even if only never
    retransmitted data is SACK'd, fix from Yuching Cheng.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (24 commits)
  net: filter: fix possible memory leak in __sk_prepare_filter()
  net: ec_bhf: Add runtime dependencies
  tcp: fix cwnd undo on DSACK in F-RTO
  netlink: Only check file credentials for implicit destinations
  ipheth: Add support for iPad 2 and iPad 3
  team: fix mtu setting
  net: fix inet_getid() and ipv6_select_ident() bugs
  net: qmi_wwan: interface #11 in Sierra Wireless MC73xx is not QMI
  net: qmi_wwan: add additional Sierra Wireless QMI devices
  bridge: Prevent insertion of FDB entry with disallowed vlan
  netlink: rate-limit leftover bytes warning and print process name
  bridge: notify user space after fdb update
  net: qmi_wwan: add Netgear AirCard 341U
  net: fix wrong mac_len calculation for vlans
  batman-adv: fix NULL pointer dereferences
  net/mlx4_core: Reset RoCE VF gids when guest driver goes down
  emac: aggregation of v1-2 PLB errors for IER register
  emac: add missing support of 10mbit in emac/rgmii
  can: only rename enabled led triggers when changing the netdev name
  ipvs: Fix panic due to non-linear skb
  ...
parents ca755175 418c96ac

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -3153,10 +3153,9 @@ S: Maintained 
F:	drivers/scsi/eata_pio.*



EBTABLES

M:	Bart De Schuymer <bart.de.schuymer@pandora.be>

L:	netfilter-devel@vger.kernel.org

W:	http://ebtables.sourceforge.net/

S:	Maintained

S:	Orphan

F:	include/linux/netfilter_bridge/ebt_*.h

F:	include/uapi/linux/netfilter_bridge/ebt_*.h

F:	net/bridge/netfilter/ebt*.c

drivers/net/can/led.c

+3 −0
Original line number Diff line number Diff line
@@ -97,6 +97,9 @@ static int can_led_notifier(struct notifier_block *nb, unsigned long msg, 
	if (!priv)

		return NOTIFY_DONE;



	if (!priv->tx_led_trig || !priv->rx_led_trig)

		return NOTIFY_DONE;



	if (msg == NETDEV_CHANGENAME) {

		snprintf(name, sizeof(name), "%s-tx", netdev->name);

		led_trigger_rename_static(name, priv->tx_led_trig);

drivers/net/ethernet/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ source "drivers/net/ethernet/cisco/Kconfig" 
config CX_ECAT

	tristate "Beckhoff CX5020 EtherCAT master support"

	depends on PCI

	depends on X86 || COMPILE_TEST

	---help---

	  Driver for EtherCAT master module located on CCAT FPGA

	  that can be found on Beckhoff CX5020, and possibly other of CX

drivers/net/ethernet/ibm/emac/mal.c

+1 −4
Original line number Diff line number Diff line
@@ -682,10 +682,7 @@ static int mal_probe(struct platform_device *ofdev) 
		goto fail6;



	/* Enable all MAL SERR interrupt sources */

	if (mal->version == 2)

		set_mal_dcrn(mal, MAL_IER, MAL2_IER_EVENTS);

	else

		set_mal_dcrn(mal, MAL_IER, MAL1_IER_EVENTS);

	set_mal_dcrn(mal, MAL_IER, MAL_IER_EVENTS);



	/* Enable EOB interrupt */

	mal_enable_eob_irq(mal);

drivers/net/ethernet/ibm/emac/mal.h

+8 −12
Original line number Diff line number Diff line
@@ -95,24 +95,20 @@ 




#define MAL_IER			0x02

/* MAL IER bits */

#define   MAL_IER_DE		0x00000010

#define   MAL_IER_OTE		0x00000004

#define   MAL_IER_OE		0x00000002

#define   MAL_IER_PE		0x00000001

/* MAL V1 IER bits */

#define   MAL1_IER_NWE		0x00000008

#define   MAL1_IER_SOC_EVENTS	MAL1_IER_NWE

#define   MAL1_IER_EVENTS	(MAL1_IER_SOC_EVENTS | MAL_IER_DE | \

				 MAL_IER_OTE | MAL_IER_OE | MAL_IER_PE)



/* MAL V2 IER bits */

#define   MAL2_IER_PT		0x00000080

#define   MAL2_IER_PRE		0x00000040

#define   MAL2_IER_PWE		0x00000020

#define   MAL2_IER_SOC_EVENTS	(MAL2_IER_PT | MAL2_IER_PRE | MAL2_IER_PWE)

#define   MAL2_IER_EVENTS	(MAL2_IER_SOC_EVENTS | MAL_IER_DE | \

				 MAL_IER_OTE | MAL_IER_OE | MAL_IER_PE)

/* PLB read/write/timeout errors */

#define   MAL_IER_PTE		0x00000080

#define   MAL_IER_PRE		0x00000040

#define   MAL_IER_PWE		0x00000020



#define   MAL_IER_SOC_EVENTS	(MAL_IER_PTE | MAL_IER_PRE | MAL_IER_PWE)

#define   MAL_IER_EVENTS	(MAL_IER_SOC_EVENTS | MAL_IER_DE | \

				 MAL_IER_OTE | MAL_IER_OE | MAL_IER_PE)



#define MAL_TXCASR		0x04

#define MAL_TXCARR		0x05