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

Commit 6f0f9b6b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull more networking fixes from David Miller:

 1) Eric Dumazet discovered and fixed what turned out to be a family of
    bugs.  These functions were using pskb_may_pull() which might need
    to reallocate the linear SKB data buffer, but the callers were not
    expecting this possibility.  The callers have cached pointers to the
    packet header areas, and would need to reload them if we were to
    continue using pskb_may_pull().

    So they could end up reading garbage.

    It's easier to just change these RAW4/RAW6/MIP6 routines to use
    skb_header_pointer() instead of pskb_may_pull(), which won't modify
    the linear SKB data area.

 2) Dave Jone's syscall spammer caught a case where a non-TCP socket can
    call down into the TCP keepalive code.  The case basically involves
    creating a raw socket with sk_protocol == IPPROTO_TCP, then calling
    setsockopt(sock_fd, SO_KEEPALIVE, ...)

    Fixed by Eric Dumazet.

 3) Bluetooth devices do not get configured properly while being powered
    on, resulting in always using legacy pairing instead of SSP.  Fix
    from Andrzej Kaczmarek.

 4) Bluetooth cancels delayed work erroneously, put stricter checks in
    place.  From Andrei Emeltchenko.

 5) Fix deadlock between cfg80211_mutex and reg_regdb_search_mutex in
    cfg80211, from Luis R.  Rodriguez.

 6) Fix interrupt double release in iwlwifi, from Emmanuel Grumbach.

 7) Missing module license in bcm87xx driver, from Peter Huewe.

 8) Team driver can lose port changed events when adding devices to a
    team, fix from Jiri Pirko.

 9) Fix endless loop when trying ot unregister PPPOE device in zombie
    state, from Xiaodong Xu.

10) batman-adv layer needs to set MAC address of software device
    earlier, otherwise we call tt_local_add with it uninitialized.

11) Fix handling of KSZ8021 PHYs, it's matched currently by KS8051 but
    that doesn't program the device properly.  From Marek Vasut.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  ipv6: mip6: fix mip6_mh_filter()
  ipv6: raw: fix icmpv6_filter()
  net: guard tcp_set_keepalive() to tcp sockets
  phy/micrel: Add missing header to micrel_phy.h
  phy/micrel: Rename KS80xx to KSZ80xx
  phy/micrel: Implement support for KSZ8021
  batman-adv: Fix symmetry check / route flapping in multi interface setups
  batman-adv: Fix change mac address of soft iface.
  pppoe: drop PPPOX_ZOMBIEs in pppoe_release
  team: send port changed when added
  ipv4: raw: fix icmp_filter()
  net/phy/bcm87xx: Add MODULE_LICENSE("GPL") to GPL driver
  iwlwifi: don't double free the interrupt in failure path
  cfg80211: fix possible circular lock on reg_regdb_search()
  Bluetooth: Fix not removing power_off delayed work
  Bluetooth: Fix freeing uninitialized delayed works
  Bluetooth: mgmt: Fix enabling LE while powered off
  Bluetooth: mgmt: Fix enabling SSP while powered off
parents 9391734d 96af69ea

arch/arm/mach-mxs/mach-mxs.c

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static void __init apx4devkit_init(void) 
	enable_clk_enet_out();



	if (IS_BUILTIN(CONFIG_PHYLIB))

		phy_register_fixup_for_uid(PHY_ID_KS8051, MICREL_PHY_ID_MASK,

		phy_register_fixup_for_uid(PHY_ID_KSZ8051, MICREL_PHY_ID_MASK,

					   apx4devkit_phy_fixup);



	mxsfb_pdata.mode_list = apx4devkit_video_modes;

drivers/net/phy/bcm87xx.c

+2 −0
Original line number Diff line number Diff line
@@ -229,3 +229,5 @@ static void __exit bcm87xx_exit(void) 
		ARRAY_SIZE(bcm87xx_driver));

}

module_exit(bcm87xx_exit);



MODULE_LICENSE("GPL");

drivers/net/phy/micrel.c

+36 −9
Original line number Diff line number Diff line
@@ -21,6 +21,12 @@ 
#include <linux/phy.h>

#include <linux/micrel_phy.h>



/* Operation Mode Strap Override */

#define MII_KSZPHY_OMSO				0x16

#define KSZPHY_OMSO_B_CAST_OFF			(1 << 9)

#define KSZPHY_OMSO_RMII_OVERRIDE		(1 << 1)

#define KSZPHY_OMSO_MII_OVERRIDE		(1 << 0)



/* general Interrupt control/status reg in vendor specific block. */

#define MII_KSZPHY_INTCS			0x1B

#define	KSZPHY_INTCS_JABBER			(1 << 15)
@@ -101,6 +107,13 @@ static int kszphy_config_init(struct phy_device *phydev) 
	return 0;

}



static int ksz8021_config_init(struct phy_device *phydev)

{

	const u16 val = KSZPHY_OMSO_B_CAST_OFF | KSZPHY_OMSO_RMII_OVERRIDE;

	phy_write(phydev, MII_KSZPHY_OMSO, val);

	return 0;

}



static int ks8051_config_init(struct phy_device *phydev)

{

	int regval;
@@ -128,9 +141,22 @@ static struct phy_driver ksphy_driver[] = { 
	.config_intr	= ks8737_config_intr,

	.driver		= { .owner = THIS_MODULE,},

}, {

	.phy_id		= PHY_ID_KS8041,

	.phy_id		= PHY_ID_KSZ8021,

	.phy_id_mask	= 0x00ffffff,

	.name		= "Micrel KSZ8021",

	.features	= (PHY_BASIC_FEATURES | SUPPORTED_Pause |

			   SUPPORTED_Asym_Pause),

	.flags		= PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,

	.config_init	= ksz8021_config_init,

	.config_aneg	= genphy_config_aneg,

	.read_status	= genphy_read_status,

	.ack_interrupt	= kszphy_ack_interrupt,

	.config_intr	= kszphy_config_intr,

	.driver		= { .owner = THIS_MODULE,},

}, {

	.phy_id		= PHY_ID_KSZ8041,

	.phy_id_mask	= 0x00fffff0,

	.name		= "Micrel KS8041",

	.name		= "Micrel KSZ8041",

	.features	= (PHY_BASIC_FEATURES | SUPPORTED_Pause

				| SUPPORTED_Asym_Pause),

	.flags		= PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
@@ -141,9 +167,9 @@ static struct phy_driver ksphy_driver[] = { 
	.config_intr	= kszphy_config_intr,

	.driver		= { .owner = THIS_MODULE,},

}, {

	.phy_id		= PHY_ID_KS8051,

	.phy_id		= PHY_ID_KSZ8051,

	.phy_id_mask	= 0x00fffff0,

	.name		= "Micrel KS8051",

	.name		= "Micrel KSZ8051",

	.features	= (PHY_BASIC_FEATURES | SUPPORTED_Pause

				| SUPPORTED_Asym_Pause),

	.flags		= PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
@@ -154,8 +180,8 @@ static struct phy_driver ksphy_driver[] = { 
	.config_intr	= kszphy_config_intr,

	.driver		= { .owner = THIS_MODULE,},

}, {

	.phy_id		= PHY_ID_KS8001,

	.name		= "Micrel KS8001 or KS8721",

	.phy_id		= PHY_ID_KSZ8001,

	.name		= "Micrel KSZ8001 or KS8721",

	.phy_id_mask	= 0x00ffffff,

	.features	= (PHY_BASIC_FEATURES | SUPPORTED_Pause),

	.flags		= PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
@@ -201,10 +227,11 @@ MODULE_LICENSE("GPL"); 


static struct mdio_device_id __maybe_unused micrel_tbl[] = {

	{ PHY_ID_KSZ9021, 0x000ffffe },

	{ PHY_ID_KS8001, 0x00ffffff },

	{ PHY_ID_KSZ8001, 0x00ffffff },

	{ PHY_ID_KS8737, 0x00fffff0 },

	{ PHY_ID_KS8041, 0x00fffff0 },

	{ PHY_ID_KS8051, 0x00fffff0 },

	{ PHY_ID_KSZ8021, 0x00ffffff },

	{ PHY_ID_KSZ8041, 0x00fffff0 },

	{ PHY_ID_KSZ8051, 0x00fffff0 },

	{ }

};

drivers/net/ppp/pppoe.c

+1 −1
Original line number Diff line number Diff line
@@ -570,7 +570,7 @@ static int pppoe_release(struct socket *sock) 


	po = pppox_sk(sk);



	if (sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND)) {

	if (sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND | PPPOX_ZOMBIE)) {

		dev_put(po->pppoe_dev);

		po->pppoe_dev = NULL;

	}

drivers/net/team/team.c

+24 −8
Original line number Diff line number Diff line
@@ -848,7 +848,7 @@ static struct netpoll_info *team_netpoll_info(struct team *team) 
}

#endif



static void __team_port_change_check(struct team_port *port, bool linkup);

static void __team_port_change_port_added(struct team_port *port, bool linkup);



static int team_port_add(struct team *team, struct net_device *port_dev)

{
@@ -948,7 +948,7 @@ static int team_port_add(struct team *team, struct net_device *port_dev) 
	team_port_enable(team, port);

	list_add_tail_rcu(&port->list, &team->port_list);

	__team_compute_features(team);

	__team_port_change_check(port, !!netif_carrier_ok(port_dev));

	__team_port_change_port_added(port, !!netif_carrier_ok(port_dev));

	__team_options_change_check(team);



	netdev_info(dev, "Port device %s added\n", portname);
@@ -983,6 +983,8 @@ static int team_port_add(struct team *team, struct net_device *port_dev) 
	return err;

}



static void __team_port_change_port_removed(struct team_port *port);



static int team_port_del(struct team *team, struct net_device *port_dev)

{

	struct net_device *dev = team->dev;
@@ -999,8 +1001,7 @@ static int team_port_del(struct team *team, struct net_device *port_dev) 
	__team_option_inst_mark_removed_port(team, port);

	__team_options_change_check(team);

	__team_option_inst_del_port(team, port);

	port->removed = true;

	__team_port_change_check(port, false);

	__team_port_change_port_removed(port);

	team_port_disable(team, port);

	list_del_rcu(&port->list);

	netdev_rx_handler_unregister(port_dev);
@@ -2251,13 +2252,11 @@ static void __team_options_change_check(struct team *team) 
}



/* rtnl lock is held */

static void __team_port_change_check(struct team_port *port, bool linkup)



static void __team_port_change_send(struct team_port *port, bool linkup)

{

	int err;



	if (!port->removed && port->state.linkup == linkup)

		return;



	port->changed = true;

	port->state.linkup = linkup;

	team_refresh_port_linkup(port);
@@ -2282,6 +2281,23 @@ static void __team_port_change_check(struct team_port *port, bool linkup) 


}



static void __team_port_change_check(struct team_port *port, bool linkup)

{

	if (port->state.linkup != linkup)

		__team_port_change_send(port, linkup);

}



static void __team_port_change_port_added(struct team_port *port, bool linkup)

{

	__team_port_change_send(port, linkup);

}



static void __team_port_change_port_removed(struct team_port *port)

{

	port->removed = true;

	__team_port_change_send(port, false);

}



static void team_port_change_check(struct team_port *port, bool linkup)

{

	struct team *team = port->team;