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

Commit 2dd68cc7 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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

Dave writes:
  "Networking fixes:

  1) Fix multiqueue handling of coalesce timer in stmmac, from Jose
     Abreu.

   2) Fix memory corruption in NFC, from Suren Baghdasaryan.

   3) Don't write reserved bits in ravb driver, from Kazuya Mizuguchi.

   4) SMC bug fixes from Karsten Graul, YueHaibing, and Ursula Braun.

   5) Fix TX done race in mvpp2, from Antoine Tenart.

   6) ipv6 metrics leak, from Wei Wang.

   7) Adjust firmware version requirements in mlxsw, from Petr Machata.

   8) Fix autonegotiation on resume in r8169, from Heiner Kallweit.

   9) Fixed missing entries when dumping /proc/net/if_inet6, from Jeff
      Barnhill.

   10) Fix double free in devlink, from Dan Carpenter.

   11) Fix ethtool regression from UFO feature removal, from Maciej
       Żenczykowski.

   12) Fix drivers that have a ndo_poll_controller() that captures the
       cpu entirely on loaded hosts by trying to drain all rx and tx
       queues, from Eric Dumazet.

   13) Fix memory corruption with jumbo frames in aquantia driver, from
       Friedemann Gerold."

* gitolite.kernel.org:/pub/scm/linux/kernel/git/davem/net: (79 commits)
  net: mvneta: fix the remaining Rx descriptor unmapping issues
  ip_tunnel: be careful when accessing the inner header
  mpls: allow routes on ip6gre devices
  net: aquantia: memory corruption on jumbo frames
  tun: remove ndo_poll_controller
  nfp: remove ndo_poll_controller
  bnxt: remove ndo_poll_controller
  bnx2x: remove ndo_poll_controller
  mlx5: remove ndo_poll_controller
  mlx4: remove ndo_poll_controller
  i40evf: remove ndo_poll_controller
  ice: remove ndo_poll_controller
  igb: remove ndo_poll_controller
  ixgb: remove ndo_poll_controller
  fm10k: remove ndo_poll_controller
  ixgbevf: remove ndo_poll_controller
  ixgbe: remove ndo_poll_controller
  bonding: use netpoll_poll_dev() helper
  netpoll: make ndo_poll_controller() optional
  rds: Fix build regression.
  ...
parents 02214bfc f4a51879

drivers/net/bonding/bond_main.c

+2 −9
Original line number Diff line number Diff line
@@ -971,16 +971,13 @@ static void bond_poll_controller(struct net_device *bond_dev) 
	struct slave *slave = NULL;

	struct list_head *iter;

	struct ad_info ad_info;

	struct netpoll_info *ni;

	const struct net_device_ops *ops;



	if (BOND_MODE(bond) == BOND_MODE_8023AD)

		if (bond_3ad_get_active_agg_info(bond, &ad_info))

			return;



	bond_for_each_slave_rcu(bond, slave, iter) {

		ops = slave->dev->netdev_ops;

		if (!bond_slave_is_up(slave) || !ops->ndo_poll_controller)

		if (!bond_slave_is_up(slave))

			continue;



		if (BOND_MODE(bond) == BOND_MODE_8023AD) {
@@ -992,11 +989,7 @@ static void bond_poll_controller(struct net_device *bond_dev) 
				continue;

		}



		ni = rcu_dereference_bh(slave->dev->npinfo);

		if (down_trylock(&ni->dev_lock))

			continue;

		ops->ndo_poll_controller(slave->dev);

		up(&ni->dev_lock);

		netpoll_poll_dev(slave->dev);

	}

}

drivers/net/ethernet/apple/bmac.c

+2 −2
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ static irqreturn_t bmac_txdma_intr(int irq, void *dev_id); 
static irqreturn_t bmac_rxdma_intr(int irq, void *dev_id);

static void bmac_set_timeout(struct net_device *dev);

static void bmac_tx_timeout(struct timer_list *t);

static int bmac_output(struct sk_buff *skb, struct net_device *dev);

static netdev_tx_t bmac_output(struct sk_buff *skb, struct net_device *dev);

static void bmac_start(struct net_device *dev);



#define	DBDMA_SET(x)	( ((x) | (x) << 16) )
@@ -1456,7 +1456,7 @@ bmac_start(struct net_device *dev) 
	spin_unlock_irqrestore(&bp->lock, flags);

}



static int

static netdev_tx_t

bmac_output(struct sk_buff *skb, struct net_device *dev)

{

	struct bmac_data *bp = netdev_priv(dev);

drivers/net/ethernet/apple/mace.c

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ struct mace_data { 


static int mace_open(struct net_device *dev);

static int mace_close(struct net_device *dev);

static int mace_xmit_start(struct sk_buff *skb, struct net_device *dev);

static netdev_tx_t mace_xmit_start(struct sk_buff *skb, struct net_device *dev);

static void mace_set_multicast(struct net_device *dev);

static void mace_reset(struct net_device *dev);

static int mace_set_address(struct net_device *dev, void *addr);
@@ -525,7 +525,7 @@ static inline void mace_set_timeout(struct net_device *dev) 
    mp->timeout_active = 1;

}



static int mace_xmit_start(struct sk_buff *skb, struct net_device *dev)

static netdev_tx_t mace_xmit_start(struct sk_buff *skb, struct net_device *dev)

{

    struct mace_data *mp = netdev_priv(dev);

    volatile struct dbdma_regs __iomem *td = mp->tx_dma;

drivers/net/ethernet/apple/macmace.c

+2 −2
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ struct mace_frame { 


static int mace_open(struct net_device *dev);

static int mace_close(struct net_device *dev);

static int mace_xmit_start(struct sk_buff *skb, struct net_device *dev);

static netdev_tx_t mace_xmit_start(struct sk_buff *skb, struct net_device *dev);

static void mace_set_multicast(struct net_device *dev);

static int mace_set_address(struct net_device *dev, void *addr);

static void mace_reset(struct net_device *dev);
@@ -444,7 +444,7 @@ static int mace_close(struct net_device *dev) 
 * Transmit a frame

 */



static int mace_xmit_start(struct sk_buff *skb, struct net_device *dev)

static netdev_tx_t mace_xmit_start(struct sk_buff *skb, struct net_device *dev)

{

	struct mace_data *mp = netdev_priv(dev);

	unsigned long flags;

drivers/net/ethernet/aquantia/atlantic/aq_ring.c

+18 −14
Original line number Diff line number Diff line
@@ -225,9 +225,10 @@ int aq_ring_rx_clean(struct aq_ring_s *self, 
		}



		/* for single fragment packets use build_skb() */

		if (buff->is_eop) {

		if (buff->is_eop &&

		    buff->len <= AQ_CFG_RX_FRAME_MAX - AQ_SKB_ALIGN) {

			skb = build_skb(page_address(buff->page),

					buff->len + AQ_SKB_ALIGN);

					AQ_CFG_RX_FRAME_MAX);

			if (unlikely(!skb)) {

				err = -ENOMEM;

				goto err_exit;
@@ -247,11 +248,13 @@ int aq_ring_rx_clean(struct aq_ring_s *self, 
					buff->len - ETH_HLEN,

					SKB_TRUESIZE(buff->len - ETH_HLEN));



			if (!buff->is_eop) {

				for (i = 1U, next_ = buff->next,

			     buff_ = &self->buff_ring[next_]; true;

			     next_ = buff_->next,

				     buff_ = &self->buff_ring[next_];

				     true; next_ = buff_->next,

				     buff_ = &self->buff_ring[next_], ++i) {

				skb_add_rx_frag(skb, i, buff_->page, 0,

					skb_add_rx_frag(skb, i,

							buff_->page, 0,

							buff_->len,

							SKB_TRUESIZE(buff->len -

							ETH_HLEN));
@@ -261,6 +264,7 @@ int aq_ring_rx_clean(struct aq_ring_s *self, 
						break;

				}

			}

		}



		skb->protocol = eth_type_trans(skb, ndev);

		if (unlikely(buff->is_cso_err)) {