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

Commit 51e3ea3f authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-warnings'



Stephen Hemminger says:

====================
network related warning fixes

Various fixes for warnings in network code and drivers.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 447e9ebf ce7426ca
Loading
Loading
Loading
Loading
+0 −4
Original line number Diff line number Diff line
@@ -5628,12 +5628,10 @@ void bnxt_tx_disable(struct bnxt *bp)
{
	int i;
	struct bnxt_tx_ring_info *txr;
	struct netdev_queue *txq;

	if (bp->tx_ring) {
		for (i = 0; i < bp->tx_nr_rings; i++) {
			txr = &bp->tx_ring[i];
			txq = netdev_get_tx_queue(bp->dev, i);
			txr->dev_state = BNXT_DEV_STATE_CLOSING;
		}
	}
@@ -5646,11 +5644,9 @@ void bnxt_tx_enable(struct bnxt *bp)
{
	int i;
	struct bnxt_tx_ring_info *txr;
	struct netdev_queue *txq;

	for (i = 0; i < bp->tx_nr_rings; i++) {
		txr = &bp->tx_ring[i];
		txq = netdev_get_tx_queue(bp->dev, i);
		txr->dev_state = 0;
	}
	netif_tx_wake_all_queues(bp->dev);
+1 −1
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ static int bnxt_grxclsrule(struct bnxt *bp, struct ethtool_rxnfc *cmd)
	struct flow_keys *fkeys;
	int i, rc = -EINVAL;

	if (fs->location < 0 || fs->location >= BNXT_NTP_FLTR_MAX_FLTR)
	if (fs->location >= BNXT_NTP_FLTR_MAX_FLTR)
		return rc;

	for (i = 0; i < BNXT_NTP_FLTR_HASH_SIZE; i++) {
+0 −3
Original line number Diff line number Diff line
@@ -139,10 +139,7 @@ int be_roce_register_driver(struct ocrdma_driver *drv)
	}
	ocrdma_drv = drv;
	list_for_each_entry(dev, &be_adapter_list, entry) {
		struct net_device *netdev;

		_be_roce_dev_add(dev);
		netdev = dev->netdev;
	}
	mutex_unlock(&be_adapter_list_lock);
	return 0;
+0 −3
Original line number Diff line number Diff line
@@ -273,9 +273,6 @@ static int iphc_decompress(struct sk_buff *skb, struct net_device *netdev,
			   struct lowpan_peer *peer)
{
	const u8 *saddr;
	struct lowpan_btle_dev *dev;

	dev = lowpan_btle_dev(netdev);

	saddr = peer->lladdr;

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static DEFINE_SPINLOCK(recent_lock);
static DEFINE_MUTEX(recent_mutex);

#ifdef CONFIG_PROC_FS
static const struct file_operations recent_old_fops, recent_mt_fops;
static const struct file_operations recent_mt_fops;
#endif

static u_int32_t hash_rnd __read_mostly;
Loading