p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Merge in networking bug fixes for merge window.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2019-11-25 14:57:26 -08:00
parent c431047c4e e58c191241
commit adf6f8cb3f
9 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/dsa/sja1105/sja1105_main.c
View File

@ -557,15 +557,15 @@ static int sja1105_parse_rgmii_delays(struct sja1105_private *priv,
int i; int i;
for (i = 0; i < SJA1105_NUM_PORTS; i++) { for (i = 0; i < SJA1105_NUM_PORTS; i++) {
if (ports->role == XMII_MAC) if (ports[i].role == XMII_MAC)
continue; continue;
if (ports->phy_mode == PHY_INTERFACE_MODE_RGMII_RXID || if (ports[i].phy_mode == PHY_INTERFACE_MODE_RGMII_RXID ||
ports->phy_mode == PHY_INTERFACE_MODE_RGMII_ID) ports[i].phy_mode == PHY_INTERFACE_MODE_RGMII_ID)
priv->rgmii_rx_delay[i] = true; priv->rgmii_rx_delay[i] = true;
if (ports->phy_mode == PHY_INTERFACE_MODE_RGMII_TXID || if (ports[i].phy_mode == PHY_INTERFACE_MODE_RGMII_TXID ||
ports->phy_mode == PHY_INTERFACE_MODE_RGMII_ID) ports[i].phy_mode == PHY_INTERFACE_MODE_RGMII_ID)
priv->rgmii_tx_delay[i] = true; priv->rgmii_tx_delay[i] = true;
if ((priv->rgmii_rx_delay[i] || priv->rgmii_tx_delay[i]) && if ((priv->rgmii_rx_delay[i] || priv->rgmii_tx_delay[i]) &&

3
drivers/net/macvlan.c
View File

@ -359,10 +359,11 @@ static void macvlan_broadcast_enqueue(struct macvlan_port *port,
} }
spin_unlock(&port->bc_queue.lock); spin_unlock(&port->bc_queue.lock);
schedule_work(&port->bc_work);
if (err) if (err)
goto free_nskb; goto free_nskb;
schedule_work(&port->bc_work);
return; return;
free_nskb: free_nskb:

6
drivers/net/phy/mdio_bus.c
View File

@ -62,8 +62,8 @@ static int mdiobus_register_reset(struct mdio_device *mdiodev)
struct reset_control *reset = NULL; struct reset_control *reset = NULL;
if (mdiodev->dev.of_node) if (mdiodev->dev.of_node)
reset = devm_reset_control_get_exclusive(&mdiodev->dev, reset = of_reset_control_get_exclusive(mdiodev->dev.of_node,
"phy"); "phy");
if (IS_ERR(reset)) { if (IS_ERR(reset)) {
if (PTR_ERR(reset) == -ENOENT || PTR_ERR(reset) == -ENOTSUPP) if (PTR_ERR(reset) == -ENOENT || PTR_ERR(reset) == -ENOTSUPP)
reset = NULL; reset = NULL;
@ -107,6 +107,8 @@ int mdiobus_unregister_device(struct mdio_device *mdiodev)
if (mdiodev->bus->mdio_map[mdiodev->addr] != mdiodev) if (mdiodev->bus->mdio_map[mdiodev->addr] != mdiodev)
return -EINVAL; return -EINVAL;
reset_control_put(mdiodev->reset_ctrl);
mdiodev->bus->mdio_map[mdiodev->addr] = NULL; mdiodev->bus->mdio_map[mdiodev->addr] = NULL;
return 0; return 0;

1
drivers/net/slip/slip.c
View File

@ -855,6 +855,7 @@ static int slip_open(struct tty_struct *tty)
sl->tty = NULL; sl->tty = NULL;
tty->disc_data = NULL; tty->disc_data = NULL;
clear_bit(SLF_INUSE, &sl->flags); clear_bit(SLF_INUSE, &sl->flags);
sl_free_netdev(sl->dev);
free_netdev(sl->dev); free_netdev(sl->dev);
err_exit: err_exit:

3
include/net/sctp/structs.h
View File

@ -1243,6 +1243,9 @@ struct sctp_ep_common {
/* What socket does this endpoint belong to? */ /* What socket does this endpoint belong to? */
struct sock *sk; struct sock *sk;
/* Cache netns and it won't change once set */
struct net *net;
/* This is where we receive inbound chunks. */ /* This is where we receive inbound chunks. */
struct sctp_inq inqueue; struct sctp_inq inqueue;

1
net/sctp/associola.c
View File

@ -64,6 +64,7 @@ static struct sctp_association *sctp_association_init(
/* Discarding const is appropriate here. */ /* Discarding const is appropriate here. */
asoc->ep = (struct sctp_endpoint *)ep; asoc->ep = (struct sctp_endpoint *)ep;
asoc->base.sk = (struct sock *)sk; asoc->base.sk = (struct sock *)sk;
asoc->base.net = sock_net(sk);
sctp_endpoint_hold(asoc->ep); sctp_endpoint_hold(asoc->ep);
sock_hold(asoc->base.sk); sock_hold(asoc->base.sk);

1
net/sctp/endpointola.c
View File

@ -110,6 +110,7 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep,
/* Remember who we are attached to. */ /* Remember who we are attached to. */
ep->base.sk = sk; ep->base.sk = sk;
ep->base.net = sock_net(sk);
sock_hold(ep->base.sk); sock_hold(ep->base.sk);
return ep; return ep;

4
net/sctp/input.c
View File

@ -882,7 +882,7 @@ static inline int sctp_hash_cmp(struct rhashtable_compare_arg *arg,
if (!sctp_transport_hold(t)) if (!sctp_transport_hold(t))
return err; return err;
if (!net_eq(sock_net(t->asoc->base.sk), x->net)) if (!net_eq(t->asoc->base.net, x->net))
goto out; goto out;
if (x->lport != htons(t->asoc->base.bind_addr.port)) if (x->lport != htons(t->asoc->base.bind_addr.port))
goto out; goto out;
@ -897,7 +897,7 @@ static inline __u32 sctp_hash_obj(const void *data, u32 len, u32 seed)
{ {
const struct sctp_transport *t = data; const struct sctp_transport *t = data;
return sctp_hashfn(sock_net(t->asoc->base.sk), return sctp_hashfn(t->asoc->base.net,
htons(t->asoc->base.bind_addr.port), htons(t->asoc->base.bind_addr.port),
&t->ipaddr, seed); &t->ipaddr, seed);
} }

4
net/sctp/sm_statefuns.c
View File

@ -2160,8 +2160,10 @@ enum sctp_disposition sctp_sf_do_5_2_4_dupcook(
/* Update socket peer label if first association. */ /* Update socket peer label if first association. */
if (security_sctp_assoc_request((struct sctp_endpoint *)ep, if (security_sctp_assoc_request((struct sctp_endpoint *)ep,
chunk->skb)) chunk->skb)) {
sctp_association_free(new_asoc);
return sctp_sf_pdiscard(net, ep, asoc, type, arg, commands); return sctp_sf_pdiscard(net, ep, asoc, type, arg, commands);
}
/* Set temp so that it won't be added into hashtable */ /* Set temp so that it won't be added into hashtable */
new_asoc->temp = 1; new_asoc->temp = 1;