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

Commit 90cadbbf authored by David S. Miller's avatar David S. Miller
Browse files

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



Pull in bug fixes before respinning my net-next pull
request.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c92c81df 38355a5f

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+10 −4
Original line number Diff line number Diff line
@@ -9360,10 +9360,16 @@ void bnx2x_chip_cleanup(struct bnx2x *bp, int unload_mode, bool keep_link) 
		BNX2X_ERR("Failed to schedule DEL commands for UC MACs list: %d\n",

			  rc);



	/* The whole *vlan_obj structure may be not initialized if VLAN

	 * filtering offload is not supported by hardware. Currently this is

	 * true for all hardware covered by CHIP_IS_E1x().

	 */

	if (!CHIP_IS_E1x(bp)) {

		/* Remove all currently configured VLANs */

		rc = bnx2x_del_all_vlans(bp);

		if (rc < 0)

			BNX2X_ERR("Failed to delete all VLANs\n");

	}



	/* Disable LLH */

	if (!CHIP_IS_E1(bp))

net/core/net_namespace.c

+2 −1
Original line number Diff line number Diff line
@@ -1024,7 +1024,8 @@ static int __init net_ns_init(void) 
	init_net_initialized = true;

	up_write(&pernet_ops_rwsem);



	register_pernet_subsys(&net_ns_ops);

	if (register_pernet_subsys(&net_ns_ops))

		panic("Could not register network namespace subsystems");



	rtnl_register(PF_UNSPEC, RTM_NEWNSID, rtnl_net_newid, NULL,

		      RTNL_FLAG_DOIT_UNLOCKED);

net/ieee802154/6lowpan/tx.c

+3 −0
Original line number Diff line number Diff line
@@ -48,6 +48,9 @@ int lowpan_header_create(struct sk_buff *skb, struct net_device *ldev, 
	const struct ipv6hdr *hdr = ipv6_hdr(skb);

	struct neighbour *n;



	if (!daddr)

		return -EINVAL;



	/* TODO:

	 * if this package isn't ipv6 one, where should it be routed?

	 */

net/ipv4/ip_tunnel_core.c

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ struct metadata_dst *iptunnel_metadata_reply(struct metadata_dst *md, 
		       sizeof(struct in6_addr));

	else

		dst->key.u.ipv4.dst = src->key.u.ipv4.src;

	dst->key.tun_flags = src->key.tun_flags;

	dst->mode = src->mode | IP_TUNNEL_INFO_TX;



	return res;

net/packet/af_packet.c

+2 −2
Original line number Diff line number Diff line
@@ -2625,7 +2625,7 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) 
						sll_addr)))

			goto out;

		proto	= saddr->sll_protocol;

		addr	= saddr->sll_addr;

		addr	= saddr->sll_halen ? saddr->sll_addr : NULL;

		dev = dev_get_by_index(sock_net(&po->sk), saddr->sll_ifindex);

		if (addr && dev && saddr->sll_halen < dev->addr_len)

			goto out;
@@ -2825,7 +2825,7 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) 
		if (msg->msg_namelen < (saddr->sll_halen + offsetof(struct sockaddr_ll, sll_addr)))

			goto out;

		proto	= saddr->sll_protocol;

		addr	= saddr->sll_addr;

		addr	= saddr->sll_halen ? saddr->sll_addr : NULL;

		dev = dev_get_by_index(sock_net(sk), saddr->sll_ifindex);

		if (addr && dev && saddr->sll_halen < dev->addr_len)

			goto out;