Commit f9ca6a56 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:
 "This fixes some fallout from the net-next merge the other day, plus
  some non-merge-window-related bug fixes:

  1) Fix sparse warnings in bcmgenet, systemport, b53, and mt7530
     (Florian Fainelli)

  2) pptp does a bogus dst_release() on a route we have a single
     refcount on, and attached to a socket, which needs that refcount
     (Eric Dumazet)

  3) UDP connected sockets on ipv6 can race with route update handling,
     resulting in a pre-PMTU update route still stuck on the socket and
     thus continuing to get ICMPV6_PKT_TOOBIG errors. We end up never
     seeing the updated route. (Alexey Kodanev)

  4) Missing list initializer(s) in TIPC (Jon Maloy)

  5) Connect phy early to prevent crashes in lan78xx driver (Alexander
     Graf)

  6) Fix build with modular NVMEM (Arnd Bergmann)

  7) netdevsim canot mark nsim_devlink_net_ops and nsim_fib_net_ops as
     __net_initdata, as these are references from module unload
     unconditionally (Arnd Bergmann)"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (23 commits)
  netdevsim: remove incorrect __net_initdata annotations
  sfc: remove ctpio_dmabuf_start from stats
  inet: frags: fix ip6frag_low_thresh boundary
  tipc: Fix namespace violation in tipc_sk_fill_sock_diag
  net: avoid unneeded atomic operation in ip*_append_data()
  nvmem: disallow modular CONFIG_NVMEM
  net: hns3: fix length overflow when CONFIG_ARM64_64K_PAGES
  nfp: use full 40 bits of the NSP buffer address
  lan78xx: Connect phy early
  nfp: add a separate counter for packets with CHECKSUM_COMPLETE
  tipc: Fix missing list initializations in struct tipc_subscription
  ipv6: udp: set dst cache for a connected sk if current not valid
  ipv6: udp: convert 'connected' to bool type in udpv6_sendmsg()
  ipv6: allow to cache dst for a connected sk in ip6_sk_dst_lookup_flow()
  ipv6: add a wrapper for ip6_dst_store() with flowi6 checks
  net: phy: marvell10g: add thermal hwmon device
  pptp: remove a buggy dst release in pptp_connect()
  net: dsa: mt7530: Use NULL instead of plain integer
  net: dsa: b53: Fix sparse warnings in b53_mmap.c
  af_unix: remove redundant lockdep class
  ...
parents 9eb31227 87248d31

drivers/net/dsa/b53/b53_mmap.c

+24 −9
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ struct b53_mmap_priv { 


static int b53_mmap_read8(struct b53_device *dev, u8 page, u8 reg, u8 *val)

{

	u8 __iomem *regs = dev->priv;

	struct b53_mmap_priv *priv = dev->priv;

	void __iomem *regs = priv->regs;



	*val = readb(regs + (page << 8) + reg);
@@ -39,7 +40,8 @@ static int b53_mmap_read8(struct b53_device *dev, u8 page, u8 reg, u8 *val) 


static int b53_mmap_read16(struct b53_device *dev, u8 page, u8 reg, u16 *val)

{

	u8 __iomem *regs = dev->priv;

	struct b53_mmap_priv *priv = dev->priv;

	void __iomem *regs = priv->regs;



	if (WARN_ON(reg % 2))

		return -EINVAL;
@@ -54,7 +56,8 @@ static int b53_mmap_read16(struct b53_device *dev, u8 page, u8 reg, u16 *val) 


static int b53_mmap_read32(struct b53_device *dev, u8 page, u8 reg, u32 *val)

{

	u8 __iomem *regs = dev->priv;

	struct b53_mmap_priv *priv = dev->priv;

	void __iomem *regs = priv->regs;



	if (WARN_ON(reg % 4))

		return -EINVAL;
@@ -69,7 +72,8 @@ static int b53_mmap_read32(struct b53_device *dev, u8 page, u8 reg, u32 *val) 


static int b53_mmap_read48(struct b53_device *dev, u8 page, u8 reg, u64 *val)

{

	u8 __iomem *regs = dev->priv;

	struct b53_mmap_priv *priv = dev->priv;

	void __iomem *regs = priv->regs;



	if (WARN_ON(reg % 2))

		return -EINVAL;
@@ -107,7 +111,8 @@ static int b53_mmap_read48(struct b53_device *dev, u8 page, u8 reg, u64 *val) 


static int b53_mmap_read64(struct b53_device *dev, u8 page, u8 reg, u64 *val)

{

	u8 __iomem *regs = dev->priv;

	struct b53_mmap_priv *priv = dev->priv;

	void __iomem *regs = priv->regs;

	u32 hi, lo;



	if (WARN_ON(reg % 4))
@@ -128,7 +133,8 @@ static int b53_mmap_read64(struct b53_device *dev, u8 page, u8 reg, u64 *val) 


static int b53_mmap_write8(struct b53_device *dev, u8 page, u8 reg, u8 value)

{

	u8 __iomem *regs = dev->priv;

	struct b53_mmap_priv *priv = dev->priv;

	void __iomem *regs = priv->regs;



	writeb(value, regs + (page << 8) + reg);
@@ -138,7 +144,8 @@ static int b53_mmap_write8(struct b53_device *dev, u8 page, u8 reg, u8 value) 
static int b53_mmap_write16(struct b53_device *dev, u8 page, u8 reg,

			    u16 value)

{

	u8 __iomem *regs = dev->priv;

	struct b53_mmap_priv *priv = dev->priv;

	void __iomem *regs = priv->regs;



	if (WARN_ON(reg % 2))

		return -EINVAL;
@@ -154,7 +161,8 @@ static int b53_mmap_write16(struct b53_device *dev, u8 page, u8 reg, 
static int b53_mmap_write32(struct b53_device *dev, u8 page, u8 reg,

			    u32 value)

{

	u8 __iomem *regs = dev->priv;

	struct b53_mmap_priv *priv = dev->priv;

	void __iomem *regs = priv->regs;



	if (WARN_ON(reg % 4))

		return -EINVAL;
@@ -223,12 +231,19 @@ static const struct b53_io_ops b53_mmap_ops = { 
static int b53_mmap_probe(struct platform_device *pdev)

{

	struct b53_platform_data *pdata = pdev->dev.platform_data;

	struct b53_mmap_priv *priv;

	struct b53_device *dev;



	if (!pdata)

		return -EINVAL;



	dev = b53_switch_alloc(&pdev->dev, &b53_mmap_ops, pdata->regs);

	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);

	if (!priv)

		return -ENOMEM;



	priv->regs = pdata->regs;



	dev = b53_switch_alloc(&pdev->dev, &b53_mmap_ops, priv);

	if (!dev)

		return -ENOMEM;

drivers/net/dsa/mt7530.c

+3 −3
Original line number Diff line number Diff line
@@ -917,7 +917,7 @@ mt7530_port_fdb_add(struct dsa_switch *ds, int port, 


	mutex_lock(&priv->reg_mutex);

	mt7530_fdb_write(priv, vid, port_mask, addr, -1, STATIC_ENT);

	ret = mt7530_fdb_cmd(priv, MT7530_FDB_WRITE, 0);

	ret = mt7530_fdb_cmd(priv, MT7530_FDB_WRITE, NULL);

	mutex_unlock(&priv->reg_mutex);



	return ret;
@@ -933,7 +933,7 @@ mt7530_port_fdb_del(struct dsa_switch *ds, int port, 


	mutex_lock(&priv->reg_mutex);

	mt7530_fdb_write(priv, vid, port_mask, addr, -1, STATIC_EMP);

	ret = mt7530_fdb_cmd(priv, MT7530_FDB_WRITE, 0);

	ret = mt7530_fdb_cmd(priv, MT7530_FDB_WRITE, NULL);

	mutex_unlock(&priv->reg_mutex);



	return ret;
@@ -1293,7 +1293,7 @@ mt7530_setup(struct dsa_switch *ds) 
	}



	/* Flush the FDB table */

	ret = mt7530_fdb_cmd(priv, MT7530_FDB_FLUSH, 0);

	ret = mt7530_fdb_cmd(priv, MT7530_FDB_FLUSH, NULL);

	if (ret < 0)

		return ret;

drivers/net/ethernet/broadcom/bcmsysport.c

+6 −5
Original line number Diff line number Diff line
@@ -1192,7 +1192,7 @@ static struct sk_buff *bcm_sysport_insert_tsb(struct sk_buff *skb, 
	u32 csum_info;

	u8 ip_proto;

	u16 csum_start;

	u16 ip_ver;

	__be16 ip_ver;



	/* Re-allocate SKB if needed */

	if (unlikely(skb_headroom(skb) < sizeof(*tsb))) {
@@ -1211,12 +1211,12 @@ static struct sk_buff *bcm_sysport_insert_tsb(struct sk_buff *skb, 
	memset(tsb, 0, sizeof(*tsb));



	if (skb->ip_summed == CHECKSUM_PARTIAL) {

		ip_ver = htons(skb->protocol);

		ip_ver = skb->protocol;

		switch (ip_ver) {

		case ETH_P_IP:

		case htons(ETH_P_IP):

			ip_proto = ip_hdr(skb)->protocol;

			break;

		case ETH_P_IPV6:

		case htons(ETH_P_IPV6):

			ip_proto = ipv6_hdr(skb)->nexthdr;

			break;

		default:
@@ -1230,7 +1230,8 @@ static struct sk_buff *bcm_sysport_insert_tsb(struct sk_buff *skb, 


		if (ip_proto == IPPROTO_TCP || ip_proto == IPPROTO_UDP) {

			csum_info |= L4_LENGTH_VALID;

			if (ip_proto == IPPROTO_UDP && ip_ver == ETH_P_IP)

			if (ip_proto == IPPROTO_UDP &&

			    ip_ver == htons(ETH_P_IP))

				csum_info |= L4_UDP;

		} else {

			csum_info = 0;

drivers/net/ethernet/broadcom/genet/bcmgenet.c

+6 −5
Original line number Diff line number Diff line
@@ -1489,7 +1489,7 @@ static struct sk_buff *bcmgenet_put_tx_csum(struct net_device *dev, 
	struct sk_buff *new_skb;

	u16 offset;

	u8 ip_proto;

	u16 ip_ver;

	__be16 ip_ver;

	u32 tx_csum_info;



	if (unlikely(skb_headroom(skb) < sizeof(*status))) {
@@ -1509,12 +1509,12 @@ static struct sk_buff *bcmgenet_put_tx_csum(struct net_device *dev, 
	status = (struct status_64 *)skb->data;



	if (skb->ip_summed  == CHECKSUM_PARTIAL) {

		ip_ver = htons(skb->protocol);

		ip_ver = skb->protocol;

		switch (ip_ver) {

		case ETH_P_IP:

		case htons(ETH_P_IP):

			ip_proto = ip_hdr(skb)->protocol;

			break;

		case ETH_P_IPV6:

		case htons(ETH_P_IPV6):

			ip_proto = ipv6_hdr(skb)->nexthdr;

			break;

		default:
@@ -1530,7 +1530,8 @@ static struct sk_buff *bcmgenet_put_tx_csum(struct net_device *dev, 
		 */

		if (ip_proto == IPPROTO_TCP || ip_proto == IPPROTO_UDP) {

			tx_csum_info |= STATUS_TX_CSUM_LV;

			if (ip_proto == IPPROTO_UDP && ip_ver == ETH_P_IP)

			if (ip_proto == IPPROTO_UDP &&

			    ip_ver == htons(ETH_P_IP))

				tx_csum_info |= STATUS_TX_CSUM_PROTO_UDP;

		} else {

			tx_csum_info = 0;

drivers/net/ethernet/hisilicon/hns3/hns3_enet.h

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ struct hns3_desc_cb { 
	u16 page_offset;

	u16 reuse_flag;



	u16 length;     /* length of the buffer */

	u32 length;     /* length of the buffer */



       /* desc type, used by the ring user to mark the type of the priv data */

	u16 type;

CRA Git | Maintained and supported by SUSTech CRA and CCSE